-#GREEN_PARENT_DEV="eth0"
+#GREEN_PARENT_DEV=eth0
#GREEN_VLAN_ID=20
-#GREEN_MAC_ADDRESS="00:11:22:33:44:55"
-#BLUE_PARENT_DEV="green0"
+#GREEN_MAC_ADDRESS=00:11:22:33:44:55
+#BLUE_PARENT_DEV=green0
#BLUE_VLAN_ID=30
-#BLUE_MAC_ADDRESS="00:22:33:44:55:66"
-#ORANGE_PARENT_DEV="green0"
+#BLUE_MAC_ADDRESS=00:22:33:44:55:66
+#ORANGE_PARENT_DEV=green0
#ORANGE_VLAN_ID=40
-#ORANGE_MAC_ADDRESS="00:33:44:55:66:77"
+#ORANGE_MAC_ADDRESS=00:33:44:55:66:77
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
+++ /dev/null
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.48-ipfire-omap Kernel Configuration
-#
-CONFIG_ARM=y
-CONFIG_HAVE_PWM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_HAVE_SCHED_CLOCK=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_KTIME_SCALAR=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_SPARSE_IRQ=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-CONFIG_RCU_FAST_NO_HZ=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=19
-# CONFIG_CGROUPS is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# System Type
-#
-CONFIG_MMU=y
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CNS3XXX is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_PRIMA2 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_LPC32XX is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_PICOXCELL is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_SHMOBILE is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5P64X0 is not set
-# CONFIG_ARCH_S5PC100 is not set
-# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_TCC_926 is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_DAVINCI is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_VT8500 is not set
-# CONFIG_ARCH_ZYNQ is not set
-CONFIG_GPIO_PCA953X=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-
-#
-# TI OMAP Common Features
-#
-CONFIG_ARCH_OMAP_OTG=y
-# CONFIG_ARCH_OMAP1 is not set
-CONFIG_ARCH_OMAP2PLUS=y
-
-#
-# OMAP Feature Selections
-#
-CONFIG_OMAP_DEBUG_DEVICES=y
-CONFIG_OMAP_DEBUG_LEDS=y
-# CONFIG_OMAP_SMARTREFLEX is not set
-CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_MCBSP=y
-# CONFIG_OMAP_MBOX_FWK is not set
-CONFIG_OMAP_32K_TIMER=y
-# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_32K_TIMER_HZ=128
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_PM_NOOP=y
-CONFIG_MACH_OMAP_GENERIC=y
-
-#
-# TI OMAP2/3/4 Specific Features
-#
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-CONFIG_ARCH_OMAP2=y
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
-
-#
-# OMAP Core Type
-#
-CONFIG_SOC_OMAP2420=y
-CONFIG_SOC_OMAP2430=y
-CONFIG_SOC_OMAP3430=y
-CONFIG_SOC_OMAPTI816X=y
-CONFIG_OMAP_PACKAGE_ZAF=y
-CONFIG_OMAP_PACKAGE_ZAC=y
-CONFIG_OMAP_PACKAGE_CBB=y
-CONFIG_OMAP_PACKAGE_CUS=y
-CONFIG_OMAP_PACKAGE_CBP=y
-CONFIG_OMAP_PACKAGE_CBL=y
-CONFIG_OMAP_PACKAGE_CBS=y
-
-#
-# OMAP Board Type
-#
-CONFIG_MACH_OMAP_H4=y
-CONFIG_MACH_OMAP_APOLLON=y
-CONFIG_MACH_OMAP_2430SDP=y
-CONFIG_MACH_OMAP3_BEAGLE=y
-CONFIG_MACH_DEVKIT8000=y
-CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OMAP3530_LV_SOM=y
-CONFIG_MACH_OMAP3_TORPEDO=y
-CONFIG_MACH_OVERO=y
-CONFIG_MACH_OMAP3EVM=y
-CONFIG_MACH_OMAP3517EVM=y
-# CONFIG_MACH_CRANEBOARD is not set
-CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_OMAP3_TOUCHBOOK=y
-CONFIG_MACH_OMAP_3430SDP=y
-# CONFIG_MACH_NOKIA_N8X0 is not set
-CONFIG_MACH_NOKIA_RM680=y
-CONFIG_MACH_NOKIA_RX51=y
-CONFIG_MACH_OMAP_ZOOM2=y
-CONFIG_MACH_OMAP_ZOOM3=y
-CONFIG_MACH_CM_T35=y
-CONFIG_MACH_CM_T3517=y
-CONFIG_MACH_CM_T3730=y
-CONFIG_MACH_IGEP0020=y
-CONFIG_MACH_IGEP0030=y
-CONFIG_MACH_SBC3530=y
-CONFIG_MACH_OMAP_3630SDP=y
-CONFIG_MACH_TI8168EVM=y
-CONFIG_MACH_OMAP_4430SDP=y
-CONFIG_MACH_OMAP4_PANDA=y
-# CONFIG_OMAP3_EMU is not set
-# CONFIG_OMAP3_SDRC_AC_TIMING is not set
-
-#
-# System MMU
-#
-
-#
-# Processor Type
-#
-CONFIG_CPU_V6=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v6=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV6=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_V6=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_CACHE_V6=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_TLB_V6=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_HAS_ASID=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_USE_DOMAINS=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
-CONFIG_CACHE_L2X0=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-# CONFIG_ARM_ERRATA_326103 is not set
-CONFIG_ARM_ERRATA_411920=y
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_ERRATA_458693=y
-CONFIG_ARM_ERRATA_460075=y
-# CONFIG_ARM_ERRATA_742230 is not set
-CONFIG_ARM_ERRATA_742231=y
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_PL310_ERRATA_727915=y
-CONFIG_ARM_ERRATA_743622=y
-# CONFIG_ARM_ERRATA_751472 is not set
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_ARM_ERRATA_754327=y
-CONFIG_ARM_ERRATA_764369=y
-CONFIG_PL310_ERRATA_769419=y
-CONFIG_ARM_GIC=y
-
-#
-# Bus support
-#
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Kernel Features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_HAVE_ARM_SCU=y
-CONFIG_HAVE_ARM_TWD=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_NR_CPUS=8
-CONFIG_HOTPLUG_CPU=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_HZ=128
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_LEDS is not set
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_UACCESS_WITH_MEMCPY=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-
-#
-# Boot options
-#
-CONFIG_USE_OF=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-# CONFIG_ARM_APPENDED_DTB is not set
-CONFIG_CMDLINE=""
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_AUTO_ZRELADDR is not set
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_APM_EMULATION is not set
-CONFIG_ARCH_HAS_OPP=y
-CONFIG_PM_OPP=y
-CONFIG_PM_CLK=y
-CONFIG_CPU_PM=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_RENO=y
-CONFIG_DEFAULT_TCP_CONG="reno"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_SUBTREES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_ZONES is not set
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_IMQ=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_LAYER7=m
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# CONFIG_IP_SET is not set
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_MATCH_IPP2P=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_LANE is not set
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_MV88E6XXX=y
-CONFIG_NET_DSA_MV88E6060=y
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_PHONET is not set
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-# CONFIG_IRDA_CACHE_LAST_LSAP is not set
-# CONFIG_IRDA_FAST_RR is not set
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_DEFAULT_PS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-# CONFIG_MAC80211_RC_PID is not set
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_WIMAX is not set
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_RFKILL_GPIO=m
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-# CONFIG_NFC is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
-# CONFIG_STANDALONE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-CONFIG_SM_FTL=m
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_NAND_ECC=m
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-CONFIG_PROC_DEVICETREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_I2C=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-# CONFIG_BLK_DEV_DRBD is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=8
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-# CONFIG_CDROM_PKTCDVD is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_MG_DISK=m
-CONFIG_MG_DISK_RES=0
-CONFIG_BLK_DEV_RBD=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ATMEL_PWM is not set
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_BMP085=m
-CONFIG_USB_SWITCH_FSA9480=m
-CONFIG_C2PORT=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-# CONFIG_ALTERA_STAPL is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_SATA_MV=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ARASAN_CF=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_OF_PLATFORM=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
-CONFIG_MD_MULTIPATH=m
-# CONFIG_MD_FAULTY is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-# CONFIG_TARGET_CORE is not set
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-CONFIG_IMQ=m
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-CONFIG_IMQ_BEHAVIOR_AB=y
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
-CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IFB=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_DM9000=m
-# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_NET_VENDOR_FARADAY=y
-# CONFIG_FTMAC100 is not set
-# CONFIG_FTGMAC100 is not set
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_8390=y
-CONFIG_AX88796=m
-CONFIG_AX88796_93CX6=y
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC91X=m
-CONFIG_SMC911X=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_DAVINCI_EMAC is not set
-# CONFIG_TI_DAVINCI_MDIO is not set
-# CONFIG_TI_DAVINCI_CPDMA is not set
-CONFIG_PHYLIB=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-# CONFIG_FIXED_PHY is not set
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-# CONFIG_PLIP is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-# CONFIG_USB_IPHETH is not set
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_WLAN=y
-# CONFIG_LIBERTAS_THINFIRM is not set
-CONFIG_AT76C50X_USB=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-# CONFIG_RTL8187 is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_ATH_COMMON is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_BRCMFMAC is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-# CONFIG_IWM is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_P54_COMMON is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RTL8192CU is not set
-# CONFIG_WL1251 is not set
-CONFIG_WL12XX_MENU=m
-CONFIG_WL12XX=m
-CONFIG_WL12XX_SDIO=m
-# CONFIG_WL12XX_SDIO_TEST is not set
-CONFIG_WL12XX_PLATFORM_DATA=y
-# CONFIG_ZD1211RW is not set
-# CONFIG_MWIFIEX is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-CONFIG_WAN=y
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_DEBUG=y
-
-#
-# HiSax PCMCIA card service modules
-#
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCUSB=m
-CONFIG_ISDN_HDLC=m
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_STOWAWAY=m
-CONFIG_KEYBOARD_SUNKBD=m
-CONFIG_KEYBOARD_OMAP=m
-CONFIG_KEYBOARD_OMAP4=m
-CONFIG_KEYBOARD_TWL4030=m
-CONFIG_KEYBOARD_XTKBD=m
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_BMA150=m
-# CONFIG_INPUT_MMA8450 is not set
-# CONFIG_INPUT_MPU3050 is not set
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-# CONFIG_INPUT_KXTJ9 is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_TWL4030_PWRBUTTON=m
-CONFIG_INPUT_TWL4030_VIBRA=m
-CONFIG_INPUT_TWL6040_VIBRA=m
-# CONFIG_INPUT_UINPUT is not set
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_CMA3000 is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_N_GSM=m
-# CONFIG_TRACE_SINK is not set
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_DW=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_XILINX_PS_UART=m
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-# CONFIG_HVC_DCC is not set
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_PANIC_EVENT=y
-# CONFIG_IPMI_PANIC_STRING is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_OMAP=m
-CONFIG_NVRAM=m
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_RAMOOPS is not set
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_OMAP=y
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_STUB=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_PARPORT is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=m
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCF857X=m
-# CONFIG_GPIO_SX150X is not set
-CONFIG_GPIO_TWL4030=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MCP23S08=m
-
-#
-# AC97 GPIO expanders:
-#
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-CONFIG_HDQ_MASTER_OMAP=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_BQ20Z75 is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-CONFIG_CHARGER_TWL4030=m
-CONFIG_CHARGER_GPIO=m
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TWL4030_MADC=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_MPCORE_WATCHDOG=m
-CONFIG_OMAP_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-# CONFIG_MFD_88PM860X is not set
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_HTC_EGPIO is not set
-CONFIG_HTC_PASIC3=m
-# CONFIG_HTC_I2CPLD is not set
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-CONFIG_MENELAUS=y
-CONFIG_TWL4030_CORE=y
-CONFIG_TWL4030_MADC=m
-CONFIG_TWL4030_POWER=y
-CONFIG_MFD_TWL4030_AUDIO=y
-CONFIG_TWL6030_PWM=m
-CONFIG_TWL6040_CORE=y
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-CONFIG_MFD_WM8400=m
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_OMAP_USB_HOST=y
-# CONFIG_MFD_AAT2870_CORE is not set
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_DUMMY is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-CONFIG_REGULATOR_GPIO=m
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-CONFIG_REGULATOR_TWL4030=y
-# CONFIG_REGULATOR_WM8400 is not set
-# CONFIG_REGULATOR_PCF50633 is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_TPS6105X is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_AD5398 is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-# CONFIG_IR_NEC_DECODER is not set
-# CONFIG_IR_RC5_DECODER is not set
-# CONFIG_IR_RC6_DECODER is not set
-# CONFIG_IR_JVC_DECODER is not set
-# CONFIG_IR_SONY_DECODER is not set
-# CONFIG_IR_RC5_SZ_DECODER is not set
-# CONFIG_IR_MCE_KBD_DECODER is not set
-# CONFIG_IR_LIRC_CODEC is not set
-# CONFIG_RC_ATI_REMOTE is not set
-# CONFIG_IR_IMON is not set
-# CONFIG_IR_MCEUSB is not set
-# CONFIG_IR_REDRAT3 is not set
-# CONFIG_IR_STREAMZAP is not set
-# CONFIG_RC_LOOPBACK is not set
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-
-#
-# RDS decoders
-#
-# CONFIG_VIDEO_SAA6588 is not set
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_CX25840 is not set
-
-#
-# MPEG video encoders
-#
-# CONFIG_VIDEO_CX2341X is not set
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_AK881X is not set
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_S5K6AA is not set
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-
-#
-# Miscelaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VPFE_CAPTURE is not set
-# CONFIG_VIDEO_OMAP2_VOUT is not set
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_TIMBERDALE is not set
-# CONFIG_VIDEO_AU0828 is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_VIDEO_OMAP2 is not set
-# CONFIG_V4L_USB_DRIVERS is not set
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_SI470X is not set
-# CONFIG_USB_MR800 is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_RADIO_WL1273 is not set
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-# CONFIG_TTPCI_EEPROM is not set
-
-#
-# Supported USB Adapters
-#
-# CONFIG_DVB_USB is not set
-# CONFIG_SMS_SIANO_MDTV is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-# CONFIG_DVB_B2C2_FLEXCOP is not set
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-
-#
-# DVB-S (satellite) frontends
-#
-
-#
-# DVB-T (terrestrial) frontends
-#
-
-#
-# DVB-C (cable) frontends
-#
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-
-#
-# ISDB-T (terrestrial) frontends
-#
-
-#
-# Digital terrestrial only tuners/PLL
-#
-
-#
-# SEC control devices for DVB-S
-#
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_DRM=m
-# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_UVESA=m
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_TMIO=m
-CONFIG_FB_TMIO_ACCELL=y
-CONFIG_FB_SM501=m
-CONFIG_FB_SMSCUFX=m
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_METRONOME=m
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-CONFIG_OMAP2_VRAM=y
-CONFIG_OMAP2_VRFB=y
-CONFIG_OMAP2_DSS=y
-CONFIG_OMAP2_VRAM_SIZE=32
-CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
-# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
-CONFIG_OMAP2_DSS_DPI=y
-# CONFIG_OMAP2_DSS_RFBI is not set
-# CONFIG_OMAP2_DSS_VENC is not set
-CONFIG_OMAP4_DSS_HDMI=y
-# CONFIG_OMAP2_DSS_SDI is not set
-CONFIG_OMAP2_DSS_DSI=y
-# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
-CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
-CONFIG_FB_OMAP2=y
-CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
-CONFIG_FB_OMAP2_NUM_FBS=3
-
-#
-# OMAP2/3 Display Device Drivers
-#
-CONFIG_PANEL_GENERIC_DPI=y
-CONFIG_PANEL_DVI=y
-CONFIG_PANEL_SHARP_LS037V7DW01=y
-# CONFIG_PANEL_PICODLP is not set
-CONFIG_PANEL_TAAL=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=y
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_RAWMIDI_SEQ=m
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_ARM=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_OMAP_SOC_MCBSP=m
-CONFIG_SND_OMAP_SOC_MCPDM=m
-CONFIG_SND_OMAP_SOC_RX51=m
-CONFIG_SND_OMAP_SOC_OVERO=m
-CONFIG_SND_OMAP_SOC_OMAP3EVM=m
-CONFIG_SND_OMAP_SOC_AM3517EVM=m
-CONFIG_SND_OMAP_SOC_SDP3430=m
-CONFIG_SND_OMAP_SOC_SDP4430=m
-# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
-CONFIG_SND_OMAP_SOC_ZOOM2=m
-CONFIG_SND_OMAP_SOC_IGEP0020=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_SND_SOC_TWL4030=m
-CONFIG_SND_SOC_TWL6040=m
-CONFIG_SND_SOC_TPA6130A2=m
-# CONFIG_SOUND_PRIME is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HIDRAW is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-# CONFIG_HID_ACRUX_FF is not set
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_HID_EMS_FF is not set
-CONFIG_HID_ELECOM=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-# CONFIG_HOLTEK_FF is not set
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGIG940_FF is not set
-# CONFIG_LOGIWHEELS_FF is not set
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-# CONFIG_PANTHERLORD_FF is not set
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-# CONFIG_GREENASIA_FF is not set
-CONFIG_HID_SMARTJOYPLUS=m
-# CONFIG_SMARTJOYPLUS_FF is not set
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_HID_WACOM=m
-# CONFIG_HID_WACOM_POWER_SUPPLY is not set
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_ZEROPLUS=m
-# CONFIG_ZEROPLUS_FF is not set
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB_ARCH_HAS_XHCI is not set
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-# CONFIG_USB_ISP1760_HCD is not set
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_OMAP1=y
-CONFIG_USB_OHCI_HCD_OMAP3=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_R8A66597_HCD=m
-# CONFIG_USB_HWA_HCD is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-# CONFIG_USB_SERIAL_NAVMAN is not set
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-# CONFIG_USB_SERIAL_OMNINET is not set
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
-CONFIG_USB_SERIAL_SSU100=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-# CONFIG_USB_ADUTUX is not set
-CONFIG_USB_SEVSEG=m
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-# CONFIG_USB_IDMOUSE is not set
-CONFIG_USB_FTDI_ELAN=m
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
-# CONFIG_USB_TEST is not set
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-# CONFIG_ISP1301_OMAP is not set
-# CONFIG_USB_ULPI is not set
-CONFIG_TWL4030_USB=m
-CONFIG_TWL6030_USB=m
-# CONFIG_NOP_USB_XCEIV is not set
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_CLKGATE is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-CONFIG_MMC_TEST=m
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-# CONFIG_MMC_SDHCI_PXAV3 is not set
-# CONFIG_MMC_SDHCI_PXAV2 is not set
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MMC_DW=m
-# CONFIG_MMC_DW_IDMAC is not set
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_PCA955X=m
-# CONFIG_LEDS_PWM is not set
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_LT3593=m
-# CONFIG_LEDS_RENESAS_TPU is not set
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_NETDEV=m
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=y
-CONFIG_RTC_DRV_TWL92330=y
-CONFIG_RTC_DRV_TWL4030=y
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=y
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DW_DMAC=m
-CONFIG_TIMB_DMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-CONFIG_DMATEST=m
-# CONFIG_AUXDISPLAY is not set
-CONFIG_UIO=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-
-#
-# Virtio drivers
-#
-# CONFIG_VIRTIO_BALLOON is not set
-# CONFIG_VIRTIO_MMIO is not set
-CONFIG_STAGING=y
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-# CONFIG_W35UND is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
-# CONFIG_ASUS_OLED is not set
-# CONFIG_PANEL is not set
-# CONFIG_R8712U is not set
-# CONFIG_RTS5139 is not set
-# CONFIG_TRANZPORT is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
-# CONFIG_FB_SM7XX is not set
-# CONFIG_TIDSPBRIDGE is not set
-# CONFIG_USB_ENESTORAGE is not set
-# CONFIG_BCM_WIMAX is not set
-# CONFIG_FT1000 is not set
-
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HWSPINLOCK=m
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_HWSPINLOCK_OMAP=m
-CONFIG_CLKSRC_MMIO=y
-CONFIG_IOMMU_SUPPORT=y
-# CONFIG_OMAP_IOMMU is not set
-# CONFIG_VIRT_DRIVERS is not set
-# CONFIG_PM_DEVFREQ is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-# CONFIG_MSDOS_FS is not set
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_UBIFS_FS is not set
-# CONFIG_LOGFS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EXOFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_FSCACHE is not set
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_NFS_USE_NEW_IDMAPPER is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_CEPH_FS is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-CONFIG_CIFS_STATS2=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS_ACL=y
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="cp850"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=y
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=y
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_STRICT_DEVMEM is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_DEBUG_USER is not set
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_UART_NONE=y
-# CONFIG_DEBUG_ICEDCC is not set
-CONFIG_EARLY_PRINTK=y
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_OMAP_SHAM=m
-CONFIG_CRYPTO_DEV_OMAP_AES=m
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CPU_RMAP=y
-CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_AVERAGE=y
-CONFIG_CORDIC=m
CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
CONFIG_LLC=m
# CONFIG_LLC2 is not set
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
etc/vimrc
-#usr/bin/ex
-#usr/bin/rview
-#usr/bin/rvim
+usr/bin/ex
+usr/bin/rview
+usr/bin/rvim
usr/bin/vi
-#usr/bin/view
+usr/bin/view
usr/bin/vim
-#usr/bin/vimdiff
-#usr/bin/vimtutor
-#usr/bin/xxd
+usr/bin/vimdiff
+usr/bin/vimtutor
+usr/bin/xxd
#usr/share/man/man1/evim.1
#usr/share/man/man1/ex.1
#usr/share/man/man1/rview.1
#usr/share/man/man1/vimtutor.1
#usr/share/man/man1/xxd.1
usr/share/vim
-#usr/share/vim/vim72
-#usr/share/vim/vim72/autoload
-#usr/share/vim/vim72/autoload/README.txt
-#usr/share/vim/vim72/autoload/ada.vim
-#usr/share/vim/vim72/autoload/adacomplete.vim
-#usr/share/vim/vim72/autoload/ccomplete.vim
-#usr/share/vim/vim72/autoload/csscomplete.vim
-#usr/share/vim/vim72/autoload/decada.vim
-#usr/share/vim/vim72/autoload/getscript.vim
-#usr/share/vim/vim72/autoload/gnat.vim
-#usr/share/vim/vim72/autoload/gzip.vim
-#usr/share/vim/vim72/autoload/htmlcomplete.vim
-#usr/share/vim/vim72/autoload/javascriptcomplete.vim
-#usr/share/vim/vim72/autoload/netrw.vim
-#usr/share/vim/vim72/autoload/netrwFileHandlers.vim
-#usr/share/vim/vim72/autoload/netrwSettings.vim
-#usr/share/vim/vim72/autoload/paste.vim
-#usr/share/vim/vim72/autoload/phpcomplete.vim
-#usr/share/vim/vim72/autoload/pythoncomplete.vim
-#usr/share/vim/vim72/autoload/rubycomplete.vim
-#usr/share/vim/vim72/autoload/spellfile.vim
-#usr/share/vim/vim72/autoload/sqlcomplete.vim
-#usr/share/vim/vim72/autoload/syntaxcomplete.vim
-#usr/share/vim/vim72/autoload/tar.vim
-#usr/share/vim/vim72/autoload/vimball.vim
-#usr/share/vim/vim72/autoload/xml
-#usr/share/vim/vim72/autoload/xml/html32.vim
-#usr/share/vim/vim72/autoload/xml/html401f.vim
-#usr/share/vim/vim72/autoload/xml/html401s.vim
-#usr/share/vim/vim72/autoload/xml/html401t.vim
-#usr/share/vim/vim72/autoload/xml/html40f.vim
-#usr/share/vim/vim72/autoload/xml/html40s.vim
-#usr/share/vim/vim72/autoload/xml/html40t.vim
-#usr/share/vim/vim72/autoload/xml/xhtml10f.vim
-#usr/share/vim/vim72/autoload/xml/xhtml10s.vim
-#usr/share/vim/vim72/autoload/xml/xhtml10t.vim
-#usr/share/vim/vim72/autoload/xml/xhtml11.vim
-#usr/share/vim/vim72/autoload/xml/xsd.vim
-#usr/share/vim/vim72/autoload/xml/xsl.vim
-#usr/share/vim/vim72/autoload/xmlcomplete.vim
-#usr/share/vim/vim72/autoload/zip.vim
-#usr/share/vim/vim72/bugreport.vim
-#usr/share/vim/vim72/colors
-#usr/share/vim/vim72/colors/README.txt
-#usr/share/vim/vim72/colors/blue.vim
-#usr/share/vim/vim72/colors/darkblue.vim
-#usr/share/vim/vim72/colors/default.vim
-#usr/share/vim/vim72/colors/delek.vim
-#usr/share/vim/vim72/colors/desert.vim
-#usr/share/vim/vim72/colors/elflord.vim
-#usr/share/vim/vim72/colors/evening.vim
-#usr/share/vim/vim72/colors/koehler.vim
-#usr/share/vim/vim72/colors/morning.vim
-#usr/share/vim/vim72/colors/murphy.vim
-#usr/share/vim/vim72/colors/pablo.vim
-#usr/share/vim/vim72/colors/peachpuff.vim
-#usr/share/vim/vim72/colors/ron.vim
-#usr/share/vim/vim72/colors/shine.vim
-#usr/share/vim/vim72/colors/slate.vim
-#usr/share/vim/vim72/colors/torte.vim
-#usr/share/vim/vim72/colors/zellner.vim
-#usr/share/vim/vim72/compiler
-#usr/share/vim/vim72/compiler/README.txt
-#usr/share/vim/vim72/compiler/ant.vim
-#usr/share/vim/vim72/compiler/bcc.vim
-#usr/share/vim/vim72/compiler/bdf.vim
-#usr/share/vim/vim72/compiler/checkstyle.vim
-#usr/share/vim/vim72/compiler/cs.vim
-#usr/share/vim/vim72/compiler/decada.vim
-#usr/share/vim/vim72/compiler/dot.vim
-#usr/share/vim/vim72/compiler/eruby.vim
-#usr/share/vim/vim72/compiler/fortran_F.vim
-#usr/share/vim/vim72/compiler/fortran_cv.vim
-#usr/share/vim/vim72/compiler/fortran_elf90.vim
-#usr/share/vim/vim72/compiler/fortran_g77.vim
-#usr/share/vim/vim72/compiler/fortran_lf95.vim
-#usr/share/vim/vim72/compiler/fpc.vim
-#usr/share/vim/vim72/compiler/gcc.vim
-#usr/share/vim/vim72/compiler/gnat.vim
-#usr/share/vim/vim72/compiler/hp_acc.vim
-#usr/share/vim/vim72/compiler/icc.vim
-#usr/share/vim/vim72/compiler/intel.vim
-#usr/share/vim/vim72/compiler/irix5_c.vim
-#usr/share/vim/vim72/compiler/irix5_cpp.vim
-#usr/share/vim/vim72/compiler/javac.vim
-#usr/share/vim/vim72/compiler/jikes.vim
-#usr/share/vim/vim72/compiler/mcs.vim
-#usr/share/vim/vim72/compiler/mips_c.vim
-#usr/share/vim/vim72/compiler/mipspro_c89.vim
-#usr/share/vim/vim72/compiler/mipspro_cpp.vim
-#usr/share/vim/vim72/compiler/modelsim_vcom.vim
-#usr/share/vim/vim72/compiler/msvc.vim
-#usr/share/vim/vim72/compiler/neato.vim
-#usr/share/vim/vim72/compiler/onsgmls.vim
-#usr/share/vim/vim72/compiler/pbx.vim
-#usr/share/vim/vim72/compiler/perl.vim
-#usr/share/vim/vim72/compiler/php.vim
-#usr/share/vim/vim72/compiler/pyunit.vim
-#usr/share/vim/vim72/compiler/rspec.vim
-#usr/share/vim/vim72/compiler/rst.vim
-#usr/share/vim/vim72/compiler/ruby.vim
-#usr/share/vim/vim72/compiler/rubyunit.vim
-#usr/share/vim/vim72/compiler/se.vim
-#usr/share/vim/vim72/compiler/splint.vim
-#usr/share/vim/vim72/compiler/tcl.vim
-#usr/share/vim/vim72/compiler/tex.vim
-#usr/share/vim/vim72/compiler/tidy.vim
-#usr/share/vim/vim72/compiler/xmllint.vim
-#usr/share/vim/vim72/compiler/xmlwf.vim
-#usr/share/vim/vim72/delmenu.vim
-#usr/share/vim/vim72/doc
-#usr/share/vim/vim72/doc/arabic.txt
-#usr/share/vim/vim72/doc/autocmd.txt
-#usr/share/vim/vim72/doc/change.txt
-#usr/share/vim/vim72/doc/cmdline.txt
-#usr/share/vim/vim72/doc/debug.txt
-#usr/share/vim/vim72/doc/debugger.txt
-#usr/share/vim/vim72/doc/develop.txt
-#usr/share/vim/vim72/doc/diff.txt
-#usr/share/vim/vim72/doc/digraph.txt
-#usr/share/vim/vim72/doc/editing.txt
-#usr/share/vim/vim72/doc/eval.txt
-#usr/share/vim/vim72/doc/farsi.txt
-#usr/share/vim/vim72/doc/filetype.txt
-#usr/share/vim/vim72/doc/fold.txt
-#usr/share/vim/vim72/doc/ft_ada.txt
-#usr/share/vim/vim72/doc/ft_sql.txt
-#usr/share/vim/vim72/doc/gui.txt
-#usr/share/vim/vim72/doc/gui_w16.txt
-#usr/share/vim/vim72/doc/gui_w32.txt
-#usr/share/vim/vim72/doc/gui_x11.txt
-#usr/share/vim/vim72/doc/hangulin.txt
-#usr/share/vim/vim72/doc/hebrew.txt
-#usr/share/vim/vim72/doc/help.txt
-#usr/share/vim/vim72/doc/howto.txt
-#usr/share/vim/vim72/doc/if_cscop.txt
-#usr/share/vim/vim72/doc/if_mzsch.txt
-#usr/share/vim/vim72/doc/if_ole.txt
-#usr/share/vim/vim72/doc/if_perl.txt
-#usr/share/vim/vim72/doc/if_pyth.txt
-#usr/share/vim/vim72/doc/if_ruby.txt
-#usr/share/vim/vim72/doc/if_sniff.txt
-#usr/share/vim/vim72/doc/if_tcl.txt
-#usr/share/vim/vim72/doc/indent.txt
-#usr/share/vim/vim72/doc/index.txt
-#usr/share/vim/vim72/doc/insert.txt
-#usr/share/vim/vim72/doc/intro.txt
-#usr/share/vim/vim72/doc/map.txt
-#usr/share/vim/vim72/doc/mbyte.txt
-#usr/share/vim/vim72/doc/message.txt
-#usr/share/vim/vim72/doc/mlang.txt
-#usr/share/vim/vim72/doc/motion.txt
-#usr/share/vim/vim72/doc/netbeans.txt
-#usr/share/vim/vim72/doc/options.txt
-#usr/share/vim/vim72/doc/os_390.txt
-#usr/share/vim/vim72/doc/os_amiga.txt
-#usr/share/vim/vim72/doc/os_beos.txt
-#usr/share/vim/vim72/doc/os_dos.txt
-#usr/share/vim/vim72/doc/os_mac.txt
-#usr/share/vim/vim72/doc/os_mint.txt
-#usr/share/vim/vim72/doc/os_msdos.txt
-#usr/share/vim/vim72/doc/os_os2.txt
-#usr/share/vim/vim72/doc/os_qnx.txt
-#usr/share/vim/vim72/doc/os_risc.txt
-#usr/share/vim/vim72/doc/os_unix.txt
-#usr/share/vim/vim72/doc/os_vms.txt
-#usr/share/vim/vim72/doc/os_win32.txt
-#usr/share/vim/vim72/doc/pattern.txt
-#usr/share/vim/vim72/doc/pi_getscript.txt
-#usr/share/vim/vim72/doc/pi_gzip.txt
-#usr/share/vim/vim72/doc/pi_netrw.txt
-#usr/share/vim/vim72/doc/pi_paren.txt
-#usr/share/vim/vim72/doc/pi_spec.txt
-#usr/share/vim/vim72/doc/pi_tar.txt
-#usr/share/vim/vim72/doc/pi_vimball.txt
-#usr/share/vim/vim72/doc/pi_zip.txt
-#usr/share/vim/vim72/doc/print.txt
-#usr/share/vim/vim72/doc/quickfix.txt
-#usr/share/vim/vim72/doc/quickref.txt
-#usr/share/vim/vim72/doc/quotes.txt
-#usr/share/vim/vim72/doc/recover.txt
-#usr/share/vim/vim72/doc/remote.txt
-#usr/share/vim/vim72/doc/repeat.txt
-#usr/share/vim/vim72/doc/rileft.txt
-#usr/share/vim/vim72/doc/russian.txt
-#usr/share/vim/vim72/doc/scroll.txt
-#usr/share/vim/vim72/doc/sign.txt
-#usr/share/vim/vim72/doc/spell.txt
-#usr/share/vim/vim72/doc/sponsor.txt
-#usr/share/vim/vim72/doc/starting.txt
-#usr/share/vim/vim72/doc/syntax.txt
-#usr/share/vim/vim72/doc/tabpage.txt
-#usr/share/vim/vim72/doc/tags
-#usr/share/vim/vim72/doc/tagsrch.txt
-#usr/share/vim/vim72/doc/term.txt
-#usr/share/vim/vim72/doc/tips.txt
-#usr/share/vim/vim72/doc/todo.txt
-#usr/share/vim/vim72/doc/uganda.txt
-#usr/share/vim/vim72/doc/undo.txt
-#usr/share/vim/vim72/doc/usr_01.txt
-#usr/share/vim/vim72/doc/usr_02.txt
-#usr/share/vim/vim72/doc/usr_03.txt
-#usr/share/vim/vim72/doc/usr_04.txt
-#usr/share/vim/vim72/doc/usr_05.txt
-#usr/share/vim/vim72/doc/usr_06.txt
-#usr/share/vim/vim72/doc/usr_07.txt
-#usr/share/vim/vim72/doc/usr_08.txt
-#usr/share/vim/vim72/doc/usr_09.txt
-#usr/share/vim/vim72/doc/usr_10.txt
-#usr/share/vim/vim72/doc/usr_11.txt
-#usr/share/vim/vim72/doc/usr_12.txt
-#usr/share/vim/vim72/doc/usr_20.txt
-#usr/share/vim/vim72/doc/usr_21.txt
-#usr/share/vim/vim72/doc/usr_22.txt
-#usr/share/vim/vim72/doc/usr_23.txt
-#usr/share/vim/vim72/doc/usr_24.txt
-#usr/share/vim/vim72/doc/usr_25.txt
-#usr/share/vim/vim72/doc/usr_26.txt
-#usr/share/vim/vim72/doc/usr_27.txt
-#usr/share/vim/vim72/doc/usr_28.txt
-#usr/share/vim/vim72/doc/usr_29.txt
-#usr/share/vim/vim72/doc/usr_30.txt
-#usr/share/vim/vim72/doc/usr_31.txt
-#usr/share/vim/vim72/doc/usr_32.txt
-#usr/share/vim/vim72/doc/usr_40.txt
-#usr/share/vim/vim72/doc/usr_41.txt
-#usr/share/vim/vim72/doc/usr_42.txt
-#usr/share/vim/vim72/doc/usr_43.txt
-#usr/share/vim/vim72/doc/usr_44.txt
-#usr/share/vim/vim72/doc/usr_45.txt
-#usr/share/vim/vim72/doc/usr_90.txt
-#usr/share/vim/vim72/doc/usr_toc.txt
-#usr/share/vim/vim72/doc/various.txt
-#usr/share/vim/vim72/doc/version4.txt
-#usr/share/vim/vim72/doc/version5.txt
-#usr/share/vim/vim72/doc/version6.txt
-#usr/share/vim/vim72/doc/version7.txt
-#usr/share/vim/vim72/doc/vi_diff.txt
-#usr/share/vim/vim72/doc/vim2html.pl
-#usr/share/vim/vim72/doc/visual.txt
-#usr/share/vim/vim72/doc/windows.txt
-#usr/share/vim/vim72/doc/workshop.txt
-#usr/share/vim/vim72/evim.vim
-#usr/share/vim/vim72/filetype.vim
-#usr/share/vim/vim72/ftoff.vim
-#usr/share/vim/vim72/ftplugin
-#usr/share/vim/vim72/ftplugin.vim
-#usr/share/vim/vim72/ftplugin/AppendMatchGroup.vim
-#usr/share/vim/vim72/ftplugin/README.txt
-#usr/share/vim/vim72/ftplugin/a2ps.vim
-#usr/share/vim/vim72/ftplugin/aap.vim
-#usr/share/vim/vim72/ftplugin/abaqus.vim
-#usr/share/vim/vim72/ftplugin/ada.vim
-#usr/share/vim/vim72/ftplugin/alsaconf.vim
-#usr/share/vim/vim72/ftplugin/ant.vim
-#usr/share/vim/vim72/ftplugin/arch.vim
-#usr/share/vim/vim72/ftplugin/art.vim
-#usr/share/vim/vim72/ftplugin/aspvbs.vim
-#usr/share/vim/vim72/ftplugin/automake.vim
-#usr/share/vim/vim72/ftplugin/bdf.vim
-#usr/share/vim/vim72/ftplugin/bst.vim
-#usr/share/vim/vim72/ftplugin/btm.vim
-#usr/share/vim/vim72/ftplugin/c.vim
-#usr/share/vim/vim72/ftplugin/calendar.vim
-#usr/share/vim/vim72/ftplugin/cdrdaoconf.vim
-#usr/share/vim/vim72/ftplugin/ch.vim
-#usr/share/vim/vim72/ftplugin/changelog.vim
-#usr/share/vim/vim72/ftplugin/cobol.vim
-#usr/share/vim/vim72/ftplugin/conf.vim
-#usr/share/vim/vim72/ftplugin/config.vim
-#usr/share/vim/vim72/ftplugin/context.vim
-#usr/share/vim/vim72/ftplugin/cpp.vim
-#usr/share/vim/vim72/ftplugin/crm.vim
-#usr/share/vim/vim72/ftplugin/cs.vim
-#usr/share/vim/vim72/ftplugin/csc.vim
-#usr/share/vim/vim72/ftplugin/csh.vim
-#usr/share/vim/vim72/ftplugin/css.vim
-#usr/share/vim/vim72/ftplugin/cvsrc.vim
-#usr/share/vim/vim72/ftplugin/debchangelog.vim
-#usr/share/vim/vim72/ftplugin/debcontrol.vim
-#usr/share/vim/vim72/ftplugin/denyhosts.vim
-#usr/share/vim/vim72/ftplugin/dictconf.vim
-#usr/share/vim/vim72/ftplugin/dictdconf.vim
-#usr/share/vim/vim72/ftplugin/diff.vim
-#usr/share/vim/vim72/ftplugin/dircolors.vim
-#usr/share/vim/vim72/ftplugin/dosbatch.vim
-#usr/share/vim/vim72/ftplugin/dosini.vim
-#usr/share/vim/vim72/ftplugin/dtd.vim
-#usr/share/vim/vim72/ftplugin/dtrace.vim
-#usr/share/vim/vim72/ftplugin/elinks.vim
-#usr/share/vim/vim72/ftplugin/eruby.vim
-#usr/share/vim/vim72/ftplugin/eterm.vim
-#usr/share/vim/vim72/ftplugin/fetchmail.vim
-#usr/share/vim/vim72/ftplugin/flexwiki.vim
-#usr/share/vim/vim72/ftplugin/fortran.vim
-#usr/share/vim/vim72/ftplugin/framescript.vim
-#usr/share/vim/vim72/ftplugin/fvwm.vim
-#usr/share/vim/vim72/ftplugin/git.vim
-#usr/share/vim/vim72/ftplugin/gitcommit.vim
-#usr/share/vim/vim72/ftplugin/gitconfig.vim
-#usr/share/vim/vim72/ftplugin/gitrebase.vim
-#usr/share/vim/vim72/ftplugin/gitsendemail.vim
-#usr/share/vim/vim72/ftplugin/gpg.vim
-#usr/share/vim/vim72/ftplugin/group.vim
-#usr/share/vim/vim72/ftplugin/grub.vim
-#usr/share/vim/vim72/ftplugin/haml.vim
-#usr/share/vim/vim72/ftplugin/hamster.vim
-#usr/share/vim/vim72/ftplugin/haskell.vim
-#usr/share/vim/vim72/ftplugin/help.vim
-#usr/share/vim/vim72/ftplugin/hostconf.vim
-#usr/share/vim/vim72/ftplugin/hostsaccess.vim
-#usr/share/vim/vim72/ftplugin/html.vim
-#usr/share/vim/vim72/ftplugin/htmldjango.vim
-#usr/share/vim/vim72/ftplugin/indent.vim
-#usr/share/vim/vim72/ftplugin/initex.vim
-#usr/share/vim/vim72/ftplugin/ishd.vim
-#usr/share/vim/vim72/ftplugin/java.vim
-#usr/share/vim/vim72/ftplugin/javascript.vim
-#usr/share/vim/vim72/ftplugin/jsp.vim
-#usr/share/vim/vim72/ftplugin/kconfig.vim
-#usr/share/vim/vim72/ftplugin/kwt.vim
-#usr/share/vim/vim72/ftplugin/ld.vim
-#usr/share/vim/vim72/ftplugin/lftp.vim
-#usr/share/vim/vim72/ftplugin/libao.vim
-#usr/share/vim/vim72/ftplugin/limits.vim
-#usr/share/vim/vim72/ftplugin/lisp.vim
-#usr/share/vim/vim72/ftplugin/loginaccess.vim
-#usr/share/vim/vim72/ftplugin/logindefs.vim
-#usr/share/vim/vim72/ftplugin/logtalk.vim
-#usr/share/vim/vim72/ftplugin/lprolog.vim
-#usr/share/vim/vim72/ftplugin/lua.vim
-#usr/share/vim/vim72/ftplugin/m4.vim
-#usr/share/vim/vim72/ftplugin/mail.vim
-#usr/share/vim/vim72/ftplugin/mailaliases.vim
-#usr/share/vim/vim72/ftplugin/mailcap.vim
-#usr/share/vim/vim72/ftplugin/make.vim
-#usr/share/vim/vim72/ftplugin/man.vim
-#usr/share/vim/vim72/ftplugin/manconf.vim
-#usr/share/vim/vim72/ftplugin/matlab.vim
-#usr/share/vim/vim72/ftplugin/mf.vim
-#usr/share/vim/vim72/ftplugin/modconf.vim
-#usr/share/vim/vim72/ftplugin/mp.vim
-#usr/share/vim/vim72/ftplugin/mplayerconf.vim
-#usr/share/vim/vim72/ftplugin/mrxvtrc.vim
-#usr/share/vim/vim72/ftplugin/msmessages.vim
-#usr/share/vim/vim72/ftplugin/mupad.vim
-#usr/share/vim/vim72/ftplugin/muttrc.vim
-#usr/share/vim/vim72/ftplugin/nanorc.vim
-#usr/share/vim/vim72/ftplugin/netrc.vim
-#usr/share/vim/vim72/ftplugin/nsis.vim
-#usr/share/vim/vim72/ftplugin/objc.vim
-#usr/share/vim/vim72/ftplugin/ocaml.vim
-#usr/share/vim/vim72/ftplugin/occam.vim
-#usr/share/vim/vim72/ftplugin/pamconf.vim
-#usr/share/vim/vim72/ftplugin/pascal.vim
-#usr/share/vim/vim72/ftplugin/passwd.vim
-#usr/share/vim/vim72/ftplugin/pdf.vim
-#usr/share/vim/vim72/ftplugin/perl.vim
-#usr/share/vim/vim72/ftplugin/php.vim
-#usr/share/vim/vim72/ftplugin/pinfo.vim
-#usr/share/vim/vim72/ftplugin/plaintex.vim
-#usr/share/vim/vim72/ftplugin/postscr.vim
-#usr/share/vim/vim72/ftplugin/procmail.vim
-#usr/share/vim/vim72/ftplugin/prolog.vim
-#usr/share/vim/vim72/ftplugin/protocols.vim
-#usr/share/vim/vim72/ftplugin/pyrex.vim
-#usr/share/vim/vim72/ftplugin/python.vim
-#usr/share/vim/vim72/ftplugin/quake.vim
-#usr/share/vim/vim72/ftplugin/racc.vim
-#usr/share/vim/vim72/ftplugin/readline.vim
-#usr/share/vim/vim72/ftplugin/reva.vim
-#usr/share/vim/vim72/ftplugin/rnc.vim
-#usr/share/vim/vim72/ftplugin/rpl.vim
-#usr/share/vim/vim72/ftplugin/rst.vim
-#usr/share/vim/vim72/ftplugin/ruby.vim
-#usr/share/vim/vim72/ftplugin/sass.vim
-#usr/share/vim/vim72/ftplugin/scheme.vim
-#usr/share/vim/vim72/ftplugin/screen.vim
-#usr/share/vim/vim72/ftplugin/sensors.vim
-#usr/share/vim/vim72/ftplugin/services.vim
-#usr/share/vim/vim72/ftplugin/setserial.vim
-#usr/share/vim/vim72/ftplugin/sgml.vim
-#usr/share/vim/vim72/ftplugin/sh.vim
-#usr/share/vim/vim72/ftplugin/sieve.vim
-#usr/share/vim/vim72/ftplugin/slpconf.vim
-#usr/share/vim/vim72/ftplugin/slpreg.vim
-#usr/share/vim/vim72/ftplugin/slpspi.vim
-#usr/share/vim/vim72/ftplugin/spec.vim
-#usr/share/vim/vim72/ftplugin/sql.vim
-#usr/share/vim/vim72/ftplugin/sshconfig.vim
-#usr/share/vim/vim72/ftplugin/sudoers.vim
-#usr/share/vim/vim72/ftplugin/svg.vim
-#usr/share/vim/vim72/ftplugin/sysctl.vim
-#usr/share/vim/vim72/ftplugin/tcsh.vim
-#usr/share/vim/vim72/ftplugin/terminfo.vim
-#usr/share/vim/vim72/ftplugin/tex.vim
-#usr/share/vim/vim72/ftplugin/udevconf.vim
-#usr/share/vim/vim72/ftplugin/udevperm.vim
-#usr/share/vim/vim72/ftplugin/udevrules.vim
-#usr/share/vim/vim72/ftplugin/updatedb.vim
-#usr/share/vim/vim72/ftplugin/vb.vim
-#usr/share/vim/vim72/ftplugin/verilog.vim
-#usr/share/vim/vim72/ftplugin/vhdl.vim
-#usr/share/vim/vim72/ftplugin/vim.vim
-#usr/share/vim/vim72/ftplugin/xdefaults.vim
-#usr/share/vim/vim72/ftplugin/xf86conf.vim
-#usr/share/vim/vim72/ftplugin/xhtml.vim
-#usr/share/vim/vim72/ftplugin/xinetd.vim
-#usr/share/vim/vim72/ftplugin/xml.vim
-#usr/share/vim/vim72/ftplugin/xmodmap.vim
-#usr/share/vim/vim72/ftplugin/xs.vim
-#usr/share/vim/vim72/ftplugin/xsd.vim
-#usr/share/vim/vim72/ftplugin/xslt.vim
-#usr/share/vim/vim72/ftplugin/yaml.vim
-#usr/share/vim/vim72/ftplugin/zsh.vim
-#usr/share/vim/vim72/ftplugof.vim
-#usr/share/vim/vim72/gvimrc_example.vim
-#usr/share/vim/vim72/indent
-#usr/share/vim/vim72/indent.vim
-#usr/share/vim/vim72/indent/GenericIndent.vim
-#usr/share/vim/vim72/indent/README.txt
-#usr/share/vim/vim72/indent/aap.vim
-#usr/share/vim/vim72/indent/ada.vim
-#usr/share/vim/vim72/indent/ant.vim
-#usr/share/vim/vim72/indent/automake.vim
-#usr/share/vim/vim72/indent/awk.vim
-#usr/share/vim/vim72/indent/bib.vim
-#usr/share/vim/vim72/indent/bst.vim
-#usr/share/vim/vim72/indent/c.vim
-#usr/share/vim/vim72/indent/cdl.vim
-#usr/share/vim/vim72/indent/ch.vim
-#usr/share/vim/vim72/indent/changelog.vim
-#usr/share/vim/vim72/indent/cmake.vim
-#usr/share/vim/vim72/indent/cobol.vim
-#usr/share/vim/vim72/indent/config.vim
-#usr/share/vim/vim72/indent/cpp.vim
-#usr/share/vim/vim72/indent/cs.vim
-#usr/share/vim/vim72/indent/css.vim
-#usr/share/vim/vim72/indent/d.vim
-#usr/share/vim/vim72/indent/dictconf.vim
-#usr/share/vim/vim72/indent/dictdconf.vim
-#usr/share/vim/vim72/indent/docbk.vim
-#usr/share/vim/vim72/indent/dtd.vim
-#usr/share/vim/vim72/indent/dtrace.vim
-#usr/share/vim/vim72/indent/dylan.vim
-#usr/share/vim/vim72/indent/eiffel.vim
-#usr/share/vim/vim72/indent/erlang.vim
-#usr/share/vim/vim72/indent/eruby.vim
-#usr/share/vim/vim72/indent/eterm.vim
-#usr/share/vim/vim72/indent/fortran.vim
-#usr/share/vim/vim72/indent/framescript.vim
-#usr/share/vim/vim72/indent/gitconfig.vim
-#usr/share/vim/vim72/indent/haml.vim
-#usr/share/vim/vim72/indent/hamster.vim
-#usr/share/vim/vim72/indent/html.vim
-#usr/share/vim/vim72/indent/htmldjango.vim
-#usr/share/vim/vim72/indent/idlang.vim
-#usr/share/vim/vim72/indent/ishd.vim
-#usr/share/vim/vim72/indent/java.vim
-#usr/share/vim/vim72/indent/javascript.vim
-#usr/share/vim/vim72/indent/jsp.vim
-#usr/share/vim/vim72/indent/ld.vim
-#usr/share/vim/vim72/indent/lisp.vim
-#usr/share/vim/vim72/indent/logtalk.vim
-#usr/share/vim/vim72/indent/lua.vim
-#usr/share/vim/vim72/indent/make.vim
-#usr/share/vim/vim72/indent/matlab.vim
-#usr/share/vim/vim72/indent/mma.vim
-#usr/share/vim/vim72/indent/mp.vim
-#usr/share/vim/vim72/indent/mupad.vim
-#usr/share/vim/vim72/indent/objc.vim
-#usr/share/vim/vim72/indent/ocaml.vim
-#usr/share/vim/vim72/indent/occam.vim
-#usr/share/vim/vim72/indent/pascal.vim
-#usr/share/vim/vim72/indent/perl.vim
-#usr/share/vim/vim72/indent/php.vim
-#usr/share/vim/vim72/indent/postscr.vim
-#usr/share/vim/vim72/indent/pov.vim
-#usr/share/vim/vim72/indent/prolog.vim
-#usr/share/vim/vim72/indent/pyrex.vim
-#usr/share/vim/vim72/indent/python.vim
-#usr/share/vim/vim72/indent/readline.vim
-#usr/share/vim/vim72/indent/rpl.vim
-#usr/share/vim/vim72/indent/rst.vim
-#usr/share/vim/vim72/indent/ruby.vim
-#usr/share/vim/vim72/indent/sass.vim
-#usr/share/vim/vim72/indent/scheme.vim
-#usr/share/vim/vim72/indent/sdl.vim
-#usr/share/vim/vim72/indent/sh.vim
-#usr/share/vim/vim72/indent/sml.vim
-#usr/share/vim/vim72/indent/sql.vim
-#usr/share/vim/vim72/indent/sqlanywhere.vim
-#usr/share/vim/vim72/indent/tcl.vim
-#usr/share/vim/vim72/indent/tcsh.vim
-#usr/share/vim/vim72/indent/tf.vim
-#usr/share/vim/vim72/indent/tilde.vim
-#usr/share/vim/vim72/indent/vb.vim
-#usr/share/vim/vim72/indent/verilog.vim
-#usr/share/vim/vim72/indent/vhdl.vim
-#usr/share/vim/vim72/indent/vim.vim
-#usr/share/vim/vim72/indent/xf86conf.vim
-#usr/share/vim/vim72/indent/xhtml.vim
-#usr/share/vim/vim72/indent/xinetd.vim
-#usr/share/vim/vim72/indent/xml.vim
-#usr/share/vim/vim72/indent/xsd.vim
-#usr/share/vim/vim72/indent/xslt.vim
-#usr/share/vim/vim72/indent/yacc.vim
-#usr/share/vim/vim72/indent/zsh.vim
-#usr/share/vim/vim72/indoff.vim
-#usr/share/vim/vim72/macros
-#usr/share/vim/vim72/macros/README.txt
-#usr/share/vim/vim72/macros/dvorak
-#usr/share/vim/vim72/macros/editexisting.vim
-#usr/share/vim/vim72/macros/hanoi
-#usr/share/vim/vim72/macros/hanoi/click.me
-#usr/share/vim/vim72/macros/hanoi/hanoi.vim
-#usr/share/vim/vim72/macros/hanoi/poster
-#usr/share/vim/vim72/macros/justify.vim
-#usr/share/vim/vim72/macros/less.sh
-#usr/share/vim/vim72/macros/less.vim
-#usr/share/vim/vim72/macros/life
-#usr/share/vim/vim72/macros/life/click.me
-#usr/share/vim/vim72/macros/life/life.vim
-#usr/share/vim/vim72/macros/matchit.txt
-#usr/share/vim/vim72/macros/matchit.vim
-#usr/share/vim/vim72/macros/maze
-#usr/share/vim/vim72/macros/maze/Makefile
-#usr/share/vim/vim72/macros/maze/README.txt
-#usr/share/vim/vim72/macros/maze/main.aap
-#usr/share/vim/vim72/macros/maze/maze.c
-#usr/share/vim/vim72/macros/maze/maze_5.78
-#usr/share/vim/vim72/macros/maze/maze_mac
-#usr/share/vim/vim72/macros/maze/mazeansi.c
-#usr/share/vim/vim72/macros/maze/mazeclean.c
-#usr/share/vim/vim72/macros/maze/poster
-#usr/share/vim/vim72/macros/shellmenu.vim
-#usr/share/vim/vim72/macros/swapmous.vim
-#usr/share/vim/vim72/macros/urm
-#usr/share/vim/vim72/macros/urm/README.txt
-#usr/share/vim/vim72/macros/urm/examples
-#usr/share/vim/vim72/macros/urm/urm
-#usr/share/vim/vim72/macros/urm/urm.vim
-#usr/share/vim/vim72/menu.vim
-#usr/share/vim/vim72/mswin.vim
-#usr/share/vim/vim72/optwin.vim
-#usr/share/vim/vim72/plugin
-#usr/share/vim/vim72/plugin/README.txt
-#usr/share/vim/vim72/plugin/getscriptPlugin.vim
-#usr/share/vim/vim72/plugin/gzip.vim
-#usr/share/vim/vim72/plugin/matchparen.vim
-#usr/share/vim/vim72/plugin/netrwPlugin.vim
-#usr/share/vim/vim72/plugin/rrhelper.vim
-#usr/share/vim/vim72/plugin/spellfile.vim
-#usr/share/vim/vim72/plugin/tarPlugin.vim
-#usr/share/vim/vim72/plugin/tohtml.vim
-#usr/share/vim/vim72/plugin/vimballPlugin.vim
-#usr/share/vim/vim72/plugin/zipPlugin.vim
-#usr/share/vim/vim72/print
-#usr/share/vim/vim72/print/ascii.ps
-#usr/share/vim/vim72/print/cidfont.ps
-#usr/share/vim/vim72/print/cns_roman.ps
-#usr/share/vim/vim72/print/cp1250.ps
-#usr/share/vim/vim72/print/cp1251.ps
-#usr/share/vim/vim72/print/cp1252.ps
-#usr/share/vim/vim72/print/cp1253.ps
-#usr/share/vim/vim72/print/cp1254.ps
-#usr/share/vim/vim72/print/cp1255.ps
-#usr/share/vim/vim72/print/cp1257.ps
-#usr/share/vim/vim72/print/dec-mcs.ps
-#usr/share/vim/vim72/print/ebcdic-uk.ps
-#usr/share/vim/vim72/print/gb_roman.ps
-#usr/share/vim/vim72/print/hp-roman8.ps
-#usr/share/vim/vim72/print/iso-8859-10.ps
-#usr/share/vim/vim72/print/iso-8859-11.ps
-#usr/share/vim/vim72/print/iso-8859-13.ps
-#usr/share/vim/vim72/print/iso-8859-14.ps
-#usr/share/vim/vim72/print/iso-8859-15.ps
-#usr/share/vim/vim72/print/iso-8859-2.ps
-#usr/share/vim/vim72/print/iso-8859-3.ps
-#usr/share/vim/vim72/print/iso-8859-4.ps
-#usr/share/vim/vim72/print/iso-8859-5.ps
-#usr/share/vim/vim72/print/iso-8859-7.ps
-#usr/share/vim/vim72/print/iso-8859-8.ps
-#usr/share/vim/vim72/print/iso-8859-9.ps
-#usr/share/vim/vim72/print/jis_roman.ps
-#usr/share/vim/vim72/print/koi8-r.ps
-#usr/share/vim/vim72/print/koi8-u.ps
-#usr/share/vim/vim72/print/ks_roman.ps
-#usr/share/vim/vim72/print/latin1.ps
-#usr/share/vim/vim72/print/mac-roman.ps
-#usr/share/vim/vim72/print/prolog.ps
-#usr/share/vim/vim72/scripts.vim
-#usr/share/vim/vim72/spell
-#usr/share/vim/vim72/spell/cleanadd.vim
-#usr/share/vim/vim72/spell/en.ascii.spl
-#usr/share/vim/vim72/spell/en.ascii.sug
-#usr/share/vim/vim72/spell/en.latin1.spl
-#usr/share/vim/vim72/spell/en.latin1.sug
-#usr/share/vim/vim72/spell/en.utf-8.spl
-#usr/share/vim/vim72/spell/en.utf-8.sug
-#usr/share/vim/vim72/spell/he.vim
-#usr/share/vim/vim72/spell/yi.vim
-#usr/share/vim/vim72/synmenu.vim
-#usr/share/vim/vim72/syntax
-#usr/share/vim/vim72/syntax/2html.vim
-#usr/share/vim/vim72/syntax/README.txt
-#usr/share/vim/vim72/syntax/a2ps.vim
-#usr/share/vim/vim72/syntax/a65.vim
-#usr/share/vim/vim72/syntax/aap.vim
-#usr/share/vim/vim72/syntax/abap.vim
-#usr/share/vim/vim72/syntax/abaqus.vim
-#usr/share/vim/vim72/syntax/abc.vim
-#usr/share/vim/vim72/syntax/abel.vim
-#usr/share/vim/vim72/syntax/acedb.vim
-#usr/share/vim/vim72/syntax/ada.vim
-#usr/share/vim/vim72/syntax/aflex.vim
-#usr/share/vim/vim72/syntax/ahdl.vim
-#usr/share/vim/vim72/syntax/alsaconf.vim
-#usr/share/vim/vim72/syntax/amiga.vim
-#usr/share/vim/vim72/syntax/aml.vim
-#usr/share/vim/vim72/syntax/ampl.vim
-#usr/share/vim/vim72/syntax/ant.vim
-#usr/share/vim/vim72/syntax/antlr.vim
-#usr/share/vim/vim72/syntax/apache.vim
-#usr/share/vim/vim72/syntax/apachestyle.vim
-#usr/share/vim/vim72/syntax/arch.vim
-#usr/share/vim/vim72/syntax/art.vim
-#usr/share/vim/vim72/syntax/asm.vim
-#usr/share/vim/vim72/syntax/asm68k.vim
-#usr/share/vim/vim72/syntax/asmh8300.vim
-#usr/share/vim/vim72/syntax/asn.vim
-#usr/share/vim/vim72/syntax/aspperl.vim
-#usr/share/vim/vim72/syntax/aspvbs.vim
-#usr/share/vim/vim72/syntax/asterisk.vim
-#usr/share/vim/vim72/syntax/asteriskvm.vim
-#usr/share/vim/vim72/syntax/atlas.vim
-#usr/share/vim/vim72/syntax/autohotkey.vim
-#usr/share/vim/vim72/syntax/autoit.vim
-#usr/share/vim/vim72/syntax/automake.vim
-#usr/share/vim/vim72/syntax/ave.vim
-#usr/share/vim/vim72/syntax/awk.vim
-#usr/share/vim/vim72/syntax/ayacc.vim
-#usr/share/vim/vim72/syntax/b.vim
-#usr/share/vim/vim72/syntax/baan.vim
-#usr/share/vim/vim72/syntax/basic.vim
-#usr/share/vim/vim72/syntax/bc.vim
-#usr/share/vim/vim72/syntax/bdf.vim
-#usr/share/vim/vim72/syntax/bib.vim
-#usr/share/vim/vim72/syntax/bindzone.vim
-#usr/share/vim/vim72/syntax/blank.vim
-#usr/share/vim/vim72/syntax/bst.vim
-#usr/share/vim/vim72/syntax/btm.vim
-#usr/share/vim/vim72/syntax/bzr.vim
-#usr/share/vim/vim72/syntax/c.vim
-#usr/share/vim/vim72/syntax/calendar.vim
-#usr/share/vim/vim72/syntax/catalog.vim
-#usr/share/vim/vim72/syntax/cdl.vim
-#usr/share/vim/vim72/syntax/cdrdaoconf.vim
-#usr/share/vim/vim72/syntax/cdrtoc.vim
-#usr/share/vim/vim72/syntax/cf.vim
-#usr/share/vim/vim72/syntax/cfg.vim
-#usr/share/vim/vim72/syntax/ch.vim
-#usr/share/vim/vim72/syntax/change.vim
-#usr/share/vim/vim72/syntax/changelog.vim
-#usr/share/vim/vim72/syntax/chaskell.vim
-#usr/share/vim/vim72/syntax/cheetah.vim
-#usr/share/vim/vim72/syntax/chill.vim
-#usr/share/vim/vim72/syntax/chordpro.vim
-#usr/share/vim/vim72/syntax/cl.vim
-#usr/share/vim/vim72/syntax/clean.vim
-#usr/share/vim/vim72/syntax/clipper.vim
-#usr/share/vim/vim72/syntax/cmake.vim
-#usr/share/vim/vim72/syntax/cmusrc.vim
-#usr/share/vim/vim72/syntax/cobol.vim
-#usr/share/vim/vim72/syntax/coco.vim
-#usr/share/vim/vim72/syntax/colortest.vim
-#usr/share/vim/vim72/syntax/conaryrecipe.vim
-#usr/share/vim/vim72/syntax/conf.vim
-#usr/share/vim/vim72/syntax/config.vim
-#usr/share/vim/vim72/syntax/context.vim
-#usr/share/vim/vim72/syntax/cpp.vim
-#usr/share/vim/vim72/syntax/crm.vim
-#usr/share/vim/vim72/syntax/crontab.vim
-#usr/share/vim/vim72/syntax/cs.vim
-#usr/share/vim/vim72/syntax/csc.vim
-#usr/share/vim/vim72/syntax/csh.vim
-#usr/share/vim/vim72/syntax/csp.vim
-#usr/share/vim/vim72/syntax/css.vim
-#usr/share/vim/vim72/syntax/cterm.vim
-#usr/share/vim/vim72/syntax/ctrlh.vim
-#usr/share/vim/vim72/syntax/cuda.vim
-#usr/share/vim/vim72/syntax/cupl.vim
-#usr/share/vim/vim72/syntax/cuplsim.vim
-#usr/share/vim/vim72/syntax/cvs.vim
-#usr/share/vim/vim72/syntax/cvsrc.vim
-#usr/share/vim/vim72/syntax/cweb.vim
-#usr/share/vim/vim72/syntax/cynlib.vim
-#usr/share/vim/vim72/syntax/cynpp.vim
-#usr/share/vim/vim72/syntax/d.vim
-#usr/share/vim/vim72/syntax/dcd.vim
-#usr/share/vim/vim72/syntax/dcl.vim
-#usr/share/vim/vim72/syntax/debchangelog.vim
-#usr/share/vim/vim72/syntax/debcontrol.vim
-#usr/share/vim/vim72/syntax/debsources.vim
-#usr/share/vim/vim72/syntax/def.vim
-#usr/share/vim/vim72/syntax/denyhosts.vim
-#usr/share/vim/vim72/syntax/desc.vim
-#usr/share/vim/vim72/syntax/desktop.vim
-#usr/share/vim/vim72/syntax/dictconf.vim
-#usr/share/vim/vim72/syntax/dictdconf.vim
-#usr/share/vim/vim72/syntax/diff.vim
-#usr/share/vim/vim72/syntax/dircolors.vim
-#usr/share/vim/vim72/syntax/diva.vim
-#usr/share/vim/vim72/syntax/django.vim
-#usr/share/vim/vim72/syntax/dns.vim
-#usr/share/vim/vim72/syntax/docbk.vim
-#usr/share/vim/vim72/syntax/docbksgml.vim
-#usr/share/vim/vim72/syntax/docbkxml.vim
-#usr/share/vim/vim72/syntax/dosbatch.vim
-#usr/share/vim/vim72/syntax/dosini.vim
-#usr/share/vim/vim72/syntax/dot.vim
-#usr/share/vim/vim72/syntax/doxygen.vim
-#usr/share/vim/vim72/syntax/dracula.vim
-#usr/share/vim/vim72/syntax/dsl.vim
-#usr/share/vim/vim72/syntax/dtd.vim
-#usr/share/vim/vim72/syntax/dtml.vim
-#usr/share/vim/vim72/syntax/dtrace.vim
-#usr/share/vim/vim72/syntax/dylan.vim
-#usr/share/vim/vim72/syntax/dylanintr.vim
-#usr/share/vim/vim72/syntax/dylanlid.vim
-#usr/share/vim/vim72/syntax/ecd.vim
-#usr/share/vim/vim72/syntax/edif.vim
-#usr/share/vim/vim72/syntax/eiffel.vim
-#usr/share/vim/vim72/syntax/elf.vim
-#usr/share/vim/vim72/syntax/elinks.vim
-#usr/share/vim/vim72/syntax/elmfilt.vim
-#usr/share/vim/vim72/syntax/erlang.vim
-#usr/share/vim/vim72/syntax/eruby.vim
-#usr/share/vim/vim72/syntax/esmtprc.vim
-#usr/share/vim/vim72/syntax/esqlc.vim
-#usr/share/vim/vim72/syntax/esterel.vim
-#usr/share/vim/vim72/syntax/eterm.vim
-#usr/share/vim/vim72/syntax/eviews.vim
-#usr/share/vim/vim72/syntax/exim.vim
-#usr/share/vim/vim72/syntax/expect.vim
-#usr/share/vim/vim72/syntax/exports.vim
-#usr/share/vim/vim72/syntax/fasm.vim
-#usr/share/vim/vim72/syntax/fdcc.vim
-#usr/share/vim/vim72/syntax/fetchmail.vim
-#usr/share/vim/vim72/syntax/fgl.vim
-#usr/share/vim/vim72/syntax/flexwiki.vim
-#usr/share/vim/vim72/syntax/focexec.vim
-#usr/share/vim/vim72/syntax/form.vim
-#usr/share/vim/vim72/syntax/forth.vim
-#usr/share/vim/vim72/syntax/fortran.vim
-#usr/share/vim/vim72/syntax/foxpro.vim
-#usr/share/vim/vim72/syntax/framescript.vim
-#usr/share/vim/vim72/syntax/freebasic.vim
-#usr/share/vim/vim72/syntax/fstab.vim
-#usr/share/vim/vim72/syntax/fvwm.vim
-#usr/share/vim/vim72/syntax/fvwm2m4.vim
-#usr/share/vim/vim72/syntax/gdb.vim
-#usr/share/vim/vim72/syntax/gdmo.vim
-#usr/share/vim/vim72/syntax/gedcom.vim
-#usr/share/vim/vim72/syntax/git.vim
-#usr/share/vim/vim72/syntax/gitcommit.vim
-#usr/share/vim/vim72/syntax/gitconfig.vim
-#usr/share/vim/vim72/syntax/gitrebase.vim
-#usr/share/vim/vim72/syntax/gitsendemail.vim
-#usr/share/vim/vim72/syntax/gkrellmrc.vim
-#usr/share/vim/vim72/syntax/gnuplot.vim
-#usr/share/vim/vim72/syntax/gp.vim
-#usr/share/vim/vim72/syntax/gpg.vim
-#usr/share/vim/vim72/syntax/grads.vim
-#usr/share/vim/vim72/syntax/gretl.vim
-#usr/share/vim/vim72/syntax/groff.vim
-#usr/share/vim/vim72/syntax/groovy.vim
-#usr/share/vim/vim72/syntax/group.vim
-#usr/share/vim/vim72/syntax/grub.vim
-#usr/share/vim/vim72/syntax/gsp.vim
-#usr/share/vim/vim72/syntax/gtkrc.vim
-#usr/share/vim/vim72/syntax/haml.vim
-#usr/share/vim/vim72/syntax/hamster.vim
-#usr/share/vim/vim72/syntax/haskell.vim
-#usr/share/vim/vim72/syntax/haste.vim
-#usr/share/vim/vim72/syntax/hastepreproc.vim
-#usr/share/vim/vim72/syntax/hb.vim
-#usr/share/vim/vim72/syntax/help.vim
-#usr/share/vim/vim72/syntax/hercules.vim
-#usr/share/vim/vim72/syntax/hex.vim
-#usr/share/vim/vim72/syntax/hitest.vim
-#usr/share/vim/vim72/syntax/hog.vim
-#usr/share/vim/vim72/syntax/hostconf.vim
-#usr/share/vim/vim72/syntax/html.vim
-#usr/share/vim/vim72/syntax/htmlcheetah.vim
-#usr/share/vim/vim72/syntax/htmldjango.vim
-#usr/share/vim/vim72/syntax/htmlm4.vim
-#usr/share/vim/vim72/syntax/htmlos.vim
-#usr/share/vim/vim72/syntax/ia64.vim
-#usr/share/vim/vim72/syntax/ibasic.vim
-#usr/share/vim/vim72/syntax/icemenu.vim
-#usr/share/vim/vim72/syntax/icon.vim
-#usr/share/vim/vim72/syntax/idl.vim
-#usr/share/vim/vim72/syntax/idlang.vim
-#usr/share/vim/vim72/syntax/indent.vim
-#usr/share/vim/vim72/syntax/inform.vim
-#usr/share/vim/vim72/syntax/initex.vim
-#usr/share/vim/vim72/syntax/initng.vim
-#usr/share/vim/vim72/syntax/inittab.vim
-#usr/share/vim/vim72/syntax/ipfilter.vim
-#usr/share/vim/vim72/syntax/ishd.vim
-#usr/share/vim/vim72/syntax/iss.vim
-#usr/share/vim/vim72/syntax/ist.vim
-#usr/share/vim/vim72/syntax/jal.vim
-#usr/share/vim/vim72/syntax/jam.vim
-#usr/share/vim/vim72/syntax/jargon.vim
-#usr/share/vim/vim72/syntax/java.vim
-#usr/share/vim/vim72/syntax/javacc.vim
-#usr/share/vim/vim72/syntax/javascript.vim
-#usr/share/vim/vim72/syntax/jess.vim
-#usr/share/vim/vim72/syntax/jgraph.vim
-#usr/share/vim/vim72/syntax/jproperties.vim
-#usr/share/vim/vim72/syntax/jsp.vim
-#usr/share/vim/vim72/syntax/kconfig.vim
-#usr/share/vim/vim72/syntax/kix.vim
-#usr/share/vim/vim72/syntax/kscript.vim
-#usr/share/vim/vim72/syntax/kwt.vim
-#usr/share/vim/vim72/syntax/lace.vim
-#usr/share/vim/vim72/syntax/latte.vim
-#usr/share/vim/vim72/syntax/ld.vim
-#usr/share/vim/vim72/syntax/ldapconf.vim
-#usr/share/vim/vim72/syntax/ldif.vim
-#usr/share/vim/vim72/syntax/lex.vim
-#usr/share/vim/vim72/syntax/lftp.vim
-#usr/share/vim/vim72/syntax/lhaskell.vim
-#usr/share/vim/vim72/syntax/libao.vim
-#usr/share/vim/vim72/syntax/lifelines.vim
-#usr/share/vim/vim72/syntax/lilo.vim
-#usr/share/vim/vim72/syntax/limits.vim
-#usr/share/vim/vim72/syntax/lisp.vim
-#usr/share/vim/vim72/syntax/lite.vim
-#usr/share/vim/vim72/syntax/litestep.vim
-#usr/share/vim/vim72/syntax/loginaccess.vim
-#usr/share/vim/vim72/syntax/logindefs.vim
-#usr/share/vim/vim72/syntax/logtalk.vim
-#usr/share/vim/vim72/syntax/lotos.vim
-#usr/share/vim/vim72/syntax/lout.vim
-#usr/share/vim/vim72/syntax/lpc.vim
-#usr/share/vim/vim72/syntax/lprolog.vim
-#usr/share/vim/vim72/syntax/lscript.vim
-#usr/share/vim/vim72/syntax/lsl.vim
-#usr/share/vim/vim72/syntax/lss.vim
-#usr/share/vim/vim72/syntax/lua.vim
-#usr/share/vim/vim72/syntax/lynx.vim
-#usr/share/vim/vim72/syntax/m4.vim
-#usr/share/vim/vim72/syntax/mail.vim
-#usr/share/vim/vim72/syntax/mailaliases.vim
-#usr/share/vim/vim72/syntax/mailcap.vim
-#usr/share/vim/vim72/syntax/make.vim
-#usr/share/vim/vim72/syntax/man.vim
-#usr/share/vim/vim72/syntax/manconf.vim
-#usr/share/vim/vim72/syntax/manual.vim
-#usr/share/vim/vim72/syntax/maple.vim
-#usr/share/vim/vim72/syntax/masm.vim
-#usr/share/vim/vim72/syntax/mason.vim
-#usr/share/vim/vim72/syntax/master.vim
-#usr/share/vim/vim72/syntax/matlab.vim
-#usr/share/vim/vim72/syntax/maxima.vim
-#usr/share/vim/vim72/syntax/mel.vim
-#usr/share/vim/vim72/syntax/messages.vim
-#usr/share/vim/vim72/syntax/mf.vim
-#usr/share/vim/vim72/syntax/mgl.vim
-#usr/share/vim/vim72/syntax/mgp.vim
-#usr/share/vim/vim72/syntax/mib.vim
-#usr/share/vim/vim72/syntax/mma.vim
-#usr/share/vim/vim72/syntax/mmix.vim
-#usr/share/vim/vim72/syntax/mmp.vim
-#usr/share/vim/vim72/syntax/modconf.vim
-#usr/share/vim/vim72/syntax/model.vim
-#usr/share/vim/vim72/syntax/modsim3.vim
-#usr/share/vim/vim72/syntax/modula2.vim
-#usr/share/vim/vim72/syntax/modula3.vim
-#usr/share/vim/vim72/syntax/monk.vim
-#usr/share/vim/vim72/syntax/moo.vim
-#usr/share/vim/vim72/syntax/mp.vim
-#usr/share/vim/vim72/syntax/mplayerconf.vim
-#usr/share/vim/vim72/syntax/mrxvtrc.vim
-#usr/share/vim/vim72/syntax/msidl.vim
-#usr/share/vim/vim72/syntax/msmessages.vim
-#usr/share/vim/vim72/syntax/msql.vim
-#usr/share/vim/vim72/syntax/mupad.vim
-#usr/share/vim/vim72/syntax/mush.vim
-#usr/share/vim/vim72/syntax/muttrc.vim
-#usr/share/vim/vim72/syntax/mysql.vim
-#usr/share/vim/vim72/syntax/named.vim
-#usr/share/vim/vim72/syntax/nanorc.vim
-#usr/share/vim/vim72/syntax/nasm.vim
-#usr/share/vim/vim72/syntax/nastran.vim
-#usr/share/vim/vim72/syntax/natural.vim
-#usr/share/vim/vim72/syntax/ncf.vim
-#usr/share/vim/vim72/syntax/netrc.vim
-#usr/share/vim/vim72/syntax/netrw.vim
-#usr/share/vim/vim72/syntax/nosyntax.vim
-#usr/share/vim/vim72/syntax/nqc.vim
-#usr/share/vim/vim72/syntax/nroff.vim
-#usr/share/vim/vim72/syntax/nsis.vim
-#usr/share/vim/vim72/syntax/objc.vim
-#usr/share/vim/vim72/syntax/objcpp.vim
-#usr/share/vim/vim72/syntax/ocaml.vim
-#usr/share/vim/vim72/syntax/occam.vim
-#usr/share/vim/vim72/syntax/omnimark.vim
-#usr/share/vim/vim72/syntax/openroad.vim
-#usr/share/vim/vim72/syntax/opl.vim
-#usr/share/vim/vim72/syntax/ora.vim
-#usr/share/vim/vim72/syntax/pamconf.vim
-#usr/share/vim/vim72/syntax/papp.vim
-#usr/share/vim/vim72/syntax/pascal.vim
-#usr/share/vim/vim72/syntax/passwd.vim
-#usr/share/vim/vim72/syntax/pcap.vim
-#usr/share/vim/vim72/syntax/pccts.vim
-#usr/share/vim/vim72/syntax/pdf.vim
-#usr/share/vim/vim72/syntax/perl.vim
-#usr/share/vim/vim72/syntax/pf.vim
-#usr/share/vim/vim72/syntax/pfmain.vim
-#usr/share/vim/vim72/syntax/php.vim
-#usr/share/vim/vim72/syntax/phtml.vim
-#usr/share/vim/vim72/syntax/pic.vim
-#usr/share/vim/vim72/syntax/pike.vim
-#usr/share/vim/vim72/syntax/pilrc.vim
-#usr/share/vim/vim72/syntax/pine.vim
-#usr/share/vim/vim72/syntax/pinfo.vim
-#usr/share/vim/vim72/syntax/plaintex.vim
-#usr/share/vim/vim72/syntax/plm.vim
-#usr/share/vim/vim72/syntax/plp.vim
-#usr/share/vim/vim72/syntax/plsql.vim
-#usr/share/vim/vim72/syntax/po.vim
-#usr/share/vim/vim72/syntax/pod.vim
-#usr/share/vim/vim72/syntax/postscr.vim
-#usr/share/vim/vim72/syntax/pov.vim
-#usr/share/vim/vim72/syntax/povini.vim
-#usr/share/vim/vim72/syntax/ppd.vim
-#usr/share/vim/vim72/syntax/ppwiz.vim
-#usr/share/vim/vim72/syntax/prescribe.vim
-#usr/share/vim/vim72/syntax/privoxy.vim
-#usr/share/vim/vim72/syntax/procmail.vim
-#usr/share/vim/vim72/syntax/progress.vim
-#usr/share/vim/vim72/syntax/prolog.vim
-#usr/share/vim/vim72/syntax/promela.vim
-#usr/share/vim/vim72/syntax/protocols.vim
-#usr/share/vim/vim72/syntax/psf.vim
-#usr/share/vim/vim72/syntax/ptcap.vim
-#usr/share/vim/vim72/syntax/purifylog.vim
-#usr/share/vim/vim72/syntax/pyrex.vim
-#usr/share/vim/vim72/syntax/python.vim
-#usr/share/vim/vim72/syntax/qf.vim
-#usr/share/vim/vim72/syntax/quake.vim
-#usr/share/vim/vim72/syntax/r.vim
-#usr/share/vim/vim72/syntax/racc.vim
-#usr/share/vim/vim72/syntax/radiance.vim
-#usr/share/vim/vim72/syntax/ratpoison.vim
-#usr/share/vim/vim72/syntax/rc.vim
-#usr/share/vim/vim72/syntax/rcs.vim
-#usr/share/vim/vim72/syntax/rcslog.vim
-#usr/share/vim/vim72/syntax/readline.vim
-#usr/share/vim/vim72/syntax/rebol.vim
-#usr/share/vim/vim72/syntax/registry.vim
-#usr/share/vim/vim72/syntax/remind.vim
-#usr/share/vim/vim72/syntax/resolv.vim
-#usr/share/vim/vim72/syntax/reva.vim
-#usr/share/vim/vim72/syntax/rexx.vim
-#usr/share/vim/vim72/syntax/rhelp.vim
-#usr/share/vim/vim72/syntax/rib.vim
-#usr/share/vim/vim72/syntax/rnc.vim
-#usr/share/vim/vim72/syntax/rnoweb.vim
-#usr/share/vim/vim72/syntax/robots.vim
-#usr/share/vim/vim72/syntax/rpcgen.vim
-#usr/share/vim/vim72/syntax/rpl.vim
-#usr/share/vim/vim72/syntax/rst.vim
-#usr/share/vim/vim72/syntax/rtf.vim
-#usr/share/vim/vim72/syntax/ruby.vim
-#usr/share/vim/vim72/syntax/samba.vim
-#usr/share/vim/vim72/syntax/sas.vim
-#usr/share/vim/vim72/syntax/sass.vim
-#usr/share/vim/vim72/syntax/sather.vim
-#usr/share/vim/vim72/syntax/scheme.vim
-#usr/share/vim/vim72/syntax/scilab.vim
-#usr/share/vim/vim72/syntax/screen.vim
-#usr/share/vim/vim72/syntax/sd.vim
-#usr/share/vim/vim72/syntax/sdl.vim
-#usr/share/vim/vim72/syntax/sed.vim
-#usr/share/vim/vim72/syntax/sendpr.vim
-#usr/share/vim/vim72/syntax/sensors.vim
-#usr/share/vim/vim72/syntax/services.vim
-#usr/share/vim/vim72/syntax/setserial.vim
-#usr/share/vim/vim72/syntax/sgml.vim
-#usr/share/vim/vim72/syntax/sgmldecl.vim
-#usr/share/vim/vim72/syntax/sgmllnx.vim
-#usr/share/vim/vim72/syntax/sh.vim
-#usr/share/vim/vim72/syntax/sicad.vim
-#usr/share/vim/vim72/syntax/sieve.vim
-#usr/share/vim/vim72/syntax/simula.vim
-#usr/share/vim/vim72/syntax/sinda.vim
-#usr/share/vim/vim72/syntax/sindacmp.vim
-#usr/share/vim/vim72/syntax/sindaout.vim
-#usr/share/vim/vim72/syntax/sisu.vim
-#usr/share/vim/vim72/syntax/skill.vim
-#usr/share/vim/vim72/syntax/sl.vim
-#usr/share/vim/vim72/syntax/slang.vim
-#usr/share/vim/vim72/syntax/slice.vim
-#usr/share/vim/vim72/syntax/slpconf.vim
-#usr/share/vim/vim72/syntax/slpreg.vim
-#usr/share/vim/vim72/syntax/slpspi.vim
-#usr/share/vim/vim72/syntax/slrnrc.vim
-#usr/share/vim/vim72/syntax/slrnsc.vim
-#usr/share/vim/vim72/syntax/sm.vim
-#usr/share/vim/vim72/syntax/smarty.vim
-#usr/share/vim/vim72/syntax/smcl.vim
-#usr/share/vim/vim72/syntax/smil.vim
-#usr/share/vim/vim72/syntax/smith.vim
-#usr/share/vim/vim72/syntax/sml.vim
-#usr/share/vim/vim72/syntax/snnsnet.vim
-#usr/share/vim/vim72/syntax/snnspat.vim
-#usr/share/vim/vim72/syntax/snnsres.vim
-#usr/share/vim/vim72/syntax/snobol4.vim
-#usr/share/vim/vim72/syntax/spec.vim
-#usr/share/vim/vim72/syntax/specman.vim
-#usr/share/vim/vim72/syntax/spice.vim
-#usr/share/vim/vim72/syntax/splint.vim
-#usr/share/vim/vim72/syntax/spup.vim
-#usr/share/vim/vim72/syntax/spyce.vim
-#usr/share/vim/vim72/syntax/sql.vim
-#usr/share/vim/vim72/syntax/sqlanywhere.vim
-#usr/share/vim/vim72/syntax/sqlforms.vim
-#usr/share/vim/vim72/syntax/sqlinformix.vim
-#usr/share/vim/vim72/syntax/sqlj.vim
-#usr/share/vim/vim72/syntax/sqloracle.vim
-#usr/share/vim/vim72/syntax/sqr.vim
-#usr/share/vim/vim72/syntax/squid.vim
-#usr/share/vim/vim72/syntax/sshconfig.vim
-#usr/share/vim/vim72/syntax/sshdconfig.vim
-#usr/share/vim/vim72/syntax/st.vim
-#usr/share/vim/vim72/syntax/stata.vim
-#usr/share/vim/vim72/syntax/stp.vim
-#usr/share/vim/vim72/syntax/strace.vim
-#usr/share/vim/vim72/syntax/sudoers.vim
-#usr/share/vim/vim72/syntax/svn.vim
-#usr/share/vim/vim72/syntax/syncolor.vim
-#usr/share/vim/vim72/syntax/synload.vim
-#usr/share/vim/vim72/syntax/syntax.vim
-#usr/share/vim/vim72/syntax/sysctl.vim
-#usr/share/vim/vim72/syntax/tads.vim
-#usr/share/vim/vim72/syntax/tags.vim
-#usr/share/vim/vim72/syntax/tak.vim
-#usr/share/vim/vim72/syntax/takcmp.vim
-#usr/share/vim/vim72/syntax/takout.vim
-#usr/share/vim/vim72/syntax/tar.vim
-#usr/share/vim/vim72/syntax/tasm.vim
-#usr/share/vim/vim72/syntax/tcl.vim
-#usr/share/vim/vim72/syntax/tcsh.vim
-#usr/share/vim/vim72/syntax/terminfo.vim
-#usr/share/vim/vim72/syntax/tex.vim
-#usr/share/vim/vim72/syntax/texinfo.vim
-#usr/share/vim/vim72/syntax/texmf.vim
-#usr/share/vim/vim72/syntax/tf.vim
-#usr/share/vim/vim72/syntax/tidy.vim
-#usr/share/vim/vim72/syntax/tilde.vim
-#usr/share/vim/vim72/syntax/tli.vim
-#usr/share/vim/vim72/syntax/tpp.vim
-#usr/share/vim/vim72/syntax/trasys.vim
-#usr/share/vim/vim72/syntax/trustees.vim
-#usr/share/vim/vim72/syntax/tsalt.vim
-#usr/share/vim/vim72/syntax/tsscl.vim
-#usr/share/vim/vim72/syntax/tssgm.vim
-#usr/share/vim/vim72/syntax/tssop.vim
-#usr/share/vim/vim72/syntax/uc.vim
-#usr/share/vim/vim72/syntax/udevconf.vim
-#usr/share/vim/vim72/syntax/udevperm.vim
-#usr/share/vim/vim72/syntax/udevrules.vim
-#usr/share/vim/vim72/syntax/uil.vim
-#usr/share/vim/vim72/syntax/updatedb.vim
-#usr/share/vim/vim72/syntax/valgrind.vim
-#usr/share/vim/vim72/syntax/vb.vim
-#usr/share/vim/vim72/syntax/vera.vim
-#usr/share/vim/vim72/syntax/verilog.vim
-#usr/share/vim/vim72/syntax/verilogams.vim
-#usr/share/vim/vim72/syntax/vgrindefs.vim
-#usr/share/vim/vim72/syntax/vhdl.vim
-#usr/share/vim/vim72/syntax/vim.vim
-#usr/share/vim/vim72/syntax/viminfo.vim
-#usr/share/vim/vim72/syntax/virata.vim
-#usr/share/vim/vim72/syntax/vmasm.vim
-#usr/share/vim/vim72/syntax/voscm.vim
-#usr/share/vim/vim72/syntax/vrml.vim
-#usr/share/vim/vim72/syntax/vsejcl.vim
-#usr/share/vim/vim72/syntax/wdiff.vim
-#usr/share/vim/vim72/syntax/web.vim
-#usr/share/vim/vim72/syntax/webmacro.vim
-#usr/share/vim/vim72/syntax/wget.vim
-#usr/share/vim/vim72/syntax/whitespace.vim
-#usr/share/vim/vim72/syntax/winbatch.vim
-#usr/share/vim/vim72/syntax/wml.vim
-#usr/share/vim/vim72/syntax/wsh.vim
-#usr/share/vim/vim72/syntax/wsml.vim
-#usr/share/vim/vim72/syntax/wvdial.vim
-#usr/share/vim/vim72/syntax/xbl.vim
-#usr/share/vim/vim72/syntax/xdefaults.vim
-#usr/share/vim/vim72/syntax/xf86conf.vim
-#usr/share/vim/vim72/syntax/xhtml.vim
-#usr/share/vim/vim72/syntax/xinetd.vim
-#usr/share/vim/vim72/syntax/xkb.vim
-#usr/share/vim/vim72/syntax/xmath.vim
-#usr/share/vim/vim72/syntax/xml.vim
-#usr/share/vim/vim72/syntax/xmodmap.vim
-#usr/share/vim/vim72/syntax/xpm.vim
-#usr/share/vim/vim72/syntax/xpm2.vim
-#usr/share/vim/vim72/syntax/xquery.vim
-#usr/share/vim/vim72/syntax/xs.vim
-#usr/share/vim/vim72/syntax/xsd.vim
-#usr/share/vim/vim72/syntax/xslt.vim
-#usr/share/vim/vim72/syntax/xxd.vim
-#usr/share/vim/vim72/syntax/yacc.vim
-#usr/share/vim/vim72/syntax/yaml.vim
-#usr/share/vim/vim72/syntax/z8a.vim
-#usr/share/vim/vim72/syntax/zsh.vim
-#usr/share/vim/vim72/tools
-#usr/share/vim/vim72/tools/README.txt
-#usr/share/vim/vim72/tools/blink.c
-#usr/share/vim/vim72/tools/ccfilter.1
-#usr/share/vim/vim72/tools/ccfilter.c
-#usr/share/vim/vim72/tools/ccfilter_README.txt
-#usr/share/vim/vim72/tools/efm_filter.pl
-#usr/share/vim/vim72/tools/efm_filter.txt
-#usr/share/vim/vim72/tools/efm_perl.pl
-#usr/share/vim/vim72/tools/mve.awk
-#usr/share/vim/vim72/tools/mve.txt
-#usr/share/vim/vim72/tools/pltags.pl
-#usr/share/vim/vim72/tools/ref
-#usr/share/vim/vim72/tools/shtags.1
-#usr/share/vim/vim72/tools/shtags.pl
-#usr/share/vim/vim72/tools/vim132
-#usr/share/vim/vim72/tools/vim_vs_net.cmd
-#usr/share/vim/vim72/tools/vimm
-#usr/share/vim/vim72/tools/vimspell.sh
-#usr/share/vim/vim72/tools/vimspell.txt
-#usr/share/vim/vim72/tools/xcmdsrv_client.c
-#usr/share/vim/vim72/tutor
-#usr/share/vim/vim72/tutor/README.el.cp737.txt
-#usr/share/vim/vim72/tutor/README.el.txt
-#usr/share/vim/vim72/tutor/README.txt
-#usr/share/vim/vim72/tutor/tutor
-#usr/share/vim/vim72/tutor/tutor.ca
-#usr/share/vim/vim72/tutor/tutor.ca.utf-8
-#usr/share/vim/vim72/tutor/tutor.cs
-#usr/share/vim/vim72/tutor/tutor.cs.cp1250
-#usr/share/vim/vim72/tutor/tutor.cs.utf-8
-#usr/share/vim/vim72/tutor/tutor.de
-#usr/share/vim/vim72/tutor/tutor.de.utf-8
-#usr/share/vim/vim72/tutor/tutor.el
-#usr/share/vim/vim72/tutor/tutor.el.cp737
-#usr/share/vim/vim72/tutor/tutor.el.utf-8
-#usr/share/vim/vim72/tutor/tutor.eo.utf-8
-#usr/share/vim/vim72/tutor/tutor.es
-#usr/share/vim/vim72/tutor/tutor.es.utf-8
-#usr/share/vim/vim72/tutor/tutor.fr
-#usr/share/vim/vim72/tutor/tutor.fr.utf-8
-#usr/share/vim/vim72/tutor/tutor.hr
-#usr/share/vim/vim72/tutor/tutor.hr.cp1250
-#usr/share/vim/vim72/tutor/tutor.hr.utf-8
-#usr/share/vim/vim72/tutor/tutor.hu
-#usr/share/vim/vim72/tutor/tutor.hu.cp1250
-#usr/share/vim/vim72/tutor/tutor.hu.utf-8
-#usr/share/vim/vim72/tutor/tutor.it
-#usr/share/vim/vim72/tutor/tutor.it.utf-8
-#usr/share/vim/vim72/tutor/tutor.ja.euc
-#usr/share/vim/vim72/tutor/tutor.ja.sjis
-#usr/share/vim/vim72/tutor/tutor.ja.utf-8
-#usr/share/vim/vim72/tutor/tutor.ko.euc
-#usr/share/vim/vim72/tutor/tutor.ko.utf-8
-#usr/share/vim/vim72/tutor/tutor.no
-#usr/share/vim/vim72/tutor/tutor.no.utf-8
-#usr/share/vim/vim72/tutor/tutor.pl
-#usr/share/vim/vim72/tutor/tutor.pl.cp1250
-#usr/share/vim/vim72/tutor/tutor.pl.utf-8
-#usr/share/vim/vim72/tutor/tutor.ru
-#usr/share/vim/vim72/tutor/tutor.ru.cp1251
-#usr/share/vim/vim72/tutor/tutor.ru.utf-8
-#usr/share/vim/vim72/tutor/tutor.sk
-#usr/share/vim/vim72/tutor/tutor.sk.cp1250
-#usr/share/vim/vim72/tutor/tutor.sk.utf-8
-#usr/share/vim/vim72/tutor/tutor.sv
-#usr/share/vim/vim72/tutor/tutor.sv.utf-8
-#usr/share/vim/vim72/tutor/tutor.tr.iso9
-#usr/share/vim/vim72/tutor/tutor.tr.utf-8
-#usr/share/vim/vim72/tutor/tutor.utf-8
-#usr/share/vim/vim72/tutor/tutor.vi.utf-8
-#usr/share/vim/vim72/tutor/tutor.vim
-#usr/share/vim/vim72/tutor/tutor.zh.big5
-#usr/share/vim/vim72/tutor/tutor.zh.euc
-#usr/share/vim/vim72/tutor/tutor.zh.utf-8
-#usr/share/vim/vim72/vimrc_example.vim
+#usr/share/vim/vim74
+#usr/share/vim/vim74/autoload
+#usr/share/vim/vim74/autoload/README.txt
+#usr/share/vim/vim74/autoload/ada.vim
+#usr/share/vim/vim74/autoload/adacomplete.vim
+#usr/share/vim/vim74/autoload/ccomplete.vim
+#usr/share/vim/vim74/autoload/clojurecomplete.vim
+#usr/share/vim/vim74/autoload/csscomplete.vim
+#usr/share/vim/vim74/autoload/decada.vim
+#usr/share/vim/vim74/autoload/getscript.vim
+#usr/share/vim/vim74/autoload/gnat.vim
+#usr/share/vim/vim74/autoload/gzip.vim
+#usr/share/vim/vim74/autoload/htmlcomplete.vim
+#usr/share/vim/vim74/autoload/javascriptcomplete.vim
+#usr/share/vim/vim74/autoload/netrw.vim
+#usr/share/vim/vim74/autoload/netrwFileHandlers.vim
+#usr/share/vim/vim74/autoload/netrwSettings.vim
+#usr/share/vim/vim74/autoload/paste.vim
+#usr/share/vim/vim74/autoload/phpcomplete.vim
+#usr/share/vim/vim74/autoload/python3complete.vim
+#usr/share/vim/vim74/autoload/pythoncomplete.vim
+#usr/share/vim/vim74/autoload/rubycomplete.vim
+#usr/share/vim/vim74/autoload/spellfile.vim
+#usr/share/vim/vim74/autoload/sqlcomplete.vim
+#usr/share/vim/vim74/autoload/syntaxcomplete.vim
+#usr/share/vim/vim74/autoload/tar.vim
+#usr/share/vim/vim74/autoload/tohtml.vim
+#usr/share/vim/vim74/autoload/vimball.vim
+#usr/share/vim/vim74/autoload/xml
+#usr/share/vim/vim74/autoload/xml/html32.vim
+#usr/share/vim/vim74/autoload/xml/html401f.vim
+#usr/share/vim/vim74/autoload/xml/html401s.vim
+#usr/share/vim/vim74/autoload/xml/html401t.vim
+#usr/share/vim/vim74/autoload/xml/html40f.vim
+#usr/share/vim/vim74/autoload/xml/html40s.vim
+#usr/share/vim/vim74/autoload/xml/html40t.vim
+#usr/share/vim/vim74/autoload/xml/xhtml10f.vim
+#usr/share/vim/vim74/autoload/xml/xhtml10s.vim
+#usr/share/vim/vim74/autoload/xml/xhtml10t.vim
+#usr/share/vim/vim74/autoload/xml/xhtml11.vim
+#usr/share/vim/vim74/autoload/xml/xsd.vim
+#usr/share/vim/vim74/autoload/xml/xsl.vim
+#usr/share/vim/vim74/autoload/xmlcomplete.vim
+#usr/share/vim/vim74/autoload/zip.vim
+#usr/share/vim/vim74/bugreport.vim
+#usr/share/vim/vim74/colors
+#usr/share/vim/vim74/colors/README.txt
+#usr/share/vim/vim74/colors/blue.vim
+#usr/share/vim/vim74/colors/darkblue.vim
+#usr/share/vim/vim74/colors/default.vim
+#usr/share/vim/vim74/colors/delek.vim
+#usr/share/vim/vim74/colors/desert.vim
+#usr/share/vim/vim74/colors/elflord.vim
+#usr/share/vim/vim74/colors/evening.vim
+#usr/share/vim/vim74/colors/koehler.vim
+#usr/share/vim/vim74/colors/morning.vim
+#usr/share/vim/vim74/colors/murphy.vim
+#usr/share/vim/vim74/colors/pablo.vim
+#usr/share/vim/vim74/colors/peachpuff.vim
+#usr/share/vim/vim74/colors/ron.vim
+#usr/share/vim/vim74/colors/shine.vim
+#usr/share/vim/vim74/colors/slate.vim
+#usr/share/vim/vim74/colors/torte.vim
+#usr/share/vim/vim74/colors/zellner.vim
+#usr/share/vim/vim74/compiler
+#usr/share/vim/vim74/compiler/README.txt
+#usr/share/vim/vim74/compiler/ant.vim
+#usr/share/vim/vim74/compiler/bcc.vim
+#usr/share/vim/vim74/compiler/bdf.vim
+#usr/share/vim/vim74/compiler/checkstyle.vim
+#usr/share/vim/vim74/compiler/cs.vim
+#usr/share/vim/vim74/compiler/cucumber.vim
+#usr/share/vim/vim74/compiler/decada.vim
+#usr/share/vim/vim74/compiler/dot.vim
+#usr/share/vim/vim74/compiler/erlang.vim
+#usr/share/vim/vim74/compiler/eruby.vim
+#usr/share/vim/vim74/compiler/fortran_F.vim
+#usr/share/vim/vim74/compiler/fortran_cv.vim
+#usr/share/vim/vim74/compiler/fortran_elf90.vim
+#usr/share/vim/vim74/compiler/fortran_g77.vim
+#usr/share/vim/vim74/compiler/fortran_lf95.vim
+#usr/share/vim/vim74/compiler/fpc.vim
+#usr/share/vim/vim74/compiler/g95.vim
+#usr/share/vim/vim74/compiler/gcc.vim
+#usr/share/vim/vim74/compiler/gfortran.vim
+#usr/share/vim/vim74/compiler/gnat.vim
+#usr/share/vim/vim74/compiler/haml.vim
+#usr/share/vim/vim74/compiler/hp_acc.vim
+#usr/share/vim/vim74/compiler/icc.vim
+#usr/share/vim/vim74/compiler/ifort.vim
+#usr/share/vim/vim74/compiler/intel.vim
+#usr/share/vim/vim74/compiler/irix5_c.vim
+#usr/share/vim/vim74/compiler/irix5_cpp.vim
+#usr/share/vim/vim74/compiler/javac.vim
+#usr/share/vim/vim74/compiler/jikes.vim
+#usr/share/vim/vim74/compiler/mcs.vim
+#usr/share/vim/vim74/compiler/mips_c.vim
+#usr/share/vim/vim74/compiler/mipspro_c89.vim
+#usr/share/vim/vim74/compiler/mipspro_cpp.vim
+#usr/share/vim/vim74/compiler/modelsim_vcom.vim
+#usr/share/vim/vim74/compiler/msbuild.vim
+#usr/share/vim/vim74/compiler/msvc.vim
+#usr/share/vim/vim74/compiler/neato.vim
+#usr/share/vim/vim74/compiler/ocaml.vim
+#usr/share/vim/vim74/compiler/onsgmls.vim
+#usr/share/vim/vim74/compiler/pbx.vim
+#usr/share/vim/vim74/compiler/perl.vim
+#usr/share/vim/vim74/compiler/php.vim
+#usr/share/vim/vim74/compiler/pyunit.vim
+#usr/share/vim/vim74/compiler/rake.vim
+#usr/share/vim/vim74/compiler/rspec.vim
+#usr/share/vim/vim74/compiler/rst.vim
+#usr/share/vim/vim74/compiler/ruby.vim
+#usr/share/vim/vim74/compiler/rubyunit.vim
+#usr/share/vim/vim74/compiler/sass.vim
+#usr/share/vim/vim74/compiler/se.vim
+#usr/share/vim/vim74/compiler/splint.vim
+#usr/share/vim/vim74/compiler/tcl.vim
+#usr/share/vim/vim74/compiler/tex.vim
+#usr/share/vim/vim74/compiler/tidy.vim
+#usr/share/vim/vim74/compiler/xbuild.vim
+#usr/share/vim/vim74/compiler/xmllint.vim
+#usr/share/vim/vim74/compiler/xmlwf.vim
+#usr/share/vim/vim74/delmenu.vim
+#usr/share/vim/vim74/doc
+#usr/share/vim/vim74/doc/arabic.txt
+#usr/share/vim/vim74/doc/autocmd.txt
+#usr/share/vim/vim74/doc/change.txt
+#usr/share/vim/vim74/doc/cmdline.txt
+#usr/share/vim/vim74/doc/debug.txt
+#usr/share/vim/vim74/doc/debugger.txt
+#usr/share/vim/vim74/doc/develop.txt
+#usr/share/vim/vim74/doc/diff.txt
+#usr/share/vim/vim74/doc/digraph.txt
+#usr/share/vim/vim74/doc/editing.txt
+#usr/share/vim/vim74/doc/eval.txt
+#usr/share/vim/vim74/doc/farsi.txt
+#usr/share/vim/vim74/doc/filetype.txt
+#usr/share/vim/vim74/doc/fold.txt
+#usr/share/vim/vim74/doc/ft_ada.txt
+#usr/share/vim/vim74/doc/ft_sql.txt
+#usr/share/vim/vim74/doc/gui.txt
+#usr/share/vim/vim74/doc/gui_w16.txt
+#usr/share/vim/vim74/doc/gui_w32.txt
+#usr/share/vim/vim74/doc/gui_x11.txt
+#usr/share/vim/vim74/doc/hangulin.txt
+#usr/share/vim/vim74/doc/hebrew.txt
+#usr/share/vim/vim74/doc/help.txt
+#usr/share/vim/vim74/doc/helphelp.txt
+#usr/share/vim/vim74/doc/howto.txt
+#usr/share/vim/vim74/doc/if_cscop.txt
+#usr/share/vim/vim74/doc/if_lua.txt
+#usr/share/vim/vim74/doc/if_mzsch.txt
+#usr/share/vim/vim74/doc/if_ole.txt
+#usr/share/vim/vim74/doc/if_perl.txt
+#usr/share/vim/vim74/doc/if_pyth.txt
+#usr/share/vim/vim74/doc/if_ruby.txt
+#usr/share/vim/vim74/doc/if_sniff.txt
+#usr/share/vim/vim74/doc/if_tcl.txt
+#usr/share/vim/vim74/doc/indent.txt
+#usr/share/vim/vim74/doc/index.txt
+#usr/share/vim/vim74/doc/insert.txt
+#usr/share/vim/vim74/doc/intro.txt
+#usr/share/vim/vim74/doc/map.txt
+#usr/share/vim/vim74/doc/mbyte.txt
+#usr/share/vim/vim74/doc/message.txt
+#usr/share/vim/vim74/doc/mlang.txt
+#usr/share/vim/vim74/doc/motion.txt
+#usr/share/vim/vim74/doc/netbeans.txt
+#usr/share/vim/vim74/doc/options.txt
+#usr/share/vim/vim74/doc/os_390.txt
+#usr/share/vim/vim74/doc/os_amiga.txt
+#usr/share/vim/vim74/doc/os_beos.txt
+#usr/share/vim/vim74/doc/os_dos.txt
+#usr/share/vim/vim74/doc/os_mac.txt
+#usr/share/vim/vim74/doc/os_mint.txt
+#usr/share/vim/vim74/doc/os_msdos.txt
+#usr/share/vim/vim74/doc/os_os2.txt
+#usr/share/vim/vim74/doc/os_qnx.txt
+#usr/share/vim/vim74/doc/os_risc.txt
+#usr/share/vim/vim74/doc/os_unix.txt
+#usr/share/vim/vim74/doc/os_vms.txt
+#usr/share/vim/vim74/doc/os_win32.txt
+#usr/share/vim/vim74/doc/pattern.txt
+#usr/share/vim/vim74/doc/pi_getscript.txt
+#usr/share/vim/vim74/doc/pi_gzip.txt
+#usr/share/vim/vim74/doc/pi_netrw.txt
+#usr/share/vim/vim74/doc/pi_paren.txt
+#usr/share/vim/vim74/doc/pi_spec.txt
+#usr/share/vim/vim74/doc/pi_tar.txt
+#usr/share/vim/vim74/doc/pi_vimball.txt
+#usr/share/vim/vim74/doc/pi_zip.txt
+#usr/share/vim/vim74/doc/print.txt
+#usr/share/vim/vim74/doc/quickfix.txt
+#usr/share/vim/vim74/doc/quickref.txt
+#usr/share/vim/vim74/doc/quotes.txt
+#usr/share/vim/vim74/doc/recover.txt
+#usr/share/vim/vim74/doc/remote.txt
+#usr/share/vim/vim74/doc/repeat.txt
+#usr/share/vim/vim74/doc/rileft.txt
+#usr/share/vim/vim74/doc/russian.txt
+#usr/share/vim/vim74/doc/scroll.txt
+#usr/share/vim/vim74/doc/sign.txt
+#usr/share/vim/vim74/doc/spell.txt
+#usr/share/vim/vim74/doc/sponsor.txt
+#usr/share/vim/vim74/doc/starting.txt
+#usr/share/vim/vim74/doc/syntax.txt
+#usr/share/vim/vim74/doc/tabpage.txt
+#usr/share/vim/vim74/doc/tags
+#usr/share/vim/vim74/doc/tagsrch.txt
+#usr/share/vim/vim74/doc/term.txt
+#usr/share/vim/vim74/doc/tips.txt
+#usr/share/vim/vim74/doc/todo.txt
+#usr/share/vim/vim74/doc/uganda.txt
+#usr/share/vim/vim74/doc/undo.txt
+#usr/share/vim/vim74/doc/usr_01.txt
+#usr/share/vim/vim74/doc/usr_02.txt
+#usr/share/vim/vim74/doc/usr_03.txt
+#usr/share/vim/vim74/doc/usr_04.txt
+#usr/share/vim/vim74/doc/usr_05.txt
+#usr/share/vim/vim74/doc/usr_06.txt
+#usr/share/vim/vim74/doc/usr_07.txt
+#usr/share/vim/vim74/doc/usr_08.txt
+#usr/share/vim/vim74/doc/usr_09.txt
+#usr/share/vim/vim74/doc/usr_10.txt
+#usr/share/vim/vim74/doc/usr_11.txt
+#usr/share/vim/vim74/doc/usr_12.txt
+#usr/share/vim/vim74/doc/usr_20.txt
+#usr/share/vim/vim74/doc/usr_21.txt
+#usr/share/vim/vim74/doc/usr_22.txt
+#usr/share/vim/vim74/doc/usr_23.txt
+#usr/share/vim/vim74/doc/usr_24.txt
+#usr/share/vim/vim74/doc/usr_25.txt
+#usr/share/vim/vim74/doc/usr_26.txt
+#usr/share/vim/vim74/doc/usr_27.txt
+#usr/share/vim/vim74/doc/usr_28.txt
+#usr/share/vim/vim74/doc/usr_29.txt
+#usr/share/vim/vim74/doc/usr_30.txt
+#usr/share/vim/vim74/doc/usr_31.txt
+#usr/share/vim/vim74/doc/usr_32.txt
+#usr/share/vim/vim74/doc/usr_40.txt
+#usr/share/vim/vim74/doc/usr_41.txt
+#usr/share/vim/vim74/doc/usr_42.txt
+#usr/share/vim/vim74/doc/usr_43.txt
+#usr/share/vim/vim74/doc/usr_44.txt
+#usr/share/vim/vim74/doc/usr_45.txt
+#usr/share/vim/vim74/doc/usr_90.txt
+#usr/share/vim/vim74/doc/usr_toc.txt
+#usr/share/vim/vim74/doc/various.txt
+#usr/share/vim/vim74/doc/version4.txt
+#usr/share/vim/vim74/doc/version5.txt
+#usr/share/vim/vim74/doc/version6.txt
+#usr/share/vim/vim74/doc/version7.txt
+#usr/share/vim/vim74/doc/vi_diff.txt
+#usr/share/vim/vim74/doc/vim2html.pl
+#usr/share/vim/vim74/doc/visual.txt
+#usr/share/vim/vim74/doc/windows.txt
+#usr/share/vim/vim74/doc/workshop.txt
+#usr/share/vim/vim74/evim.vim
+#usr/share/vim/vim74/filetype.vim
+#usr/share/vim/vim74/ftoff.vim
+#usr/share/vim/vim74/ftplugin
+#usr/share/vim/vim74/ftplugin.vim
+#usr/share/vim/vim74/ftplugin/README.txt
+#usr/share/vim/vim74/ftplugin/a2ps.vim
+#usr/share/vim/vim74/ftplugin/aap.vim
+#usr/share/vim/vim74/ftplugin/abap.vim
+#usr/share/vim/vim74/ftplugin/abaqus.vim
+#usr/share/vim/vim74/ftplugin/ada.vim
+#usr/share/vim/vim74/ftplugin/alsaconf.vim
+#usr/share/vim/vim74/ftplugin/ant.vim
+#usr/share/vim/vim74/ftplugin/arch.vim
+#usr/share/vim/vim74/ftplugin/art.vim
+#usr/share/vim/vim74/ftplugin/aspvbs.vim
+#usr/share/vim/vim74/ftplugin/automake.vim
+#usr/share/vim/vim74/ftplugin/bdf.vim
+#usr/share/vim/vim74/ftplugin/bst.vim
+#usr/share/vim/vim74/ftplugin/btm.vim
+#usr/share/vim/vim74/ftplugin/c.vim
+#usr/share/vim/vim74/ftplugin/calendar.vim
+#usr/share/vim/vim74/ftplugin/cdrdaoconf.vim
+#usr/share/vim/vim74/ftplugin/ch.vim
+#usr/share/vim/vim74/ftplugin/changelog.vim
+#usr/share/vim/vim74/ftplugin/clojure.vim
+#usr/share/vim/vim74/ftplugin/cobol.vim
+#usr/share/vim/vim74/ftplugin/conf.vim
+#usr/share/vim/vim74/ftplugin/config.vim
+#usr/share/vim/vim74/ftplugin/context.vim
+#usr/share/vim/vim74/ftplugin/cpp.vim
+#usr/share/vim/vim74/ftplugin/crm.vim
+#usr/share/vim/vim74/ftplugin/cs.vim
+#usr/share/vim/vim74/ftplugin/csc.vim
+#usr/share/vim/vim74/ftplugin/csh.vim
+#usr/share/vim/vim74/ftplugin/css.vim
+#usr/share/vim/vim74/ftplugin/cucumber.vim
+#usr/share/vim/vim74/ftplugin/cvsrc.vim
+#usr/share/vim/vim74/ftplugin/debchangelog.vim
+#usr/share/vim/vim74/ftplugin/debcontrol.vim
+#usr/share/vim/vim74/ftplugin/denyhosts.vim
+#usr/share/vim/vim74/ftplugin/dictconf.vim
+#usr/share/vim/vim74/ftplugin/dictdconf.vim
+#usr/share/vim/vim74/ftplugin/diff.vim
+#usr/share/vim/vim74/ftplugin/dircolors.vim
+#usr/share/vim/vim74/ftplugin/docbk.vim
+#usr/share/vim/vim74/ftplugin/dosbatch.vim
+#usr/share/vim/vim74/ftplugin/dosini.vim
+#usr/share/vim/vim74/ftplugin/dtd.vim
+#usr/share/vim/vim74/ftplugin/dtrace.vim
+#usr/share/vim/vim74/ftplugin/elinks.vim
+#usr/share/vim/vim74/ftplugin/erlang.vim
+#usr/share/vim/vim74/ftplugin/eruby.vim
+#usr/share/vim/vim74/ftplugin/eterm.vim
+#usr/share/vim/vim74/ftplugin/falcon.vim
+#usr/share/vim/vim74/ftplugin/fetchmail.vim
+#usr/share/vim/vim74/ftplugin/flexwiki.vim
+#usr/share/vim/vim74/ftplugin/fortran.vim
+#usr/share/vim/vim74/ftplugin/framescript.vim
+#usr/share/vim/vim74/ftplugin/fvwm.vim
+#usr/share/vim/vim74/ftplugin/git.vim
+#usr/share/vim/vim74/ftplugin/gitcommit.vim
+#usr/share/vim/vim74/ftplugin/gitconfig.vim
+#usr/share/vim/vim74/ftplugin/gitrebase.vim
+#usr/share/vim/vim74/ftplugin/gitsendemail.vim
+#usr/share/vim/vim74/ftplugin/gpg.vim
+#usr/share/vim/vim74/ftplugin/gprof.vim
+#usr/share/vim/vim74/ftplugin/group.vim
+#usr/share/vim/vim74/ftplugin/grub.vim
+#usr/share/vim/vim74/ftplugin/haml.vim
+#usr/share/vim/vim74/ftplugin/hamster.vim
+#usr/share/vim/vim74/ftplugin/haskell.vim
+#usr/share/vim/vim74/ftplugin/help.vim
+#usr/share/vim/vim74/ftplugin/hostconf.vim
+#usr/share/vim/vim74/ftplugin/hostsaccess.vim
+#usr/share/vim/vim74/ftplugin/html.vim
+#usr/share/vim/vim74/ftplugin/htmldjango.vim
+#usr/share/vim/vim74/ftplugin/indent.vim
+#usr/share/vim/vim74/ftplugin/initex.vim
+#usr/share/vim/vim74/ftplugin/ishd.vim
+#usr/share/vim/vim74/ftplugin/java.vim
+#usr/share/vim/vim74/ftplugin/javascript.vim
+#usr/share/vim/vim74/ftplugin/jsp.vim
+#usr/share/vim/vim74/ftplugin/kconfig.vim
+#usr/share/vim/vim74/ftplugin/kwt.vim
+#usr/share/vim/vim74/ftplugin/ld.vim
+#usr/share/vim/vim74/ftplugin/lftp.vim
+#usr/share/vim/vim74/ftplugin/libao.vim
+#usr/share/vim/vim74/ftplugin/limits.vim
+#usr/share/vim/vim74/ftplugin/liquid.vim
+#usr/share/vim/vim74/ftplugin/lisp.vim
+#usr/share/vim/vim74/ftplugin/logcheck.vim
+#usr/share/vim/vim74/ftplugin/loginaccess.vim
+#usr/share/vim/vim74/ftplugin/logindefs.vim
+#usr/share/vim/vim74/ftplugin/logtalk.dict
+#usr/share/vim/vim74/ftplugin/logtalk.vim
+#usr/share/vim/vim74/ftplugin/lprolog.vim
+#usr/share/vim/vim74/ftplugin/lua.vim
+#usr/share/vim/vim74/ftplugin/m4.vim
+#usr/share/vim/vim74/ftplugin/mail.vim
+#usr/share/vim/vim74/ftplugin/mailaliases.vim
+#usr/share/vim/vim74/ftplugin/mailcap.vim
+#usr/share/vim/vim74/ftplugin/make.vim
+#usr/share/vim/vim74/ftplugin/man.vim
+#usr/share/vim/vim74/ftplugin/manconf.vim
+#usr/share/vim/vim74/ftplugin/markdown.vim
+#usr/share/vim/vim74/ftplugin/matlab.vim
+#usr/share/vim/vim74/ftplugin/mf.vim
+#usr/share/vim/vim74/ftplugin/modconf.vim
+#usr/share/vim/vim74/ftplugin/mp.vim
+#usr/share/vim/vim74/ftplugin/mplayerconf.vim
+#usr/share/vim/vim74/ftplugin/mrxvtrc.vim
+#usr/share/vim/vim74/ftplugin/msmessages.vim
+#usr/share/vim/vim74/ftplugin/muttrc.vim
+#usr/share/vim/vim74/ftplugin/nanorc.vim
+#usr/share/vim/vim74/ftplugin/netrc.vim
+#usr/share/vim/vim74/ftplugin/nsis.vim
+#usr/share/vim/vim74/ftplugin/objc.vim
+#usr/share/vim/vim74/ftplugin/ocaml.vim
+#usr/share/vim/vim74/ftplugin/occam.vim
+#usr/share/vim/vim74/ftplugin/pamconf.vim
+#usr/share/vim/vim74/ftplugin/pascal.vim
+#usr/share/vim/vim74/ftplugin/passwd.vim
+#usr/share/vim/vim74/ftplugin/pdf.vim
+#usr/share/vim/vim74/ftplugin/perl.vim
+#usr/share/vim/vim74/ftplugin/perl6.vim
+#usr/share/vim/vim74/ftplugin/php.vim
+#usr/share/vim/vim74/ftplugin/pinfo.vim
+#usr/share/vim/vim74/ftplugin/plaintex.vim
+#usr/share/vim/vim74/ftplugin/postscr.vim
+#usr/share/vim/vim74/ftplugin/procmail.vim
+#usr/share/vim/vim74/ftplugin/prolog.vim
+#usr/share/vim/vim74/ftplugin/protocols.vim
+#usr/share/vim/vim74/ftplugin/pyrex.vim
+#usr/share/vim/vim74/ftplugin/python.vim
+#usr/share/vim/vim74/ftplugin/qf.vim
+#usr/share/vim/vim74/ftplugin/quake.vim
+#usr/share/vim/vim74/ftplugin/racc.vim
+#usr/share/vim/vim74/ftplugin/readline.vim
+#usr/share/vim/vim74/ftplugin/reva.vim
+#usr/share/vim/vim74/ftplugin/rnc.vim
+#usr/share/vim/vim74/ftplugin/rpl.vim
+#usr/share/vim/vim74/ftplugin/rst.vim
+#usr/share/vim/vim74/ftplugin/ruby.vim
+#usr/share/vim/vim74/ftplugin/sass.vim
+#usr/share/vim/vim74/ftplugin/scheme.vim
+#usr/share/vim/vim74/ftplugin/screen.vim
+#usr/share/vim/vim74/ftplugin/scss.vim
+#usr/share/vim/vim74/ftplugin/sensors.vim
+#usr/share/vim/vim74/ftplugin/services.vim
+#usr/share/vim/vim74/ftplugin/setserial.vim
+#usr/share/vim/vim74/ftplugin/sgml.vim
+#usr/share/vim/vim74/ftplugin/sh.vim
+#usr/share/vim/vim74/ftplugin/sieve.vim
+#usr/share/vim/vim74/ftplugin/slpconf.vim
+#usr/share/vim/vim74/ftplugin/slpreg.vim
+#usr/share/vim/vim74/ftplugin/slpspi.vim
+#usr/share/vim/vim74/ftplugin/spec.vim
+#usr/share/vim/vim74/ftplugin/sql.vim
+#usr/share/vim/vim74/ftplugin/sshconfig.vim
+#usr/share/vim/vim74/ftplugin/sudoers.vim
+#usr/share/vim/vim74/ftplugin/svg.vim
+#usr/share/vim/vim74/ftplugin/sysctl.vim
+#usr/share/vim/vim74/ftplugin/tcl.vim
+#usr/share/vim/vim74/ftplugin/tcsh.vim
+#usr/share/vim/vim74/ftplugin/terminfo.vim
+#usr/share/vim/vim74/ftplugin/tex.vim
+#usr/share/vim/vim74/ftplugin/treetop.vim
+#usr/share/vim/vim74/ftplugin/tt2html.vim
+#usr/share/vim/vim74/ftplugin/udevconf.vim
+#usr/share/vim/vim74/ftplugin/udevperm.vim
+#usr/share/vim/vim74/ftplugin/udevrules.vim
+#usr/share/vim/vim74/ftplugin/updatedb.vim
+#usr/share/vim/vim74/ftplugin/vb.vim
+#usr/share/vim/vim74/ftplugin/verilog.vim
+#usr/share/vim/vim74/ftplugin/vhdl.vim
+#usr/share/vim/vim74/ftplugin/vim.vim
+#usr/share/vim/vim74/ftplugin/xdefaults.vim
+#usr/share/vim/vim74/ftplugin/xf86conf.vim
+#usr/share/vim/vim74/ftplugin/xhtml.vim
+#usr/share/vim/vim74/ftplugin/xinetd.vim
+#usr/share/vim/vim74/ftplugin/xml.vim
+#usr/share/vim/vim74/ftplugin/xmodmap.vim
+#usr/share/vim/vim74/ftplugin/xs.vim
+#usr/share/vim/vim74/ftplugin/xsd.vim
+#usr/share/vim/vim74/ftplugin/xslt.vim
+#usr/share/vim/vim74/ftplugin/yaml.vim
+#usr/share/vim/vim74/ftplugin/zimbu.vim
+#usr/share/vim/vim74/ftplugin/zsh.vim
+#usr/share/vim/vim74/ftplugof.vim
+#usr/share/vim/vim74/gvimrc_example.vim
+#usr/share/vim/vim74/indent
+#usr/share/vim/vim74/indent.vim
+#usr/share/vim/vim74/indent/README.txt
+#usr/share/vim/vim74/indent/aap.vim
+#usr/share/vim/vim74/indent/ada.vim
+#usr/share/vim/vim74/indent/ant.vim
+#usr/share/vim/vim74/indent/automake.vim
+#usr/share/vim/vim74/indent/awk.vim
+#usr/share/vim/vim74/indent/bib.vim
+#usr/share/vim/vim74/indent/bst.vim
+#usr/share/vim/vim74/indent/c.vim
+#usr/share/vim/vim74/indent/cdl.vim
+#usr/share/vim/vim74/indent/ch.vim
+#usr/share/vim/vim74/indent/chaiscript.vim
+#usr/share/vim/vim74/indent/changelog.vim
+#usr/share/vim/vim74/indent/clojure.vim
+#usr/share/vim/vim74/indent/cmake.vim
+#usr/share/vim/vim74/indent/cobol.vim
+#usr/share/vim/vim74/indent/config.vim
+#usr/share/vim/vim74/indent/cpp.vim
+#usr/share/vim/vim74/indent/cs.vim
+#usr/share/vim/vim74/indent/css.vim
+#usr/share/vim/vim74/indent/cucumber.vim
+#usr/share/vim/vim74/indent/cuda.vim
+#usr/share/vim/vim74/indent/d.vim
+#usr/share/vim/vim74/indent/dictconf.vim
+#usr/share/vim/vim74/indent/dictdconf.vim
+#usr/share/vim/vim74/indent/docbk.vim
+#usr/share/vim/vim74/indent/dtd.vim
+#usr/share/vim/vim74/indent/dtrace.vim
+#usr/share/vim/vim74/indent/dylan.vim
+#usr/share/vim/vim74/indent/eiffel.vim
+#usr/share/vim/vim74/indent/erlang.vim
+#usr/share/vim/vim74/indent/eruby.vim
+#usr/share/vim/vim74/indent/eterm.vim
+#usr/share/vim/vim74/indent/falcon.vim
+#usr/share/vim/vim74/indent/fortran.vim
+#usr/share/vim/vim74/indent/framescript.vim
+#usr/share/vim/vim74/indent/gitconfig.vim
+#usr/share/vim/vim74/indent/gitolite.vim
+#usr/share/vim/vim74/indent/haml.vim
+#usr/share/vim/vim74/indent/hamster.vim
+#usr/share/vim/vim74/indent/html.vim
+#usr/share/vim/vim74/indent/htmldjango.vim
+#usr/share/vim/vim74/indent/idlang.vim
+#usr/share/vim/vim74/indent/ishd.vim
+#usr/share/vim/vim74/indent/java.vim
+#usr/share/vim/vim74/indent/javascript.vim
+#usr/share/vim/vim74/indent/jsp.vim
+#usr/share/vim/vim74/indent/ld.vim
+#usr/share/vim/vim74/indent/lifelines.vim
+#usr/share/vim/vim74/indent/liquid.vim
+#usr/share/vim/vim74/indent/lisp.vim
+#usr/share/vim/vim74/indent/logtalk.vim
+#usr/share/vim/vim74/indent/lua.vim
+#usr/share/vim/vim74/indent/mail.vim
+#usr/share/vim/vim74/indent/make.vim
+#usr/share/vim/vim74/indent/matlab.vim
+#usr/share/vim/vim74/indent/mma.vim
+#usr/share/vim/vim74/indent/mp.vim
+#usr/share/vim/vim74/indent/objc.vim
+#usr/share/vim/vim74/indent/ocaml.vim
+#usr/share/vim/vim74/indent/occam.vim
+#usr/share/vim/vim74/indent/pascal.vim
+#usr/share/vim/vim74/indent/perl.vim
+#usr/share/vim/vim74/indent/perl6.vim
+#usr/share/vim/vim74/indent/php.vim
+#usr/share/vim/vim74/indent/postscr.vim
+#usr/share/vim/vim74/indent/pov.vim
+#usr/share/vim/vim74/indent/prolog.vim
+#usr/share/vim/vim74/indent/pyrex.vim
+#usr/share/vim/vim74/indent/python.vim
+#usr/share/vim/vim74/indent/r.vim
+#usr/share/vim/vim74/indent/readline.vim
+#usr/share/vim/vim74/indent/rpl.vim
+#usr/share/vim/vim74/indent/rst.vim
+#usr/share/vim/vim74/indent/ruby.vim
+#usr/share/vim/vim74/indent/sass.vim
+#usr/share/vim/vim74/indent/scheme.vim
+#usr/share/vim/vim74/indent/scss.vim
+#usr/share/vim/vim74/indent/sdl.vim
+#usr/share/vim/vim74/indent/sh.vim
+#usr/share/vim/vim74/indent/sml.vim
+#usr/share/vim/vim74/indent/sql.vim
+#usr/share/vim/vim74/indent/sqlanywhere.vim
+#usr/share/vim/vim74/indent/tcl.vim
+#usr/share/vim/vim74/indent/tcsh.vim
+#usr/share/vim/vim74/indent/tex.vim
+#usr/share/vim/vim74/indent/tf.vim
+#usr/share/vim/vim74/indent/tilde.vim
+#usr/share/vim/vim74/indent/treetop.vim
+#usr/share/vim/vim74/indent/vb.vim
+#usr/share/vim/vim74/indent/verilog.vim
+#usr/share/vim/vim74/indent/vhdl.vim
+#usr/share/vim/vim74/indent/vim.vim
+#usr/share/vim/vim74/indent/xf86conf.vim
+#usr/share/vim/vim74/indent/xhtml.vim
+#usr/share/vim/vim74/indent/xinetd.vim
+#usr/share/vim/vim74/indent/xml.vim
+#usr/share/vim/vim74/indent/xsd.vim
+#usr/share/vim/vim74/indent/xslt.vim
+#usr/share/vim/vim74/indent/yacc.vim
+#usr/share/vim/vim74/indent/yaml.vim
+#usr/share/vim/vim74/indent/zimbu.vim
+#usr/share/vim/vim74/indent/zsh.vim
+#usr/share/vim/vim74/indoff.vim
+#usr/share/vim/vim74/macros
+#usr/share/vim/vim74/macros/README.txt
+#usr/share/vim/vim74/macros/dvorak
+#usr/share/vim/vim74/macros/editexisting.vim
+#usr/share/vim/vim74/macros/hanoi
+#usr/share/vim/vim74/macros/hanoi/click.me
+#usr/share/vim/vim74/macros/hanoi/hanoi.vim
+#usr/share/vim/vim74/macros/hanoi/poster
+#usr/share/vim/vim74/macros/justify.vim
+#usr/share/vim/vim74/macros/less.bat
+#usr/share/vim/vim74/macros/less.sh
+#usr/share/vim/vim74/macros/less.vim
+#usr/share/vim/vim74/macros/life
+#usr/share/vim/vim74/macros/life/click.me
+#usr/share/vim/vim74/macros/life/life.vim
+#usr/share/vim/vim74/macros/matchit.txt
+#usr/share/vim/vim74/macros/matchit.vim
+#usr/share/vim/vim74/macros/maze
+#usr/share/vim/vim74/macros/maze/Makefile
+#usr/share/vim/vim74/macros/maze/README.txt
+#usr/share/vim/vim74/macros/maze/main.aap
+#usr/share/vim/vim74/macros/maze/maze.c
+#usr/share/vim/vim74/macros/maze/maze_5.78
+#usr/share/vim/vim74/macros/maze/maze_mac
+#usr/share/vim/vim74/macros/maze/mazeansi.c
+#usr/share/vim/vim74/macros/maze/mazeclean.c
+#usr/share/vim/vim74/macros/maze/poster
+#usr/share/vim/vim74/macros/shellmenu.vim
+#usr/share/vim/vim74/macros/swapmous.vim
+#usr/share/vim/vim74/macros/urm
+#usr/share/vim/vim74/macros/urm/README.txt
+#usr/share/vim/vim74/macros/urm/examples
+#usr/share/vim/vim74/macros/urm/urm
+#usr/share/vim/vim74/macros/urm/urm.vim
+#usr/share/vim/vim74/menu.vim
+#usr/share/vim/vim74/mswin.vim
+#usr/share/vim/vim74/optwin.vim
+#usr/share/vim/vim74/plugin
+#usr/share/vim/vim74/plugin/README.txt
+#usr/share/vim/vim74/plugin/getscriptPlugin.vim
+#usr/share/vim/vim74/plugin/gzip.vim
+#usr/share/vim/vim74/plugin/matchparen.vim
+#usr/share/vim/vim74/plugin/netrwPlugin.vim
+#usr/share/vim/vim74/plugin/rrhelper.vim
+#usr/share/vim/vim74/plugin/spellfile.vim
+#usr/share/vim/vim74/plugin/tarPlugin.vim
+#usr/share/vim/vim74/plugin/tohtml.vim
+#usr/share/vim/vim74/plugin/vimballPlugin.vim
+#usr/share/vim/vim74/plugin/zipPlugin.vim
+#usr/share/vim/vim74/print
+#usr/share/vim/vim74/print/ascii.ps
+#usr/share/vim/vim74/print/cidfont.ps
+#usr/share/vim/vim74/print/cns_roman.ps
+#usr/share/vim/vim74/print/cp1250.ps
+#usr/share/vim/vim74/print/cp1251.ps
+#usr/share/vim/vim74/print/cp1252.ps
+#usr/share/vim/vim74/print/cp1253.ps
+#usr/share/vim/vim74/print/cp1254.ps
+#usr/share/vim/vim74/print/cp1255.ps
+#usr/share/vim/vim74/print/cp1257.ps
+#usr/share/vim/vim74/print/dec-mcs.ps
+#usr/share/vim/vim74/print/ebcdic-uk.ps
+#usr/share/vim/vim74/print/gb_roman.ps
+#usr/share/vim/vim74/print/hp-roman8.ps
+#usr/share/vim/vim74/print/iso-8859-10.ps
+#usr/share/vim/vim74/print/iso-8859-11.ps
+#usr/share/vim/vim74/print/iso-8859-13.ps
+#usr/share/vim/vim74/print/iso-8859-14.ps
+#usr/share/vim/vim74/print/iso-8859-15.ps
+#usr/share/vim/vim74/print/iso-8859-2.ps
+#usr/share/vim/vim74/print/iso-8859-3.ps
+#usr/share/vim/vim74/print/iso-8859-4.ps
+#usr/share/vim/vim74/print/iso-8859-5.ps
+#usr/share/vim/vim74/print/iso-8859-7.ps
+#usr/share/vim/vim74/print/iso-8859-8.ps
+#usr/share/vim/vim74/print/iso-8859-9.ps
+#usr/share/vim/vim74/print/jis_roman.ps
+#usr/share/vim/vim74/print/koi8-r.ps
+#usr/share/vim/vim74/print/koi8-u.ps
+#usr/share/vim/vim74/print/ks_roman.ps
+#usr/share/vim/vim74/print/latin1.ps
+#usr/share/vim/vim74/print/mac-roman.ps
+#usr/share/vim/vim74/print/prolog.ps
+#usr/share/vim/vim74/scripts.vim
+#usr/share/vim/vim74/spell
+#usr/share/vim/vim74/spell/check_locales.vim
+#usr/share/vim/vim74/spell/cleanadd.vim
+#usr/share/vim/vim74/spell/en.ascii.spl
+#usr/share/vim/vim74/spell/en.ascii.sug
+#usr/share/vim/vim74/spell/en.latin1.spl
+#usr/share/vim/vim74/spell/en.latin1.sug
+#usr/share/vim/vim74/spell/en.utf-8.spl
+#usr/share/vim/vim74/spell/en.utf-8.sug
+#usr/share/vim/vim74/spell/fixdup.vim
+#usr/share/vim/vim74/spell/he.vim
+#usr/share/vim/vim74/spell/spell.vim
+#usr/share/vim/vim74/spell/yi.vim
+#usr/share/vim/vim74/synmenu.vim
+#usr/share/vim/vim74/syntax
+#usr/share/vim/vim74/syntax/2html.vim
+#usr/share/vim/vim74/syntax/README.txt
+#usr/share/vim/vim74/syntax/a2ps.vim
+#usr/share/vim/vim74/syntax/a65.vim
+#usr/share/vim/vim74/syntax/aap.vim
+#usr/share/vim/vim74/syntax/abap.vim
+#usr/share/vim/vim74/syntax/abaqus.vim
+#usr/share/vim/vim74/syntax/abc.vim
+#usr/share/vim/vim74/syntax/abel.vim
+#usr/share/vim/vim74/syntax/acedb.vim
+#usr/share/vim/vim74/syntax/ada.vim
+#usr/share/vim/vim74/syntax/aflex.vim
+#usr/share/vim/vim74/syntax/ahdl.vim
+#usr/share/vim/vim74/syntax/alsaconf.vim
+#usr/share/vim/vim74/syntax/amiga.vim
+#usr/share/vim/vim74/syntax/aml.vim
+#usr/share/vim/vim74/syntax/ampl.vim
+#usr/share/vim/vim74/syntax/ant.vim
+#usr/share/vim/vim74/syntax/antlr.vim
+#usr/share/vim/vim74/syntax/apache.vim
+#usr/share/vim/vim74/syntax/apachestyle.vim
+#usr/share/vim/vim74/syntax/aptconf.vim
+#usr/share/vim/vim74/syntax/arch.vim
+#usr/share/vim/vim74/syntax/art.vim
+#usr/share/vim/vim74/syntax/asciidoc.vim
+#usr/share/vim/vim74/syntax/asm.vim
+#usr/share/vim/vim74/syntax/asm68k.vim
+#usr/share/vim/vim74/syntax/asmh8300.vim
+#usr/share/vim/vim74/syntax/asn.vim
+#usr/share/vim/vim74/syntax/aspperl.vim
+#usr/share/vim/vim74/syntax/aspvbs.vim
+#usr/share/vim/vim74/syntax/asterisk.vim
+#usr/share/vim/vim74/syntax/asteriskvm.vim
+#usr/share/vim/vim74/syntax/atlas.vim
+#usr/share/vim/vim74/syntax/autohotkey.vim
+#usr/share/vim/vim74/syntax/autoit.vim
+#usr/share/vim/vim74/syntax/automake.vim
+#usr/share/vim/vim74/syntax/ave.vim
+#usr/share/vim/vim74/syntax/awk.vim
+#usr/share/vim/vim74/syntax/ayacc.vim
+#usr/share/vim/vim74/syntax/b.vim
+#usr/share/vim/vim74/syntax/baan.vim
+#usr/share/vim/vim74/syntax/basic.vim
+#usr/share/vim/vim74/syntax/bc.vim
+#usr/share/vim/vim74/syntax/bdf.vim
+#usr/share/vim/vim74/syntax/bib.vim
+#usr/share/vim/vim74/syntax/bindzone.vim
+#usr/share/vim/vim74/syntax/blank.vim
+#usr/share/vim/vim74/syntax/bst.vim
+#usr/share/vim/vim74/syntax/btm.vim
+#usr/share/vim/vim74/syntax/bzr.vim
+#usr/share/vim/vim74/syntax/c.vim
+#usr/share/vim/vim74/syntax/cabal.vim
+#usr/share/vim/vim74/syntax/calendar.vim
+#usr/share/vim/vim74/syntax/catalog.vim
+#usr/share/vim/vim74/syntax/cdl.vim
+#usr/share/vim/vim74/syntax/cdrdaoconf.vim
+#usr/share/vim/vim74/syntax/cdrtoc.vim
+#usr/share/vim/vim74/syntax/cf.vim
+#usr/share/vim/vim74/syntax/cfg.vim
+#usr/share/vim/vim74/syntax/ch.vim
+#usr/share/vim/vim74/syntax/chaiscript.vim
+#usr/share/vim/vim74/syntax/change.vim
+#usr/share/vim/vim74/syntax/changelog.vim
+#usr/share/vim/vim74/syntax/chaskell.vim
+#usr/share/vim/vim74/syntax/cheetah.vim
+#usr/share/vim/vim74/syntax/chill.vim
+#usr/share/vim/vim74/syntax/chordpro.vim
+#usr/share/vim/vim74/syntax/cl.vim
+#usr/share/vim/vim74/syntax/clean.vim
+#usr/share/vim/vim74/syntax/clipper.vim
+#usr/share/vim/vim74/syntax/clojure.vim
+#usr/share/vim/vim74/syntax/cmake.vim
+#usr/share/vim/vim74/syntax/cmusrc.vim
+#usr/share/vim/vim74/syntax/cobol.vim
+#usr/share/vim/vim74/syntax/coco.vim
+#usr/share/vim/vim74/syntax/colortest.vim
+#usr/share/vim/vim74/syntax/conaryrecipe.vim
+#usr/share/vim/vim74/syntax/conf.vim
+#usr/share/vim/vim74/syntax/config.vim
+#usr/share/vim/vim74/syntax/context.vim
+#usr/share/vim/vim74/syntax/cpp.vim
+#usr/share/vim/vim74/syntax/crm.vim
+#usr/share/vim/vim74/syntax/crontab.vim
+#usr/share/vim/vim74/syntax/cs.vim
+#usr/share/vim/vim74/syntax/csc.vim
+#usr/share/vim/vim74/syntax/csdl.vim
+#usr/share/vim/vim74/syntax/csh.vim
+#usr/share/vim/vim74/syntax/csp.vim
+#usr/share/vim/vim74/syntax/css.vim
+#usr/share/vim/vim74/syntax/cterm.vim
+#usr/share/vim/vim74/syntax/ctrlh.vim
+#usr/share/vim/vim74/syntax/cucumber.vim
+#usr/share/vim/vim74/syntax/cuda.vim
+#usr/share/vim/vim74/syntax/cupl.vim
+#usr/share/vim/vim74/syntax/cuplsim.vim
+#usr/share/vim/vim74/syntax/cvs.vim
+#usr/share/vim/vim74/syntax/cvsrc.vim
+#usr/share/vim/vim74/syntax/cweb.vim
+#usr/share/vim/vim74/syntax/cynlib.vim
+#usr/share/vim/vim74/syntax/cynpp.vim
+#usr/share/vim/vim74/syntax/d.vim
+#usr/share/vim/vim74/syntax/datascript.vim
+#usr/share/vim/vim74/syntax/dcd.vim
+#usr/share/vim/vim74/syntax/dcl.vim
+#usr/share/vim/vim74/syntax/debchangelog.vim
+#usr/share/vim/vim74/syntax/debcontrol.vim
+#usr/share/vim/vim74/syntax/debsources.vim
+#usr/share/vim/vim74/syntax/def.vim
+#usr/share/vim/vim74/syntax/denyhosts.vim
+#usr/share/vim/vim74/syntax/desc.vim
+#usr/share/vim/vim74/syntax/desktop.vim
+#usr/share/vim/vim74/syntax/dictconf.vim
+#usr/share/vim/vim74/syntax/dictdconf.vim
+#usr/share/vim/vim74/syntax/diff.vim
+#usr/share/vim/vim74/syntax/dircolors.vim
+#usr/share/vim/vim74/syntax/dirpager.vim
+#usr/share/vim/vim74/syntax/diva.vim
+#usr/share/vim/vim74/syntax/django.vim
+#usr/share/vim/vim74/syntax/dns.vim
+#usr/share/vim/vim74/syntax/dnsmasq.vim
+#usr/share/vim/vim74/syntax/docbk.vim
+#usr/share/vim/vim74/syntax/docbksgml.vim
+#usr/share/vim/vim74/syntax/docbkxml.vim
+#usr/share/vim/vim74/syntax/dosbatch.vim
+#usr/share/vim/vim74/syntax/dosini.vim
+#usr/share/vim/vim74/syntax/dot.vim
+#usr/share/vim/vim74/syntax/doxygen.vim
+#usr/share/vim/vim74/syntax/dracula.vim
+#usr/share/vim/vim74/syntax/dsl.vim
+#usr/share/vim/vim74/syntax/dtd.vim
+#usr/share/vim/vim74/syntax/dtml.vim
+#usr/share/vim/vim74/syntax/dtrace.vim
+#usr/share/vim/vim74/syntax/dts.vim
+#usr/share/vim/vim74/syntax/dylan.vim
+#usr/share/vim/vim74/syntax/dylanintr.vim
+#usr/share/vim/vim74/syntax/dylanlid.vim
+#usr/share/vim/vim74/syntax/ecd.vim
+#usr/share/vim/vim74/syntax/edif.vim
+#usr/share/vim/vim74/syntax/eiffel.vim
+#usr/share/vim/vim74/syntax/elf.vim
+#usr/share/vim/vim74/syntax/elinks.vim
+#usr/share/vim/vim74/syntax/elmfilt.vim
+#usr/share/vim/vim74/syntax/erlang.vim
+#usr/share/vim/vim74/syntax/eruby.vim
+#usr/share/vim/vim74/syntax/esmtprc.vim
+#usr/share/vim/vim74/syntax/esqlc.vim
+#usr/share/vim/vim74/syntax/esterel.vim
+#usr/share/vim/vim74/syntax/eterm.vim
+#usr/share/vim/vim74/syntax/eviews.vim
+#usr/share/vim/vim74/syntax/exim.vim
+#usr/share/vim/vim74/syntax/expect.vim
+#usr/share/vim/vim74/syntax/exports.vim
+#usr/share/vim/vim74/syntax/falcon.vim
+#usr/share/vim/vim74/syntax/fan.vim
+#usr/share/vim/vim74/syntax/fasm.vim
+#usr/share/vim/vim74/syntax/fdcc.vim
+#usr/share/vim/vim74/syntax/fetchmail.vim
+#usr/share/vim/vim74/syntax/fgl.vim
+#usr/share/vim/vim74/syntax/flexwiki.vim
+#usr/share/vim/vim74/syntax/focexec.vim
+#usr/share/vim/vim74/syntax/form.vim
+#usr/share/vim/vim74/syntax/forth.vim
+#usr/share/vim/vim74/syntax/fortran.vim
+#usr/share/vim/vim74/syntax/foxpro.vim
+#usr/share/vim/vim74/syntax/framescript.vim
+#usr/share/vim/vim74/syntax/freebasic.vim
+#usr/share/vim/vim74/syntax/fstab.vim
+#usr/share/vim/vim74/syntax/fvwm.vim
+#usr/share/vim/vim74/syntax/fvwm2m4.vim
+#usr/share/vim/vim74/syntax/gdb.vim
+#usr/share/vim/vim74/syntax/gdmo.vim
+#usr/share/vim/vim74/syntax/gedcom.vim
+#usr/share/vim/vim74/syntax/git.vim
+#usr/share/vim/vim74/syntax/gitcommit.vim
+#usr/share/vim/vim74/syntax/gitconfig.vim
+#usr/share/vim/vim74/syntax/gitolite.vim
+#usr/share/vim/vim74/syntax/gitrebase.vim
+#usr/share/vim/vim74/syntax/gitsendemail.vim
+#usr/share/vim/vim74/syntax/gkrellmrc.vim
+#usr/share/vim/vim74/syntax/gnash.vim
+#usr/share/vim/vim74/syntax/gnuplot.vim
+#usr/share/vim/vim74/syntax/gp.vim
+#usr/share/vim/vim74/syntax/gpg.vim
+#usr/share/vim/vim74/syntax/gprof.vim
+#usr/share/vim/vim74/syntax/grads.vim
+#usr/share/vim/vim74/syntax/gretl.vim
+#usr/share/vim/vim74/syntax/groff.vim
+#usr/share/vim/vim74/syntax/groovy.vim
+#usr/share/vim/vim74/syntax/group.vim
+#usr/share/vim/vim74/syntax/grub.vim
+#usr/share/vim/vim74/syntax/gsp.vim
+#usr/share/vim/vim74/syntax/gtkrc.vim
+#usr/share/vim/vim74/syntax/haml.vim
+#usr/share/vim/vim74/syntax/hamster.vim
+#usr/share/vim/vim74/syntax/haskell.vim
+#usr/share/vim/vim74/syntax/haste.vim
+#usr/share/vim/vim74/syntax/hastepreproc.vim
+#usr/share/vim/vim74/syntax/hb.vim
+#usr/share/vim/vim74/syntax/help.vim
+#usr/share/vim/vim74/syntax/hercules.vim
+#usr/share/vim/vim74/syntax/hex.vim
+#usr/share/vim/vim74/syntax/hgcommit.vim
+#usr/share/vim/vim74/syntax/hitest.vim
+#usr/share/vim/vim74/syntax/hog.vim
+#usr/share/vim/vim74/syntax/hostconf.vim
+#usr/share/vim/vim74/syntax/hostsaccess.vim
+#usr/share/vim/vim74/syntax/html.vim
+#usr/share/vim/vim74/syntax/htmlcheetah.vim
+#usr/share/vim/vim74/syntax/htmldjango.vim
+#usr/share/vim/vim74/syntax/htmlm4.vim
+#usr/share/vim/vim74/syntax/htmlos.vim
+#usr/share/vim/vim74/syntax/ia64.vim
+#usr/share/vim/vim74/syntax/ibasic.vim
+#usr/share/vim/vim74/syntax/icemenu.vim
+#usr/share/vim/vim74/syntax/icon.vim
+#usr/share/vim/vim74/syntax/idl.vim
+#usr/share/vim/vim74/syntax/idlang.vim
+#usr/share/vim/vim74/syntax/indent.vim
+#usr/share/vim/vim74/syntax/inform.vim
+#usr/share/vim/vim74/syntax/initex.vim
+#usr/share/vim/vim74/syntax/initng.vim
+#usr/share/vim/vim74/syntax/inittab.vim
+#usr/share/vim/vim74/syntax/ipfilter.vim
+#usr/share/vim/vim74/syntax/ishd.vim
+#usr/share/vim/vim74/syntax/iss.vim
+#usr/share/vim/vim74/syntax/ist.vim
+#usr/share/vim/vim74/syntax/jal.vim
+#usr/share/vim/vim74/syntax/jam.vim
+#usr/share/vim/vim74/syntax/jargon.vim
+#usr/share/vim/vim74/syntax/java.vim
+#usr/share/vim/vim74/syntax/javacc.vim
+#usr/share/vim/vim74/syntax/javascript.vim
+#usr/share/vim/vim74/syntax/jess.vim
+#usr/share/vim/vim74/syntax/jgraph.vim
+#usr/share/vim/vim74/syntax/jovial.vim
+#usr/share/vim/vim74/syntax/jproperties.vim
+#usr/share/vim/vim74/syntax/jsp.vim
+#usr/share/vim/vim74/syntax/kconfig.vim
+#usr/share/vim/vim74/syntax/kix.vim
+#usr/share/vim/vim74/syntax/kscript.vim
+#usr/share/vim/vim74/syntax/kwt.vim
+#usr/share/vim/vim74/syntax/lace.vim
+#usr/share/vim/vim74/syntax/latte.vim
+#usr/share/vim/vim74/syntax/ld.vim
+#usr/share/vim/vim74/syntax/ldapconf.vim
+#usr/share/vim/vim74/syntax/ldif.vim
+#usr/share/vim/vim74/syntax/lex.vim
+#usr/share/vim/vim74/syntax/lftp.vim
+#usr/share/vim/vim74/syntax/lhaskell.vim
+#usr/share/vim/vim74/syntax/libao.vim
+#usr/share/vim/vim74/syntax/lifelines.vim
+#usr/share/vim/vim74/syntax/lilo.vim
+#usr/share/vim/vim74/syntax/limits.vim
+#usr/share/vim/vim74/syntax/liquid.vim
+#usr/share/vim/vim74/syntax/lisp.vim
+#usr/share/vim/vim74/syntax/lite.vim
+#usr/share/vim/vim74/syntax/litestep.vim
+#usr/share/vim/vim74/syntax/loginaccess.vim
+#usr/share/vim/vim74/syntax/logindefs.vim
+#usr/share/vim/vim74/syntax/logtalk.vim
+#usr/share/vim/vim74/syntax/lotos.vim
+#usr/share/vim/vim74/syntax/lout.vim
+#usr/share/vim/vim74/syntax/lpc.vim
+#usr/share/vim/vim74/syntax/lprolog.vim
+#usr/share/vim/vim74/syntax/lscript.vim
+#usr/share/vim/vim74/syntax/lsl.vim
+#usr/share/vim/vim74/syntax/lss.vim
+#usr/share/vim/vim74/syntax/lua.vim
+#usr/share/vim/vim74/syntax/lynx.vim
+#usr/share/vim/vim74/syntax/m4.vim
+#usr/share/vim/vim74/syntax/mail.vim
+#usr/share/vim/vim74/syntax/mailaliases.vim
+#usr/share/vim/vim74/syntax/mailcap.vim
+#usr/share/vim/vim74/syntax/make.vim
+#usr/share/vim/vim74/syntax/mallard.vim
+#usr/share/vim/vim74/syntax/man.vim
+#usr/share/vim/vim74/syntax/manconf.vim
+#usr/share/vim/vim74/syntax/manual.vim
+#usr/share/vim/vim74/syntax/maple.vim
+#usr/share/vim/vim74/syntax/markdown.vim
+#usr/share/vim/vim74/syntax/masm.vim
+#usr/share/vim/vim74/syntax/mason.vim
+#usr/share/vim/vim74/syntax/master.vim
+#usr/share/vim/vim74/syntax/matlab.vim
+#usr/share/vim/vim74/syntax/maxima.vim
+#usr/share/vim/vim74/syntax/mel.vim
+#usr/share/vim/vim74/syntax/messages.vim
+#usr/share/vim/vim74/syntax/mf.vim
+#usr/share/vim/vim74/syntax/mgl.vim
+#usr/share/vim/vim74/syntax/mgp.vim
+#usr/share/vim/vim74/syntax/mib.vim
+#usr/share/vim/vim74/syntax/mma.vim
+#usr/share/vim/vim74/syntax/mmix.vim
+#usr/share/vim/vim74/syntax/mmp.vim
+#usr/share/vim/vim74/syntax/modconf.vim
+#usr/share/vim/vim74/syntax/model.vim
+#usr/share/vim/vim74/syntax/modsim3.vim
+#usr/share/vim/vim74/syntax/modula2.vim
+#usr/share/vim/vim74/syntax/modula3.vim
+#usr/share/vim/vim74/syntax/monk.vim
+#usr/share/vim/vim74/syntax/moo.vim
+#usr/share/vim/vim74/syntax/mp.vim
+#usr/share/vim/vim74/syntax/mplayerconf.vim
+#usr/share/vim/vim74/syntax/mrxvtrc.vim
+#usr/share/vim/vim74/syntax/msidl.vim
+#usr/share/vim/vim74/syntax/msmessages.vim
+#usr/share/vim/vim74/syntax/msql.vim
+#usr/share/vim/vim74/syntax/mupad.vim
+#usr/share/vim/vim74/syntax/mush.vim
+#usr/share/vim/vim74/syntax/muttrc.vim
+#usr/share/vim/vim74/syntax/mysql.vim
+#usr/share/vim/vim74/syntax/named.vim
+#usr/share/vim/vim74/syntax/nanorc.vim
+#usr/share/vim/vim74/syntax/nasm.vim
+#usr/share/vim/vim74/syntax/nastran.vim
+#usr/share/vim/vim74/syntax/natural.vim
+#usr/share/vim/vim74/syntax/ncf.vim
+#usr/share/vim/vim74/syntax/netrc.vim
+#usr/share/vim/vim74/syntax/netrw.vim
+#usr/share/vim/vim74/syntax/ninja.vim
+#usr/share/vim/vim74/syntax/nosyntax.vim
+#usr/share/vim/vim74/syntax/nqc.vim
+#usr/share/vim/vim74/syntax/nroff.vim
+#usr/share/vim/vim74/syntax/nsis.vim
+#usr/share/vim/vim74/syntax/obj.vim
+#usr/share/vim/vim74/syntax/objc.vim
+#usr/share/vim/vim74/syntax/objcpp.vim
+#usr/share/vim/vim74/syntax/ocaml.vim
+#usr/share/vim/vim74/syntax/occam.vim
+#usr/share/vim/vim74/syntax/omnimark.vim
+#usr/share/vim/vim74/syntax/openroad.vim
+#usr/share/vim/vim74/syntax/opl.vim
+#usr/share/vim/vim74/syntax/ora.vim
+#usr/share/vim/vim74/syntax/pamconf.vim
+#usr/share/vim/vim74/syntax/papp.vim
+#usr/share/vim/vim74/syntax/pascal.vim
+#usr/share/vim/vim74/syntax/passwd.vim
+#usr/share/vim/vim74/syntax/pcap.vim
+#usr/share/vim/vim74/syntax/pccts.vim
+#usr/share/vim/vim74/syntax/pdf.vim
+#usr/share/vim/vim74/syntax/perl.vim
+#usr/share/vim/vim74/syntax/perl6.vim
+#usr/share/vim/vim74/syntax/pf.vim
+#usr/share/vim/vim74/syntax/pfmain.vim
+#usr/share/vim/vim74/syntax/php.vim
+#usr/share/vim/vim74/syntax/phtml.vim
+#usr/share/vim/vim74/syntax/pic.vim
+#usr/share/vim/vim74/syntax/pike.vim
+#usr/share/vim/vim74/syntax/pilrc.vim
+#usr/share/vim/vim74/syntax/pine.vim
+#usr/share/vim/vim74/syntax/pinfo.vim
+#usr/share/vim/vim74/syntax/plaintex.vim
+#usr/share/vim/vim74/syntax/pli.vim
+#usr/share/vim/vim74/syntax/plm.vim
+#usr/share/vim/vim74/syntax/plp.vim
+#usr/share/vim/vim74/syntax/plsql.vim
+#usr/share/vim/vim74/syntax/po.vim
+#usr/share/vim/vim74/syntax/pod.vim
+#usr/share/vim/vim74/syntax/postscr.vim
+#usr/share/vim/vim74/syntax/pov.vim
+#usr/share/vim/vim74/syntax/povini.vim
+#usr/share/vim/vim74/syntax/ppd.vim
+#usr/share/vim/vim74/syntax/ppwiz.vim
+#usr/share/vim/vim74/syntax/prescribe.vim
+#usr/share/vim/vim74/syntax/privoxy.vim
+#usr/share/vim/vim74/syntax/procmail.vim
+#usr/share/vim/vim74/syntax/progress.vim
+#usr/share/vim/vim74/syntax/prolog.vim
+#usr/share/vim/vim74/syntax/promela.vim
+#usr/share/vim/vim74/syntax/proto.vim
+#usr/share/vim/vim74/syntax/protocols.vim
+#usr/share/vim/vim74/syntax/psf.vim
+#usr/share/vim/vim74/syntax/ptcap.vim
+#usr/share/vim/vim74/syntax/purifylog.vim
+#usr/share/vim/vim74/syntax/pyrex.vim
+#usr/share/vim/vim74/syntax/python.vim
+#usr/share/vim/vim74/syntax/qf.vim
+#usr/share/vim/vim74/syntax/quake.vim
+#usr/share/vim/vim74/syntax/r.vim
+#usr/share/vim/vim74/syntax/racc.vim
+#usr/share/vim/vim74/syntax/radiance.vim
+#usr/share/vim/vim74/syntax/ratpoison.vim
+#usr/share/vim/vim74/syntax/rc.vim
+#usr/share/vim/vim74/syntax/rcs.vim
+#usr/share/vim/vim74/syntax/rcslog.vim
+#usr/share/vim/vim74/syntax/readline.vim
+#usr/share/vim/vim74/syntax/rebol.vim
+#usr/share/vim/vim74/syntax/redif.vim
+#usr/share/vim/vim74/syntax/registry.vim
+#usr/share/vim/vim74/syntax/remind.vim
+#usr/share/vim/vim74/syntax/resolv.vim
+#usr/share/vim/vim74/syntax/reva.vim
+#usr/share/vim/vim74/syntax/rexx.vim
+#usr/share/vim/vim74/syntax/rhelp.vim
+#usr/share/vim/vim74/syntax/rib.vim
+#usr/share/vim/vim74/syntax/rnc.vim
+#usr/share/vim/vim74/syntax/rng.vim
+#usr/share/vim/vim74/syntax/rnoweb.vim
+#usr/share/vim/vim74/syntax/robots.vim
+#usr/share/vim/vim74/syntax/rpcgen.vim
+#usr/share/vim/vim74/syntax/rpl.vim
+#usr/share/vim/vim74/syntax/rst.vim
+#usr/share/vim/vim74/syntax/rtf.vim
+#usr/share/vim/vim74/syntax/ruby.vim
+#usr/share/vim/vim74/syntax/samba.vim
+#usr/share/vim/vim74/syntax/sas.vim
+#usr/share/vim/vim74/syntax/sass.vim
+#usr/share/vim/vim74/syntax/sather.vim
+#usr/share/vim/vim74/syntax/scheme.vim
+#usr/share/vim/vim74/syntax/scilab.vim
+#usr/share/vim/vim74/syntax/screen.vim
+#usr/share/vim/vim74/syntax/scss.vim
+#usr/share/vim/vim74/syntax/sd.vim
+#usr/share/vim/vim74/syntax/sdc.vim
+#usr/share/vim/vim74/syntax/sdl.vim
+#usr/share/vim/vim74/syntax/sed.vim
+#usr/share/vim/vim74/syntax/sendpr.vim
+#usr/share/vim/vim74/syntax/sensors.vim
+#usr/share/vim/vim74/syntax/services.vim
+#usr/share/vim/vim74/syntax/setserial.vim
+#usr/share/vim/vim74/syntax/sgml.vim
+#usr/share/vim/vim74/syntax/sgmldecl.vim
+#usr/share/vim/vim74/syntax/sgmllnx.vim
+#usr/share/vim/vim74/syntax/sh.vim
+#usr/share/vim/vim74/syntax/sicad.vim
+#usr/share/vim/vim74/syntax/sieve.vim
+#usr/share/vim/vim74/syntax/simula.vim
+#usr/share/vim/vim74/syntax/sinda.vim
+#usr/share/vim/vim74/syntax/sindacmp.vim
+#usr/share/vim/vim74/syntax/sindaout.vim
+#usr/share/vim/vim74/syntax/sisu.vim
+#usr/share/vim/vim74/syntax/skill.vim
+#usr/share/vim/vim74/syntax/sl.vim
+#usr/share/vim/vim74/syntax/slang.vim
+#usr/share/vim/vim74/syntax/slice.vim
+#usr/share/vim/vim74/syntax/slpconf.vim
+#usr/share/vim/vim74/syntax/slpreg.vim
+#usr/share/vim/vim74/syntax/slpspi.vim
+#usr/share/vim/vim74/syntax/slrnrc.vim
+#usr/share/vim/vim74/syntax/slrnsc.vim
+#usr/share/vim/vim74/syntax/sm.vim
+#usr/share/vim/vim74/syntax/smarty.vim
+#usr/share/vim/vim74/syntax/smcl.vim
+#usr/share/vim/vim74/syntax/smil.vim
+#usr/share/vim/vim74/syntax/smith.vim
+#usr/share/vim/vim74/syntax/sml.vim
+#usr/share/vim/vim74/syntax/snnsnet.vim
+#usr/share/vim/vim74/syntax/snnspat.vim
+#usr/share/vim/vim74/syntax/snnsres.vim
+#usr/share/vim/vim74/syntax/snobol4.vim
+#usr/share/vim/vim74/syntax/spec.vim
+#usr/share/vim/vim74/syntax/specman.vim
+#usr/share/vim/vim74/syntax/spice.vim
+#usr/share/vim/vim74/syntax/splint.vim
+#usr/share/vim/vim74/syntax/spup.vim
+#usr/share/vim/vim74/syntax/spyce.vim
+#usr/share/vim/vim74/syntax/sql.vim
+#usr/share/vim/vim74/syntax/sqlanywhere.vim
+#usr/share/vim/vim74/syntax/sqlforms.vim
+#usr/share/vim/vim74/syntax/sqlhana.vim
+#usr/share/vim/vim74/syntax/sqlinformix.vim
+#usr/share/vim/vim74/syntax/sqlj.vim
+#usr/share/vim/vim74/syntax/sqloracle.vim
+#usr/share/vim/vim74/syntax/sqr.vim
+#usr/share/vim/vim74/syntax/squid.vim
+#usr/share/vim/vim74/syntax/sshconfig.vim
+#usr/share/vim/vim74/syntax/sshdconfig.vim
+#usr/share/vim/vim74/syntax/st.vim
+#usr/share/vim/vim74/syntax/stata.vim
+#usr/share/vim/vim74/syntax/stp.vim
+#usr/share/vim/vim74/syntax/strace.vim
+#usr/share/vim/vim74/syntax/sudoers.vim
+#usr/share/vim/vim74/syntax/svg.vim
+#usr/share/vim/vim74/syntax/svn.vim
+#usr/share/vim/vim74/syntax/syncolor.vim
+#usr/share/vim/vim74/syntax/synload.vim
+#usr/share/vim/vim74/syntax/syntax.vim
+#usr/share/vim/vim74/syntax/sysctl.vim
+#usr/share/vim/vim74/syntax/tads.vim
+#usr/share/vim/vim74/syntax/tags.vim
+#usr/share/vim/vim74/syntax/tak.vim
+#usr/share/vim/vim74/syntax/takcmp.vim
+#usr/share/vim/vim74/syntax/takout.vim
+#usr/share/vim/vim74/syntax/tar.vim
+#usr/share/vim/vim74/syntax/taskdata.vim
+#usr/share/vim/vim74/syntax/taskedit.vim
+#usr/share/vim/vim74/syntax/tasm.vim
+#usr/share/vim/vim74/syntax/tcl.vim
+#usr/share/vim/vim74/syntax/tcsh.vim
+#usr/share/vim/vim74/syntax/terminfo.vim
+#usr/share/vim/vim74/syntax/tex.vim
+#usr/share/vim/vim74/syntax/texinfo.vim
+#usr/share/vim/vim74/syntax/texmf.vim
+#usr/share/vim/vim74/syntax/tf.vim
+#usr/share/vim/vim74/syntax/tidy.vim
+#usr/share/vim/vim74/syntax/tilde.vim
+#usr/share/vim/vim74/syntax/tli.vim
+#usr/share/vim/vim74/syntax/tpp.vim
+#usr/share/vim/vim74/syntax/trasys.vim
+#usr/share/vim/vim74/syntax/treetop.vim
+#usr/share/vim/vim74/syntax/trustees.vim
+#usr/share/vim/vim74/syntax/tsalt.vim
+#usr/share/vim/vim74/syntax/tsscl.vim
+#usr/share/vim/vim74/syntax/tssgm.vim
+#usr/share/vim/vim74/syntax/tssop.vim
+#usr/share/vim/vim74/syntax/tt2.vim
+#usr/share/vim/vim74/syntax/tt2html.vim
+#usr/share/vim/vim74/syntax/tt2js.vim
+#usr/share/vim/vim74/syntax/uc.vim
+#usr/share/vim/vim74/syntax/udevconf.vim
+#usr/share/vim/vim74/syntax/udevperm.vim
+#usr/share/vim/vim74/syntax/udevrules.vim
+#usr/share/vim/vim74/syntax/uil.vim
+#usr/share/vim/vim74/syntax/updatedb.vim
+#usr/share/vim/vim74/syntax/upstart.vim
+#usr/share/vim/vim74/syntax/upstreamdat.vim
+#usr/share/vim/vim74/syntax/upstreaminstalllog.vim
+#usr/share/vim/vim74/syntax/upstreamlog.vim
+#usr/share/vim/vim74/syntax/usserverlog.vim
+#usr/share/vim/vim74/syntax/usw2kagtlog.vim
+#usr/share/vim/vim74/syntax/valgrind.vim
+#usr/share/vim/vim74/syntax/vb.vim
+#usr/share/vim/vim74/syntax/vera.vim
+#usr/share/vim/vim74/syntax/verilog.vim
+#usr/share/vim/vim74/syntax/verilogams.vim
+#usr/share/vim/vim74/syntax/vgrindefs.vim
+#usr/share/vim/vim74/syntax/vhdl.vim
+#usr/share/vim/vim74/syntax/vim.vim
+#usr/share/vim/vim74/syntax/viminfo.vim
+#usr/share/vim/vim74/syntax/virata.vim
+#usr/share/vim/vim74/syntax/vmasm.vim
+#usr/share/vim/vim74/syntax/voscm.vim
+#usr/share/vim/vim74/syntax/vrml.vim
+#usr/share/vim/vim74/syntax/vsejcl.vim
+#usr/share/vim/vim74/syntax/wdiff.vim
+#usr/share/vim/vim74/syntax/web.vim
+#usr/share/vim/vim74/syntax/webmacro.vim
+#usr/share/vim/vim74/syntax/wget.vim
+#usr/share/vim/vim74/syntax/whitespace.vim
+#usr/share/vim/vim74/syntax/winbatch.vim
+#usr/share/vim/vim74/syntax/wml.vim
+#usr/share/vim/vim74/syntax/wsh.vim
+#usr/share/vim/vim74/syntax/wsml.vim
+#usr/share/vim/vim74/syntax/wvdial.vim
+#usr/share/vim/vim74/syntax/xbl.vim
+#usr/share/vim/vim74/syntax/xdefaults.vim
+#usr/share/vim/vim74/syntax/xf86conf.vim
+#usr/share/vim/vim74/syntax/xhtml.vim
+#usr/share/vim/vim74/syntax/xinetd.vim
+#usr/share/vim/vim74/syntax/xkb.vim
+#usr/share/vim/vim74/syntax/xmath.vim
+#usr/share/vim/vim74/syntax/xml.vim
+#usr/share/vim/vim74/syntax/xmodmap.vim
+#usr/share/vim/vim74/syntax/xpm.vim
+#usr/share/vim/vim74/syntax/xpm2.vim
+#usr/share/vim/vim74/syntax/xquery.vim
+#usr/share/vim/vim74/syntax/xs.vim
+#usr/share/vim/vim74/syntax/xsd.vim
+#usr/share/vim/vim74/syntax/xslt.vim
+#usr/share/vim/vim74/syntax/xxd.vim
+#usr/share/vim/vim74/syntax/yacc.vim
+#usr/share/vim/vim74/syntax/yaml.vim
+#usr/share/vim/vim74/syntax/z8a.vim
+#usr/share/vim/vim74/syntax/zimbu.vim
+#usr/share/vim/vim74/syntax/zsh.vim
+#usr/share/vim/vim74/tools
+#usr/share/vim/vim74/tools/README.txt
+#usr/share/vim/vim74/tools/blink.c
+#usr/share/vim/vim74/tools/ccfilter.1
+#usr/share/vim/vim74/tools/ccfilter.c
+#usr/share/vim/vim74/tools/ccfilter_README.txt
+#usr/share/vim/vim74/tools/efm_filter.pl
+#usr/share/vim/vim74/tools/efm_filter.txt
+#usr/share/vim/vim74/tools/efm_perl.pl
+#usr/share/vim/vim74/tools/mve.awk
+#usr/share/vim/vim74/tools/mve.txt
+#usr/share/vim/vim74/tools/pltags.pl
+#usr/share/vim/vim74/tools/ref
+#usr/share/vim/vim74/tools/shtags.1
+#usr/share/vim/vim74/tools/shtags.pl
+#usr/share/vim/vim74/tools/unicode.vim
+#usr/share/vim/vim74/tools/vim132
+#usr/share/vim/vim74/tools/vim_vs_net.cmd
+#usr/share/vim/vim74/tools/vimm
+#usr/share/vim/vim74/tools/vimspell.sh
+#usr/share/vim/vim74/tools/vimspell.txt
+#usr/share/vim/vim74/tools/xcmdsrv_client.c
+#usr/share/vim/vim74/tutor
+#usr/share/vim/vim74/tutor/README.el.cp737.txt
+#usr/share/vim/vim74/tutor/README.el.txt
+#usr/share/vim/vim74/tutor/README.txt
+#usr/share/vim/vim74/tutor/tutor
+#usr/share/vim/vim74/tutor/tutor.bar
+#usr/share/vim/vim74/tutor/tutor.bar.utf-8
+#usr/share/vim/vim74/tutor/tutor.ca
+#usr/share/vim/vim74/tutor/tutor.ca.utf-8
+#usr/share/vim/vim74/tutor/tutor.cs
+#usr/share/vim/vim74/tutor/tutor.cs.cp1250
+#usr/share/vim/vim74/tutor/tutor.cs.utf-8
+#usr/share/vim/vim74/tutor/tutor.de
+#usr/share/vim/vim74/tutor/tutor.de.utf-8
+#usr/share/vim/vim74/tutor/tutor.el
+#usr/share/vim/vim74/tutor/tutor.el.cp737
+#usr/share/vim/vim74/tutor/tutor.el.utf-8
+#usr/share/vim/vim74/tutor/tutor.eo
+#usr/share/vim/vim74/tutor/tutor.eo.utf-8
+#usr/share/vim/vim74/tutor/tutor.es
+#usr/share/vim/vim74/tutor/tutor.es.utf-8
+#usr/share/vim/vim74/tutor/tutor.fr
+#usr/share/vim/vim74/tutor/tutor.fr.utf-8
+#usr/share/vim/vim74/tutor/tutor.hr
+#usr/share/vim/vim74/tutor/tutor.hr.cp1250
+#usr/share/vim/vim74/tutor/tutor.hr.utf-8
+#usr/share/vim/vim74/tutor/tutor.hu
+#usr/share/vim/vim74/tutor/tutor.hu.cp1250
+#usr/share/vim/vim74/tutor/tutor.hu.utf-8
+#usr/share/vim/vim74/tutor/tutor.it
+#usr/share/vim/vim74/tutor/tutor.it.utf-8
+#usr/share/vim/vim74/tutor/tutor.ja.euc
+#usr/share/vim/vim74/tutor/tutor.ja.sjis
+#usr/share/vim/vim74/tutor/tutor.ja.utf-8
+#usr/share/vim/vim74/tutor/tutor.ko.euc
+#usr/share/vim/vim74/tutor/tutor.ko.utf-8
+#usr/share/vim/vim74/tutor/tutor.nb
+#usr/share/vim/vim74/tutor/tutor.nb.utf-8
+#usr/share/vim/vim74/tutor/tutor.nl
+#usr/share/vim/vim74/tutor/tutor.nl.utf-8
+#usr/share/vim/vim74/tutor/tutor.no
+#usr/share/vim/vim74/tutor/tutor.no.utf-8
+#usr/share/vim/vim74/tutor/tutor.pl
+#usr/share/vim/vim74/tutor/tutor.pl.cp1250
+#usr/share/vim/vim74/tutor/tutor.pl.utf-8
+#usr/share/vim/vim74/tutor/tutor.pt
+#usr/share/vim/vim74/tutor/tutor.pt.utf-8
+#usr/share/vim/vim74/tutor/tutor.ru
+#usr/share/vim/vim74/tutor/tutor.ru.cp1251
+#usr/share/vim/vim74/tutor/tutor.ru.utf-8
+#usr/share/vim/vim74/tutor/tutor.sk
+#usr/share/vim/vim74/tutor/tutor.sk.cp1250
+#usr/share/vim/vim74/tutor/tutor.sk.utf-8
+#usr/share/vim/vim74/tutor/tutor.sv
+#usr/share/vim/vim74/tutor/tutor.sv.utf-8
+#usr/share/vim/vim74/tutor/tutor.tr.iso9
+#usr/share/vim/vim74/tutor/tutor.tr.utf-8
+#usr/share/vim/vim74/tutor/tutor.utf-8
+#usr/share/vim/vim74/tutor/tutor.vi.utf-8
+#usr/share/vim/vim74/tutor/tutor.vim
+#usr/share/vim/vim74/tutor/tutor.zh.big5
+#usr/share/vim/vim74/tutor/tutor.zh.euc
+#usr/share/vim/vim74/tutor/tutor.zh.utf-8
+#usr/share/vim/vim74/tutor/tutor.zh_cn.utf-8
+#usr/share/vim/vim74/tutor/tutor.zh_tw.utf-8
+#usr/share/vim/vim74/vimrc_example.vim
--- /dev/null
+../../../common/vim
\ No newline at end of file
etc/system-release
etc/issue
+etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/squid
srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/routing.cgi
+srv/web/ipfire/cgi-bin/wirelessclient.cgi
srv/web/ipfire/html/redirect.cgi
srv/web/ipfire/html/redirect-templates/
var/ipfire/header.pl
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+# Remove invalid fetchmail symlinks when postfix is installed.
+if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then
+ rm -f /etc/rc.d/rc*.d/*fetchmail
+fi
+
sync
# This update need a reboot...
etc/rc.d/rc3.d/S60tor
etc/rc.d/rc6.d/K40tor
#etc/tor
-etc/tor/tor-tsocks.conf
+#etc/tor/tor-tsocks.conf
etc/tor/torrc
srv/web/ipfire/cgi-bin/tor.cgi
usr/bin/tor
usr/share/tor
usr/share/tor/defaults-torrc
usr/share/tor/geoip
+usr/share/tor/geoip6
var/ipfire/backup/addons/includes/tor
var/ipfire/menu.d/EX-tor.menu
var/ipfire/tor
PauseLifetime = 1
PausePriority = 10
PrimaryDVB = 1
-PrimaryLimit = 0
RecordingDirs = 1
ResumeID = 0
SetSystemTime = 0
streamdev-server.ServerPort = 2004
streamdev-server.StartHTTPServer = 1
streamdev-server.StartServer = 1
-streamdev-server.SuspendMode = 1
streamdev-server.VTPBindIP = 0.0.0.0
--- /dev/null
+if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
+ set fileencodings=ucs-bom,utf-8,latin1
+endif
+
+set nocompatible
+set bs=indent,eol,start " allow backspacing over everything in insert mode
+set viminfo='20,\"50 " read/write a .viminfo file, don't store more
+ " than 50 lines of registers
+set history=50 " keep 50 lines of command line history
+set ruler " show the cursor position all the time
+
+" Only do this part when compiled with support for autocommands
+if has("autocmd")
+ augroup ipfire
+ autocmd!
+
+ " In text files, always limit the width of text to 78 characters
+ " autocmd BufRead *.txt set tw=78
+
+ " When editing a file, always jump to the last cursor position
+ autocmd BufReadPost *
+ \ if line("'\"") > 0 && line ("'\"") <= line("$") |
+ \ exe "normal! g'\"" |
+ \ endif
+
+ " don't write swapfile on most commonly used directories for NFS mounts or USB sticks
+ autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
+
+ " start with spec file template
+ autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
+
+ augroup END
+endif
+
+syntax on
+if (&term == "iterm") || (&term == "putty")
+ set background=dark
+endif
+
+" Don't wake up system with blinking cursor:
+" http://www.linuxpowertop.org/known.php
+let &guicursor = &guicursor . ",a:blinkon0"
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: tor 0 = disabled
WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: tor 0 = disabled
WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: ntp common settings
WARNING: untranslated string: ntp sync
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: incoming traffic in bytes per second
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: red1
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< least preferred
< minute
+< most preferred
< ntp common settings
< ntp sync
< openvpn default
< static routes
< system information
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< least preferred
< minute
+< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
< static routes
< system information
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< least preferred
< minute
+< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
< server restart
< static routes
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
< fw settings ruletable
< hour-graph
< incoming traffic in bytes per second
+< least preferred
< minute
< month-graph
+< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
< server restart
< static routes
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
$errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'};
}
- if ($settings{'IP'} =~ /0.0.0.0/){
+ if ($settings{'IP'} =~ /^0\.0\.0\.0/){
$errormessage = $Lang::tr{'invalid ip'}." - 0.0.0.0";
}
$settings{'TOR_RELAY_MODE'} = 'exit';
$settings{'TOR_RELAY_ADDRESS'} = '';
$settings{'TOR_RELAY_PORT'} = 9001;
+$settings{'TOR_RELAY_DIRPORT'} = 0;
$settings{'TOR_RELAY_NICKNAME'} = '';
$settings{'TOR_RELAY_CONTACT_INFO'} = '';
$settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0;
if (!&General::validport($settings{'TOR_RELAY_PORT'})) {
$errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}";
}
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+ if (!&General::validport($settings{'TOR_RELAY_DIRPORT'})) {
+ $errormessage = "$Lang::tr{'tor errmsg invalid directory port'}: $settings{'TOR_RELAY_DIRPORT'}";
+ }
+ }
if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) {
</td>
<td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td>
<td width='20%'>
- <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
+ <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' maxlength='19' />
</td>
</tr>
<tr>
<input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
</td>
</tr>
+ <tr>
+ <td width='25%'> </td>
+ <td width='30%'> </td>
+ <td width='25%' class='base'>$Lang::tr{'tor directory port'}:</td>
+ <td width='20%'>
+ <input type='text' name='TOR_RELAY_DIRPORT' value='$settings{'TOR_RELAY_DIRPORT'}' size='5' /> $Lang::tr{'tor 0 = disabled'}
+ </td>
+ </tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor contact info'}: <img src='/blob.gif' alt='*' /></td>
<td width='75%' colspan='3'>
END
if (exists($node->{'country_code'})) {
- if ($node->{'country_code'} eq '??') {
+ if (!$node->{'country_code'} or $node->{'country_code'} eq '??') {
print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
} else {
print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+ print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\n";
+ }
+
if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n";
}
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2012 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2012-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
<table width='100%'>
<tr>
<td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td>
- <td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td>
+ <td width='40%'><input type='text' name='SSID' value=$settings{'SSID'} size='25'/></td>
<td class='base' width='10%'>$Lang::tr{'enabled'}</td>
<td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
</tr>
</tr>
<tr>
<td class='base' width='20%'>$Lang::tr{'wlan client psk'}: </td>
- <td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td>
+ <td width='40%'><input type='password' name='PSK' value=$settings{'PSK'} size='25'/></td>
<td colspan="2" width='40%'></td>
</tr>
</table>
</td>
<td width='40%'>
<select name='PRIO'>
- <option value="0" $selected{'PRIO'}{'0'}>0</option>
+ <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option>
<option value="1" $selected{'PRIO'}{'1'}>1</option>
<option value="2" $selected{'PRIO'}{'2'}>2</option>
<option value="3" $selected{'PRIO'}{'3'}>3</option>
- <option value="4" $selected{'PRIO'}{'4'}>4</option>
+ <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option>
</select>
</td>
<td colspan="2" width='40%'></td>
'last activity' => 'Letzte Aktivität',
'lateprompting' => 'Late prompting',
'lease expires' => 'Zuordnung verfällt',
+'least preferred' => 'weniger präferiert',
'legend' => 'Legende',
'length' => 'Länge',
'line' => 'Leitung',
'monthly volume start day short' => 'Erste Tag',
'months' => 'Monate',
'more' => 'weitere',
+'most preferred' => 'präferiert',
'mount' => 'Einbinden',
'mounted on' => 'Mounted auf',
'mpfire' => 'Media Player für IPFire',
'tone dial' => 'Tonwahl:',
'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt',
'tor' => 'Tor',
+'tor 0 = disabled' => '0 = deaktiviert',
'tor accounting' => 'Accounting',
'tor accounting bytes' => 'Traffic (empfangen/gesendet)',
'tor accounting bytes left' => 'übrig',
'tor connected relays' => 'Verbundene Relays',
'tor contact info' => 'Kontaktinformationen',
'tor daemon' => 'Daemon',
+'tor directory port' => 'Directory-Port',
'tor enabled' => 'Tor einschalten',
'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit',
+'tor errmsg invalid directory port' => 'Ungültiger Directory-Port',
'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',
'tor errmsg invalid relay address' => 'Ungültige Relay-Adresse',
-'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.',
+'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname',
'tor errmsg invalid relay port' => 'Ungültiger Relay-Port',
'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port',
'tor exit country' => 'Exit-Land',
'last activity' => 'Last Activity',
'lateprompting' => 'Lateprompting',
'lease expires' => 'Lease expires',
+'least preferred' => 'least preferred',
'legend' => 'Legend',
'length' => 'Length',
'line' => 'Line',
'monthly volume start day short' => 'First day',
'months' => 'months',
'more' => 'more',
+'most preferred' => 'most preferred',
'mount' => 'Mount',
'mounted on' => 'Mounted on',
'mpfire' => 'Media Player for IPFire',
'tone dial' => 'Tone dial:',
'too long 80 char max' => ' is too long, maximum allowed is 80 characters',
'tor' => 'Tor',
+'tor 0 = disabled' => '0 = disabled',
'tor accounting' => 'Accounting',
'tor accounting bytes' => 'Traffic (read/written)',
'tor accounting bytes left' => 'left',
'tor connected relays' => 'Connected relays',
'tor contact info' => 'Contact Info',
'tor daemon' => 'Daemon',
+'tor directory port' => 'Directory port',
'tor enabled' => 'Enable Tor',
'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
+'tor errmsg invalid directory port' => 'Invalid directory port',
'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
'tor errmsg invalid node id' => 'Invalid node ID',
'tor errmsg invalid relay address' => 'Invalid relay address',
echo "SHOWCOLORS=on" >> $(CONFIG_ROOT)/optionsfw/settings
echo "SHOWTABLES=off" >> $(CONFIG_ROOT)/optionsfw/settings
echo "SHOWDROPDOWN=off" >> $(CONFIG_ROOT)/optionsfw/settings
- echo "DROPWIRELESSINPUT=off" >> $(CONFIG_ROOT)/optionsfw/settings
- echo "DROPWIRELESSFORWARD=off" >> $(CONFIG_ROOT)/optionsfw/settings
+ echo "DROPWIRELESSINPUT=on" >> $(CONFIG_ROOT)/optionsfw/settings
+ echo "DROPWIRELESSFORWARD=on" >> $(CONFIG_ROOT)/optionsfw/settings
echo "POLICY=MODE2" >> $(CONFIG_ROOT)/forward/settings
echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/forward/settings
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = iptraf-ng
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-# cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile
+ # Enable SMP as default
+ cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h
cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make $(EXTRA_MAKE)
-mkdir -p /usr/lib/memtest86+
cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
@rm -rf $(DIR_APP)
include Config
-VER = 5.3.16
+VER = 5.3.27
THISAPP = php-$(VER)
DL_FILE = $(THISAPP).tar.bz2
idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
-$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be
+$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
--with-mysql-sock=/var/run/mysql \
--with-ncurses \
--with-pdo-mysql \
- --without-pdo-sqlite \
+ --with-pdo-sqlite \
--with-readline \
--enable-sockets \
--with-xsl \
- --with-iconv
+ --with-iconv \
+ --enable-zip
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
include Config
-VER = 3.0.9
+VER = 3.1.0
THISAPP = rsync-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rsync
-PAK_VER = 7
+PAK_VER = 8
DEPS = ""
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5ee72266fe2c1822333c407e1761b92b
+$(DL_FILE)_MD5 = 3be148772a33224771a8d4d2a028b132
install : $(TARGET)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 52
+PAK_VER = 53
DEPS = "cups"
include Config
-VER = 0.2.3.25
+VER = 0.2.4.17-rc
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 3
+PAK_VER = 4
DEPS = "libevent2"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf
+$(DL_FILE)_MD5 = 2cdfb8dcc3306a43cf465a858bf97b2d
install : $(TARGET)
include Config
-VER = 2.0.1
+VER = 2.0.3
+
+# VDRPLUGVER must match with APIVERSION in config.h
+# after change this update also all vdr plugins
VDRPLUGVER = 2.0.0
+
THISAPP = vdr-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr
-PAK_VER = 7
+PAK_VER = 8
DEPS = "vdr_streamdev"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e1b7a76c57c96300829dccd39eb20e7d
+$(DL_FILE)_MD5 = dd8fb1642bdfa7feb0e9a8ae41e9ef2f
install : $(TARGET)
include Config
-VER = 7.2
+VER = 7.4
THISAPP = vim-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/vim72
+DIR_APP = $(DIR_SRC)/vim74
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f0901284b338e448bfd79ccca0041254
+$(DL_FILE)_MD5 = 607e135c559be642f210094ad023dc65
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.2-fixes-4.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.2-mandir-1.patch
cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
- cd $(DIR_APP) && ./configure --prefix=/usr --enable-multibyte --disable-nls
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --with-features=huge \
+ --enable-multibyte \
+ --enable-gui=no \
+ --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- ln -sv vim /usr/bin/vi
- echo "set nocompatible" > /etc/vimrc
- echo "set backspace=2" >> /etc/vimrc
- echo "set ruler" >> /etc/vimrc
- echo "syntax on" >> /etc/vimrc
- echo -e "if (&term == \"iterm\") || (&term == \"putty\")" >> /etc/vimrc
- echo " set background=dark" >> /etc/vimrc
- echo "endif" >> /etc/vimrc
+
+ ln -svf vim /usr/bin/vi
+ install -m 644 $(DIR_SRC)/config/vim/vimrc /etc/vimrc
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
boot_mesg "Starting Domain Name Service Proxy..."
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
- ARGS=
- [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+ ARGS="$CUSTOM_ARGS"
+ [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN"
echo > /var/ipfire/red/resolv.conf # Clear it
if [ -e "/var/ipfire/red/dns1" ]; then
# Add custom forward dns zones.
ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
- ARGS="$ARGS $CUSTOM_ARGS"
-
loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then
continue
fi
- echo "Creating VLAN interface ${interface}..."
- vconfig add ${PARENT_DEV} ${VLAN_ID}
- ip link set ${PARENT_DEV}.${VLAN_ID} name ${interface}
-
+ # Build command line.
+ command="ip link add link ${PARENT_DEV} name ${interface}"
if [ -n "${MAC_ADDRESS}" ]; then
- ip link set ${interface} address ${MAC_ADDRESS}
+ command="${command} address ${MAC_ADDRESS}"
fi
+ command="${command} type vlan id ${VLAN_ID}"
+
+ echo "Creating VLAN interface ${interface}..."
+ ${command}
# Bring up the parent device.
ip link set ${PARENT_DEV} up
echo "Removing VLAN interface ${interface}..."
ip link set ${interface} down
- vconfig rem ${interface}
+ ip link delete ${interface}
;;
*)
if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then
iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_PORT}" -j ACCEPT
fi
+
+ if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_DIRPORT}" ] && [ "${TOR_RELAY_DIRPORT}" -ne 0 ]; then
+ iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_DIRPORT}" -j ACCEPT
+ fi
}
function flush_firewall() {
macaddress = strtok(NULL, ",");
enabled = strtok(NULL, ",");
- if (strncmp(enabled, "on", 2) != 0) {
+ if (strcmp(enabled, "on") == 0) {
/* both specified, added security */
if ((strlen(macaddress) == 17) && (VALID_IP_AND_MASK(ipaddress))) {
snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -m mac --mac-source %s -s %s -i %s -j ACCEPT", macaddress, ipaddress, blue_dev);
extract_files
restore_backup ${NAME}
start_service --background ${NAME}
+
+ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
+ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
+ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail
stop_service ${NAME}
make_backup ${NAME}
remove_files
+
+rm -f /etc/rc.d/rc*.d/*fetchmail
# Set postfix's hostname
postconf -e "myhostname=$(hostname -f)"
/etc/init.d/postfix start
-ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
-ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
-ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail
+
+# Enable autostart for postfix
+ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix
+ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix
+ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix
--- /dev/null
+diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c
+--- iptraf-ng-1.1.4-orig/src/tcptable.c 2013-07-23 15:06:11.000000000 +0200
++++ iptraf-ng-1.1.4/src/tcptable.c 2013-08-28 19:10:33.000000000 +0200
+@@ -444,6 +444,8 @@
+ size_t bufsize)
+ {
+ time_t interval = time(NULL) - entry->conn_starttime;
++ if (interval < 1)
++ interval = 1;
+
+ char rbuf[64];
+ rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));
+++ /dev/null
-Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date: 2008-12-06
-Initial Package Version: 7.2
-Upstream Status: Already in upstream patch repo
-Origin: Upstream
-Description: This patch is upstream patch numbers 1 thru 65.
-
-diff -Naur vim72.orig/Filelist vim72/Filelist
---- vim72.orig/Filelist 2008-07-06 19:02:23.000000000 +0100
-+++ vim72/Filelist 2008-12-06 11:37:48.000000000 +0000
-@@ -285,6 +285,7 @@
- src/proto/os_win32.pro \
- src/proto/os_mswin.pro \
- src/testdir/Make_dos.mak \
-+ src/testdir/Make_ming.mak \
- src/testdir/dos.vim \
- src/uninstal.c \
- src/vim.def \
-diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
---- vim72.orig/runtime/doc/cmdline.txt 2008-08-09 15:22:59.000000000 +0100
-+++ vim72/runtime/doc/cmdline.txt 2008-12-06 11:37:49.000000000 +0000
-@@ -1,4 +1,4 @@
--*cmdline.txt* For Vim version 7.2. Last change: 2008 Jul 29
-+*cmdline.txt* For Vim version 7.2. Last change: 2008 Sep 18
-
-
- VIM REFERENCE MANUAL by Bram Moolenaar
-@@ -157,6 +157,11 @@
- (doesn't work at the expression prompt; some
- things such as changing the buffer or current
- window are not allowed to avoid side effects)
-+ When the result is a |List| the items are used
-+ as lines. They can have line breaks inside
-+ too.
-+ When the result is a Float it's automatically
-+ converted to a String.
- See |registers| about registers. {not in Vi}
- Implementation detail: When using the |expression| register
- and invoking setcmdpos(), this sets the position before
-@@ -730,19 +735,29 @@
- In Ex commands, at places where a file name can be used, the following
- characters have a special meaning. These can also be used in the expression
- function expand() |expand()|.
-- % is replaced with the current file name *:_%*
-- # is replaced with the alternate file name *:_#*
-+ % Is replaced with the current file name. *:_%* *c_%*
-+ # Is replaced with the alternate file name. *:_#* *c_#*
- #n (where n is a number) is replaced with the file name of
-- buffer n. "#0" is the same as "#"
-- ## is replaced with all names in the argument list *:_##*
-+ buffer n. "#0" is the same as "#".
-+ ## Is replaced with all names in the argument list *:_##* *c_##*
- concatenated, separated by spaces. Each space in a name
- is preceded with a backslash.
--Note that these give the file name as it was typed. If an absolute path is
--needed (when using the file name from a different directory), you need to add
--":p". See |filename-modifiers|.
-+ #<n (where n is a number > 0) is replaced with old *:_#<* *c_#<*
-+ file name n. See |:oldfiles| or |v:oldfiles| to get the
-+ number. *E809*
-+ {only when compiled with the +eval and +viminfo features}
-+
-+Note that these, except "#<n", give the file name as it was typed. If an
-+absolute path is needed (when using the file name from a different directory),
-+you need to add ":p". See |filename-modifiers|.
-+
-+The "#<n" item returns an absolute path, but it will start with "~/" for files
-+below your home directory.
-+
- Note that backslashes are inserted before spaces, so that the command will
- correctly interpret the file name. But this doesn't happen for shell
--commands. For those you probably have to use quotes: >
-+commands. For those you probably have to use quotes (this fails for files
-+that contain a quote and wildcards): >
- :!ls "%"
- :r !spell "%"
-
-diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
---- vim72.orig/runtime/doc/eval.txt 2008-08-09 15:22:59.000000000 +0100
-+++ vim72/runtime/doc/eval.txt 2008-12-06 11:37:50.000000000 +0000
-@@ -1,4 +1,4 @@
--*eval.txt* For Vim version 7.2. Last change: 2008 Aug 09
-+*eval.txt* For Vim version 7.2. Last change: 2008 Nov 27
-
-
- VIM REFERENCE MANUAL by Bram Moolenaar
-@@ -1484,6 +1484,17 @@
- This is the screen column number, like with |virtcol()|. The
- value is zero when there was no mouse button click.
-
-+ *v:oldfiles* *oldfiles-variable*
-+v:oldfiles List of file names that is loaded from the |viminfo| file on
-+ startup. These are the files that Vim remembers marks for.
-+ The length of the List is limited by the ' argument of the
-+ 'viminfo' option (default is 100).
-+ Also see |:oldfiles| and |c_#<|.
-+ The List can be modified, but this has no effect on what is
-+ stored in the |viminfo| file later. If you use values other
-+ than String this will cause trouble.
-+ {only when compiled with the +viminfo feature}
-+
- *v:operator* *operator-variable*
- v:operator The last operator given in Normal mode. This is a single
- character except for commands starting with <g> or <z>,
-@@ -1695,7 +1706,7 @@
- exists( {expr}) Number TRUE if {expr} exists
- extend({expr1}, {expr2} [, {expr3}])
- List/Dict insert items of {expr2} into {expr1}
--expand( {expr}) String expand special keywords in {expr}
-+expand( {expr} [, {flag}]) String expand special keywords in {expr}
- feedkeys( {string} [, {mode}]) Number add key sequence to typeahead buffer
- filereadable( {file}) Number TRUE if {file} is a readable file
- filewritable( {file}) Number TRUE if {file} is a writable file
-@@ -1747,8 +1758,9 @@
- getwinposx() Number X coord in pixels of GUI Vim window
- getwinposy() Number Y coord in pixels of GUI Vim window
- getwinvar( {nr}, {varname}) any variable {varname} in window {nr}
--glob( {expr}) String expand file wildcards in {expr}
--globpath( {path}, {expr}) String do glob({expr}) for all dirs in {path}
-+glob( {expr} [, {flag}]) String expand file wildcards in {expr}
-+globpath( {path}, {expr} [, {flag}])
-+ String do glob({expr}) for all dirs in {path}
- has( {feature}) Number TRUE if feature {feature} supported
- has_key( {dict}, {key}) Number TRUE if {dict} has entry {key}
- haslocaldir() Number TRUE if current window executed |:lcd|
-@@ -3275,14 +3287,16 @@
- :let list_is_on = getwinvar(2, '&list')
- :echo "myvar = " . getwinvar(1, 'myvar')
- <
-- *glob()*
--glob({expr}) Expand the file wildcards in {expr}. See |wildcards| for the
-+glob({expr} [, {flag}]) *glob()*
-+ Expand the file wildcards in {expr}. See |wildcards| for the
- use of special characters.
- The result is a String.
- When there are several matches, they are separated by <NL>
- characters.
-- The 'wildignore' option applies: Names matching one of the
-- patterns in 'wildignore' will be skipped.
-+ Unless the optional {flag} argument is given and is non-zero,
-+ the 'suffixes' and 'wildignore' options apply: Names matching
-+ one of the patterns in 'wildignore' will be skipped and
-+ 'suffixes' affect the ordering of matches.
- If the expansion fails, the result is an empty string.
- A name for a non-existing file is not included.
-
-@@ -3296,20 +3310,22 @@
- See |expand()| for expanding special Vim variables. See
- |system()| for getting the raw output of an external command.
-
--globpath({path}, {expr}) *globpath()*
-+globpath({path}, {expr} [, {flag}]) *globpath()*
- Perform glob() on all directories in {path} and concatenate
- the results. Example: >
- :echo globpath(&rtp, "syntax/c.vim")
- < {path} is a comma-separated list of directory names. Each
- directory name is prepended to {expr} and expanded like with
-- glob(). A path separator is inserted when needed.
-+ |glob()|. A path separator is inserted when needed.
- To add a comma inside a directory name escape it with a
- backslash. Note that on MS-Windows a directory may have a
- trailing backslash, remove it if you put a comma after it.
- If the expansion fails for one of the directories, there is no
- error message.
-- The 'wildignore' option applies: Names matching one of the
-- patterns in 'wildignore' will be skipped.
-+ Unless the optional {flag} argument is given and is non-zero,
-+ the 'suffixes' and 'wildignore' options apply: Names matching
-+ one of the patterns in 'wildignore' will be skipped and
-+ 'suffixes' affect the ordering of matches.
-
- The "**" item can be used to search in a directory tree.
- For example, to find all "README.txt" files in the directories
-@@ -5332,10 +5348,12 @@
- "fg" foreground color (GUI: color name used to set
- the color, cterm: color number as a string,
- term: empty string)
-- "bg" background color (like "fg")
-+ "bg" background color (as with "fg")
-+ "sp" special color (as with "fg") |highlight-guisp|
- "fg#" like "fg", but for the GUI and the GUI is
- running the name in "#RRGGBB" form
- "bg#" like "fg#" for "bg"
-+ "sp#" like "fg#" for "sp"
- "bold" "1" if bold
- "italic" "1" if italic
- "reverse" "1" if reverse
-diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
---- vim72.orig/runtime/doc/options.txt 2008-08-09 15:22:59.000000000 +0100
-+++ vim72/runtime/doc/options.txt 2008-12-06 11:37:50.000000000 +0000
-@@ -1,4 +1,4 @@
--*options.txt* For Vim version 7.2. Last change: 2008 Aug 06
-+*options.txt* For Vim version 7.2. Last change: 2008 Nov 25
-
-
- VIM REFERENCE MANUAL by Bram Moolenaar
-@@ -7472,7 +7472,9 @@
- {not available when compiled without the |+wildignore|
- feature}
- A list of file patterns. A file that matches with one of these
-- patterns is ignored when completing file or directory names.
-+ patterns is ignored when completing file or directory names, and
-+ influences the result of |expand()|, |glob()| and |globpath()| unless
-+ a flag is passed to disable this.
- The pattern is used like with |:autocmd|, see |autocmd-patterns|.
- Also see 'suffixes'.
- Example: >
-diff -Naur vim72.orig/runtime/doc/os_vms.txt vim72/runtime/doc/os_vms.txt
---- vim72.orig/runtime/doc/os_vms.txt 2008-08-09 15:23:00.000000000 +0100
-+++ vim72/runtime/doc/os_vms.txt 2008-12-06 11:37:48.000000000 +0000
-@@ -1,4 +1,4 @@
--*os_vms.txt* For Vim version 7.2. Last change: 2006 Nov 18
-+*os_vms.txt* For Vim version 7.2. Last change: 2008 Aug 19
-
-
- VIM REFERENCE MANUAL
-@@ -312,7 +312,7 @@
-
- 8. Useful notes *vms-notes*
-
--8.1 backspace/delete
-+8.1 Backspace/delete
- 8.2 Filters
- 8.3 VMS file version numbers
- 8.4 Directory conversion
-@@ -326,8 +326,10 @@
- 8.12 diff-mode
- 8.13 Allow '$' in C keywords
- 8.14 VIMTUTOR for beginners
-+8.15 Slow start in console mode issue
-+8.16 Common VIM directory - different architectures
-
--8.1 backspace/delete
-+8.1 Backspace/delete
-
- There are backspace/delete key inconsistencies with VMS.
- :fixdel doesn't do the trick, but the solution is: >
-@@ -663,12 +665,130 @@
-
- (Thomas.R.Wyant III, Vim 6.1)
-
-+8.14 Slow start in console mode issue
-+
-+As GUI/GTK Vim works equally well in console mode, many administartors
-+deploy those executables system wide.
-+Unfortunately, on a remote slow connections GUI/GTK executables behave rather
-+slow when user wants to run Vim just in the console mode - because of X environment detection timeout.
-+
-+Luckily, there is a simple solution for that. Administrators need to deploy
-+both GUI/GTK build and just console build executables, like below: >
-+
-+ |- vim72
-+ |----- doc
-+ |----- syntax
-+ vimrc (system rc files)
-+ gvimrc
-+ gvim.exe (the remaned GUI or GTK built vim.exe)
-+ vim.exe (the console only executable)
-+
-+Define system symbols like below in for ex in LOGIN.COM or SYLOGIN.COM: >
-+
-+ $ define/nolog VIM RF10:[UTIL.VIM72] ! where you VIM directory is
-+ $ vi*m :== mcr VIM:VIM.EXE
-+ $ gvi*m :== mcr VIM:GVIM.EXE
-+ $ ! or you can try to spawn with
-+ $ gv*im :== spawn/nowait/input=NLA0 mcr VIM:GVIM.EXE -g -GEOMETRY 80x40
-+
-+
-+Like this, users that do not have X environment and want to use Vim just in
-+console mode can avoid performance problems.
-+
-+(Zoltan Arpadffy, Vim 7.2)
-+
-+8.15 Common VIM directory - different architectures
-+
-+In a cluster that contains nodes with different architectures like below:
-+
-+$show cluster
-+View of Cluster from system ID 11655 node: TOR 18-AUG-2008 11:58:31
-++---------------------------------+
-+¦ SYSTEMS ¦ MEMBERS ¦
-++-----------------------+---------¦
-+¦ NODE ¦ SOFTWARE ¦ STATUS ¦
-++--------+--------------+---------¦
-+¦ TOR ¦ VMS V7.3-2 ¦ MEMBER ¦
-+¦ TITAN2 ¦ VMS V8.3 ¦ MEMBER ¦
-+¦ ODIN ¦ VMS V7.3-2 ¦ MEMBER ¦
-++---------------------------------+
-+
-+It is convinient to have a common VIM directory but execute different
-+executables.
-+There are more solutions for this problem:
-+
-+solution 1. all executables in the same directory with different names
-+This is easily done with the following script that can be added
-+to the login.com or sylogin.com: >
-+
-+ $ if f$getsyi("NODE_HWTYPE") .eqs. "VAX"
-+ $ then
-+ $ say "VAX platform"
-+ $ vi*m:== mcr vim:VIM.EXE_VAX
-+ $ endif
-+ $ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH"
-+ $ then
-+ $ say "ALPHA platform"
-+ $ vi*m :== mcr vim:VIM.EXE_AXP
-+ $ endif
-+ $ if f$getsyi("ARCH_NAME") .eqs. "IA64"
-+ $ then
-+ $ say "IA64 platform"
-+ $ vi*m :== mcr vim:VIM.EXE_IA64
-+ $ endif
-+
-+solution 2. different directories: >
-+
-+ $ if f$getsyi("NODE_HWTYPE") .eqs. "VAX"
-+ $ then
-+ $ say "VAX platform"
-+ $ define/nolog VIM RF10:[UTIL.VAX_EXE] ! VAX executables
-+ $ endif
-+ $ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH"
-+ $ then
-+ $ say "ALPHA platform"
-+ $ define/nolog VIM RF10:[UTIL.AXP_EXE] ! AXP executables
-+ $ endif
-+ $ if f$getsyi("ARCH_NAME") .eqs. "IA64"
-+ $ then
-+ $ say "IA64 platform"
-+ $ define/nolog VIM RF10:[UTIL.IA64_EXE] ! IA64 executables
-+ $ endif
-+ $! VIMRUNTIME must be defined in order to find runtime files
-+ $ define/nolog VIMRUNTIME RF10:[UTIL.VIM72]
-+
-+A good examle for this approach is the [GNU]gnu_tools.com script from GNU_TOOLS.ZIP
-+package downloadable from http://www.polarhome.com/vim/
-+
-+(Zoltan Arpadffy, Vim 7.2)
-+
- ==============================================================================
-
- 9. VMS related changes *vms-changes*
-
--Version 7
-+Recent changes
-+- The following plugins are included into VMS runtime:
-+ genutils 2.4, multiselect 2.2, multvals 3.1, selectbuf 4.3,
-+ bufexplorer 7.1.7, taglist 4.5
-+- minor changes in vimrc (just in VMS runtime)
-+- make_vms.mms - HUGE model is the default
-+- [TESTDIR]make_vms.mms include as many tests possible
-+- modify test30 and test54 for VMS
-+- enable FLOAT feature in VMS port
-+- os_vms.txt updated
-+
-+Version 7.2 (2008 Aug 9)
-+- VCF files write corrected
-+- CTAGS 5.7 included
-+- corrected make_vms.mms (on VAX gave syntax error)
-+
-+Version 7.1 (2007 Jun 15)
-+- create TAGS file from menu
-+
-+Version 7 (2006 May 8)
- - Improved low level char input (affects just console mode)
-+- Fixed plugin bug
-+- CTAGS 5.6 included
-
- Version 6.4 (2005 Oct 15)
- - GTKLIB and Vim build on IA64
-@@ -806,6 +926,7 @@
-
- OpenVMS documentation and executables are maintained by:
- Zoltan Arpadffy <arpadffy@polarhome.com>
-+OpenVMS Vim page: http://www.polarhome.com/vim/
-
- This document uses parts and remarks from earlier authors and contributors
- of OS_VMS.TXT:
-diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
---- vim72.orig/runtime/doc/spell.txt 2008-08-09 15:23:00.000000000 +0100
-+++ vim72/runtime/doc/spell.txt 2008-12-06 11:37:50.000000000 +0000
-@@ -1,4 +1,4 @@
--*spell.txt* For Vim version 7.2. Last change: 2008 Jun 21
-+*spell.txt* For Vim version 7.2. Last change: 2008 Nov 30
-
-
- VIM REFERENCE MANUAL by Bram Moolenaar
-@@ -831,8 +831,11 @@
-
- # comment line ~
-
--With some items it's also possible to put a comment after it, but this isn't
--supported in general.
-+Items with a fixed number of arguments can be followed by a comment. But only
-+if none of the arguments can contain white space. The comment must start with
-+a "#" character. Example:
-+
-+ KEEPCASE = # fix case for words with this flag ~
-
-
- ENCODING *spell-SET*
-@@ -965,6 +968,9 @@
-
- Note: When using utf-8 only characters up to 65000 may be used for flags.
-
-+Note: even when using "num" or "long" the number of flags available to
-+compounding and prefixes is limited to about 250.
-+
-
- AFFIXES
- *spell-PFX* *spell-SFX*
-@@ -1178,6 +1184,9 @@
- The flag also applies to the word with affixes, thus this can be used to mark
- a whole bunch of related words as bad.
-
-+ *spell-FORBIDDENWORD*
-+FORBIDDENWORD can be used just like BAD. For compatibility with Hunspell.
-+
- *spell-NEEDAFFIX*
- The NEEDAFFIX flag is used to require that a word is used with an affix. The
- word itself is not a good word (unless there is an empty affix). Example:
-@@ -1268,6 +1277,10 @@
-
- NEEDCOMPOUND & ~
-
-+ *spell-ONLYINCOMPOUND*
-+The ONLYINCOMPOUND does exactly the same as NEEDCOMPOUND. Supported for
-+compatiblity with Hunspell.
-+
- *spell-COMPOUNDMIN*
- The minimal character length of a word used for compounding is specified with
- COMPOUNDMIN. Example:
-@@ -1328,6 +1341,20 @@
- rules. Can also be used for an affix to count the affix as a compounding
- word.
-
-+ *spell-CHECKCOMPOUNDPATTERN*
-+CHECKCOMPOUNDPATTERN is used to define patterns that, when matching at the
-+position where two words are compounded together forbids the compound.
-+For example:
-+ CHECKCOMPOUNDPATTERN o e ~
-+
-+This forbids compounding if the first word ends in "o" and the second word
-+starts with "e".
-+
-+The arguments must be plain text, no patterns are actually supported, despite
-+the item name. Case is always ignored.
-+
-+The Hunspell feature to use three arguments and flags is not supported.
-+
- *spell-SYLLABLE*
- The SYLLABLE item defines characters or character sequences that are used to
- count the number of syllables in a word. Example:
-@@ -1496,6 +1523,10 @@
- ACCENT (Hunspell) *spell-ACCENT*
- Use MAP instead. |spell-MAP|
-
-+BREAK (Hunspell) *spell-BREAK*
-+ Define break points. Unclear how it works exactly.
-+ Not supported.
-+
- CHECKCOMPOUNDCASE (Hunspell) *spell-CHECKCOMPOUNDCASE*
- Disallow uppercase letters at compound word boundaries.
- Not supported.
-@@ -1512,9 +1543,6 @@
- Forbid three identical characters when compounding. Not
- supported.
-
--CHECKCOMPOUNDPATTERN (Hunspell) *spell-CHECKCOMPOUNDPATTERN*
-- Forbid compounding when patterns match. Not supported.
--
- COMPLEXPREFIXES (Hunspell) *spell-COMPLEXPREFIXES*
- Enables using two prefixes. Not supported.
-
-@@ -1536,13 +1564,18 @@
- COMPOUNDMIDDLE (Hunspell) *spell-COMPOUNDMIDDLE*
- Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
-
-+COMPOUNDRULES (Hunspell) *spell-COMPOUNDRULES*
-+ Number of COMPOUNDRULE lines following. Ignored, but the
-+ argument must be a number.
-+
- COMPOUNDSYLLABLE (Hunspell) *spell-COMPOUNDSYLLABLE*
- Use SYLLABLE and COMPOUNDSYLMAX instead. |spell-SYLLABLE|
- |spell-COMPOUNDSYLMAX|
-
--FORBIDDENWORD (Hunspell) *spell-FORBIDDENWORD*
-- Use BAD instead. |spell-BAD|
--
-+KEY (Hunspell) *spell-KEY*
-+ Define characters that are close together on the keyboard.
-+ Used to give better suggestions. Not supported.
-+
- LANG (Hunspell) *spell-LANG*
- This specifies language-specific behavior. This actually
- moves part of the language knowledge into the program,
-@@ -1553,10 +1586,7 @@
- Only needed for morphological analysis.
-
- MAXNGRAMSUGS (Hunspell) *spell-MAXNGRAMSUGS*
-- Not supported.
--
--ONLYINCOMPOUND (Hunspell) *spell-ONLYINCOMPOUND*
-- Use NEEDCOMPOUND instead. |spell-NEEDCOMPOUND|
-+ Set number of n-gram suggestions. Not supported.
-
- PSEUDOROOT (Hunspell) *spell-PSEUDOROOT*
- Use NEEDAFFIX instead. |spell-NEEDAFFIX|
-diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
---- vim72.orig/runtime/doc/starting.txt 2008-08-09 15:23:00.000000000 +0100
-+++ vim72/runtime/doc/starting.txt 2008-12-06 11:37:49.000000000 +0000
-@@ -1,4 +1,4 @@
--*starting.txt* For Vim version 7.2. Last change: 2008 Jun 21
-+*starting.txt* For Vim version 7.2. Last change: 2008 Nov 09
-
-
- VIM REFERENCE MANUAL by Bram Moolenaar
-@@ -1337,8 +1337,9 @@
- *viminfo-read*
- When Vim is started and the 'viminfo' option is non-empty, the contents of
- the viminfo file are read and the info can be used in the appropriate places.
--The marks are not read in at startup (but file marks are). See
--|initialization| for how to set the 'viminfo' option upon startup.
-+The |v:oldfiles| variable is filled. The marks are not read in at startup
-+(but file marks are). See |initialization| for how to set the 'viminfo'
-+option upon startup.
-
- *viminfo-write*
- When Vim exits and 'viminfo' is non-empty, the info is stored in the viminfo
-@@ -1372,6 +1373,8 @@
- that start with any string given with the "r" flag in 'viminfo'. This can be
- used to avoid saving marks for files on removable media (for MS-DOS you would
- use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
-+The |v:oldfiles| variable is filled with the file names that the viminfo file
-+has marks for.
-
- *viminfo-file-marks*
- Uppercase marks ('A to 'Z) are stored when writing the viminfo file. The
-@@ -1463,8 +1466,8 @@
- *:rv* *:rviminfo* *E195*
- :rv[iminfo][!] [file] Read from viminfo file [file] (default: see above).
- If [!] is given, then any information that is
-- already set (registers, marks, etc.) will be
-- overwritten. {not in Vi}
-+ already set (registers, marks, |v:oldfiles|, etc.)
-+ will be overwritten {not in Vi}
-
- *:wv* *:wviminfo* *E137* *E138* *E574*
- :wv[iminfo][!] [file] Write to viminfo file [file] (default: see above).
-@@ -1479,4 +1482,20 @@
- the .viminfo file.
- {not in Vi}
-
-+ *:ol* *:oldfiles*
-+:ol[dfiles] List the files that have marks stored in the viminfo
-+ file. This list is read on startup and only changes
-+ afterwards with ":rviminfo!". Also see |v:oldfiles|.
-+ The number can be used with |c_#<|.
-+ {not in Vi, only when compiled with the +eval feature}
-+
-+:bro[wse] ol[dfiles][!]
-+ List file names as with |:oldfiles|, and then prompt
-+ for a number. When the number is valid that file from
-+ the list is edited.
-+ If you get the |press-enter| prompt you can press "q"
-+ and still get the prompt to enter a file number.
-+ Use ! to abondon a modified buffer. |abandon|
-+ {not when compiled with tiny or small features}
-+
- vim:tw=78:ts=8:ft=help:norl:
-diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
---- vim72.orig/runtime/doc/usr_21.txt 2008-08-09 15:23:01.000000000 +0100
-+++ vim72/runtime/doc/usr_21.txt 2008-12-06 11:37:49.000000000 +0000
-@@ -1,4 +1,4 @@
--*usr_21.txt* For Vim version 7.2. Last change: 2007 May 01
-+*usr_21.txt* For Vim version 7.2. Last change: 2008 Nov 09
-
- VIM USER MANUAL - by Bram Moolenaar
-
-@@ -153,7 +153,7 @@
- to be lost. Each item can be remembered only once.
-
-
--GETTING BACK TO WHERE YOU WERE
-+GETTING BACK TO WHERE YOU STOPPED VIM
-
- You are halfway editing a file and it's time to leave for holidays. You exit
- Vim and go enjoy yourselves, forgetting all about your work. After a couple
-@@ -168,6 +168,48 @@
- The |:marks| command is useful to find out where '0 to '9 will take you.
-
-
-+GETTING BACK TO SOME FILE
-+
-+If you want to go back to a file that you edited recently, but not when
-+exiting Vim, there is a slightly more complicated way. You can see a list of
-+files by typing the command: >
-+
-+ :oldfiles
-+< 1: ~/.viminfo ~
-+ 2: ~/text/resume.txt ~
-+ 3: /tmp/draft ~
-+
-+Now you would like to edit the second file, which is in the list preceded by
-+"2:". You type: >
-+
-+ :e #<2
-+
-+Instead of ":e" you can use any command that has a file name argument, the
-+"#<2" item works in the same place as "%" (current file name) and "#"
-+(alternate file name). So you can also split the window to edit the third
-+file: >
-+
-+ :split #<3
-+
-+That #<123 thing is a bit complicated when you just want to edit a file.
-+Fortunately there is a simpler way: >
-+
-+ :browse oldfiles
-+< 1: ~/.viminfo ~
-+ 2: ~/text/resume.txt ~
-+ 3: /tmp/draft ~
-+ -- More --
-+
-+You get the same list of files as with |:oldfiles|. If you want to edit
-+"resume.txt" first press "q" to stop the listing. You will get a prompt:
-+
-+ Type number and <Enter> (empty cancels): ~
-+
-+Type "2" and press <Enter> to edit the second file.
-+
-+More info at |:oldfiles|, |v:oldfiles| and |c_#<|.
-+
-+
- MOVE INFO FROM ONE VIM TO ANOTHER
-
- You can use the ":wviminfo" and ":rviminfo" commands to save and restore the
-diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
---- vim72.orig/runtime/scripts.vim 2008-08-08 23:27:21.000000000 +0100
-+++ vim72/runtime/scripts.vim 2008-12-06 11:37:48.000000000 +0000
-@@ -234,6 +234,10 @@
- elseif s:line1 =~ '\<DTD\s\+XHTML\s'
- set ft=xhtml
-
-+ " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
-+ elseif s:line1 =~? '\<DOCTYPE\s\+html\>'
-+ set ft=html
-+
- " PDF
- elseif s:line1 =~ '^%PDF-'
- set ft=pdf
-diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
---- vim72.orig/src/auto/configure 2008-07-24 13:40:36.000000000 +0100
-+++ vim72/src/auto/configure 2008-12-06 11:37:50.000000000 +0000
-@@ -16819,21 +16819,29 @@
- LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
--$as_echo_n "checking for GCC 3 or later... " >&6; }
- DEPEND_CFLAGS_FILTER=
- if test "$GCC" = yes; then
-+ { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
-+$as_echo_n "checking for GCC 3 or later... " >&6; }
- gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
- if test "$gccmajor" -gt "2"; then
- DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
-- fi
--fi
--if test "$DEPEND_CFLAGS_FILTER" = ""; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ fi
-+ { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
-+$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
-+ if test "$gccmajor" -gt "3"; then
-+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-+ else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+ fi
- fi
-
-
-diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
---- vim72.orig/src/buffer.c 2008-08-06 12:00:48.000000000 +0100
-+++ vim72/src/buffer.c 2008-12-06 11:37:50.000000000 +0000
-@@ -33,7 +33,7 @@
- static char_u *fname_match __ARGS((regprog_T *prog, char_u *name));
- #endif
- static void buflist_setfpos __ARGS((buf_T *buf, win_T *win, linenr_T lnum, colnr_T col, int copy_options));
--static wininfo_T *find_wininfo __ARGS((buf_T *buf));
-+static wininfo_T *find_wininfo __ARGS((buf_T *buf, int skip_diff_buffer));
- #ifdef UNIX
- static buf_T *buflist_findname_stat __ARGS((char_u *ffname, struct stat *st));
- static int otherfile_buf __ARGS((buf_T *buf, char_u *ffname, struct stat *stp));
-@@ -647,6 +647,9 @@
- vim_free(buf->b_start_fenc);
- buf->b_start_fenc = NULL;
- #endif
-+#ifdef FEAT_SPELL
-+ ga_clear(&buf->b_langp);
-+#endif
- }
-
- /*
-@@ -1090,7 +1093,7 @@
- #endif
- setpcmark();
- retval = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE,
-- forceit ? ECMD_FORCEIT : 0);
-+ forceit ? ECMD_FORCEIT : 0, curwin);
-
- /*
- * do_ecmd() may create a new buffer, then we have to delete
-@@ -1237,7 +1240,7 @@
- * "buf" if one exists */
- if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
- return OK;
-- /* If 'switchbuf' contians "usetab": jump to first window in any tab
-+ /* If 'switchbuf' contains "usetab": jump to first window in any tab
- * page containing "buf" if one exists */
- if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
- return OK;
-@@ -1313,7 +1316,7 @@
- setpcmark();
- if (!cmdmod.keepalt)
- curwin->w_alt_fnum = curbuf->b_fnum; /* remember alternate file */
-- buflist_altfpos(); /* remember curpos */
-+ buflist_altfpos(curwin); /* remember curpos */
-
- #ifdef FEAT_VISUAL
- /* Don't restart Select mode after switching to another buffer. */
-@@ -1351,11 +1354,12 @@
- }
- }
- #ifdef FEAT_AUTOCMD
-+ /* An autocommand may have deleted "buf", already entered it (e.g., when
-+ * it did ":bunload") or aborted the script processing! */
- # ifdef FEAT_EVAL
-- /* An autocommand may have deleted buf or aborted the script processing! */
-- if (buf_valid(buf) && !aborting())
-+ if (buf_valid(buf) && buf != curbuf && !aborting())
- # else
-- if (buf_valid(buf)) /* an autocommand may have deleted buf! */
-+ if (buf_valid(buf) && buf != curbuf)
- # endif
- #endif
- enter_buffer(buf);
-@@ -1397,6 +1401,9 @@
- curwin->w_cursor.coladd = 0;
- #endif
- curwin->w_set_curswant = TRUE;
-+#ifdef FEAT_AUTOCMD
-+ curwin->w_topline_was_set = FALSE;
-+#endif
-
- /* Make sure the buffer is loaded. */
- if (curbuf->b_ml.ml_mfp == NULL) /* need to load the file */
-@@ -1436,7 +1443,8 @@
- maketitle();
- #endif
- #ifdef FEAT_AUTOCMD
-- if (curwin->w_topline == 1) /* when autocmds didn't change it */
-+ /* when autocmds didn't change it */
-+ if (curwin->w_topline == 1 && !curwin->w_topline_was_set)
- #endif
- scroll_cursor_halfway(FALSE); /* redisplay at correct position */
-
-@@ -2400,22 +2408,70 @@
- return;
- }
-
-+#ifdef FEAT_DIFF
-+static int wininfo_other_tab_diff __ARGS((wininfo_T *wip));
-+
-+/*
-+ * Return TRUE when "wip" has 'diff' set and the diff is only for another tab
-+ * page. That's because a diff is local to a tab page.
-+ */
-+ static int
-+wininfo_other_tab_diff(wip)
-+ wininfo_T *wip;
-+{
-+ win_T *wp;
-+
-+ if (wip->wi_opt.wo_diff)
-+ {
-+ for (wp = firstwin; wp != NULL; wp = wp->w_next)
-+ /* return FALSE when it's a window in the current tab page, thus
-+ * the buffer was in diff mode here */
-+ if (wip->wi_win == wp)
-+ return FALSE;
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+#endif
-+
- /*
- * Find info for the current window in buffer "buf".
- * If not found, return the info for the most recently used window.
-+ * When "skip_diff_buffer" is TRUE avoid windows with 'diff' set that is in
-+ * another tab page.
- * Returns NULL when there isn't any info.
- */
-+/*ARGSUSED*/
- static wininfo_T *
--find_wininfo(buf)
-+find_wininfo(buf, skip_diff_buffer)
- buf_T *buf;
-+ int skip_diff_buffer;
- {
- wininfo_T *wip;
-
- for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
-- if (wip->wi_win == curwin)
-+ if (wip->wi_win == curwin
-+#ifdef FEAT_DIFF
-+ && (!skip_diff_buffer || !wininfo_other_tab_diff(wip))
-+#endif
-+ )
- break;
-- if (wip == NULL) /* if no fpos for curwin, use the first in the list */
-- wip = buf->b_wininfo;
-+
-+ /* If no wininfo for curwin, use the first in the list (that doesn't have
-+ * 'diff' set and is in another tab page). */
-+ if (wip == NULL)
-+ {
-+#ifdef FEAT_DIFF
-+ if (skip_diff_buffer)
-+ {
-+ for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
-+ if (!wininfo_other_tab_diff(wip))
-+ break;
-+ }
-+ else
-+#endif
-+ wip = buf->b_wininfo;
-+ }
- return wip;
- }
-
-@@ -2436,7 +2492,7 @@
- clearFolding(curwin);
- #endif
-
-- wip = find_wininfo(buf);
-+ wip = find_wininfo(buf, TRUE);
- if (wip != NULL && wip->wi_optset)
- {
- copy_winopt(&wip->wi_opt, &curwin->w_onebuf_opt);
-@@ -2468,7 +2524,7 @@
- wininfo_T *wip;
- static pos_T no_position = {1, 0};
-
-- wip = find_wininfo(buf);
-+ wip = find_wininfo(buf, FALSE);
- if (wip != NULL)
- return &(wip->wi_fpos);
- else
-@@ -2789,14 +2845,14 @@
- #endif
-
- /*
-- * Set alternate cursor position for current window.
-+ * Set alternate cursor position for the current buffer and window "win".
- * Also save the local window option values.
- */
- void
--buflist_altfpos()
-+buflist_altfpos(win)
-+ win_T *win;
- {
-- buflist_setfpos(curbuf, curwin, curwin->w_cursor.lnum,
-- curwin->w_cursor.col, TRUE);
-+ buflist_setfpos(curbuf, win, win->w_cursor.lnum, win->w_cursor.col, TRUE);
- }
-
- /*
-@@ -3963,7 +4019,7 @@
- width = vim_strsize(out);
- if (maxwidth > 0 && width > maxwidth)
- {
-- /* Result is too long, must trunctate somewhere. */
-+ /* Result is too long, must truncate somewhere. */
- l = 0;
- if (itemcnt == 0)
- s = out;
-@@ -4488,7 +4544,7 @@
- ECMD_ONE,
- ((P_HID(curwin->w_buffer)
- || bufIsChanged(curwin->w_buffer)) ? ECMD_HIDE : 0)
-- + ECMD_OLDBUF);
-+ + ECMD_OLDBUF, curwin);
- #ifdef FEAT_AUTOCMD
- if (use_firstwin)
- ++autocmd_no_leave;
-@@ -5062,7 +5118,7 @@
- {
- if (buf->b_sfname != NULL)
- return (char *)buf->b_sfname;
-- return "[Scratch]";
-+ return _("[Scratch]");
- }
- #endif
- if (buf->b_fname == NULL)
-diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
---- vim72.orig/src/configure.in 2008-07-24 13:40:26.000000000 +0100
-+++ vim72/src/configure.in 2008-12-06 11:37:50.000000000 +0000
-@@ -3152,18 +3152,25 @@
- dnl But only when making dependencies, cproto and lint don't take "-isystem".
- dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
- dnl the number before the version number.
--AC_MSG_CHECKING(for GCC 3 or later)
- DEPEND_CFLAGS_FILTER=
- if test "$GCC" = yes; then
-+ AC_MSG_CHECKING(for GCC 3 or later)
- gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
- if test "$gccmajor" -gt "2"; then
- DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
-+ dnl declared as char x[1] but actually longer. Introduced in gcc 4.0.
-+ AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
-+ if test "$gccmajor" -gt "3"; then
-+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no)
- fi
--fi
--if test "$DEPEND_CFLAGS_FILTER" = ""; then
-- AC_MSG_RESULT(no)
--else
-- AC_MSG_RESULT(yes)
- fi
- AC_SUBST(DEPEND_CFLAGS_FILTER)
-
-diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
---- vim72.orig/src/diff.c 2008-03-05 11:16:56.000000000 +0000
-+++ vim72/src/diff.c 2008-12-06 11:37:50.000000000 +0000
-@@ -73,6 +73,8 @@
- {
- tp->tp_diffbuf[i] = NULL;
- tp->tp_diff_invalid = TRUE;
-+ if (tp == curtab)
-+ diff_redraw(TRUE);
- }
- }
- }
-@@ -102,6 +104,7 @@
- {
- curtab->tp_diffbuf[i] = NULL;
- curtab->tp_diff_invalid = TRUE;
-+ diff_redraw(TRUE);
- }
- }
- }
-@@ -131,6 +134,7 @@
- {
- curtab->tp_diffbuf[i] = buf;
- curtab->tp_diff_invalid = TRUE;
-+ diff_redraw(TRUE);
- return;
- }
-
-@@ -661,6 +665,7 @@
- char_u *tmp_diff;
- FILE *fd;
- int ok;
-+ int io_error = FALSE;
-
- /* Delete all diffblocks. */
- diff_clear(curtab);
-@@ -697,18 +702,26 @@
- {
- ok = FALSE;
- fd = mch_fopen((char *)tmp_orig, "w");
-- if (fd != NULL)
-+ if (fd == NULL)
-+ io_error = TRUE;
-+ else
- {
-- fwrite("line1\n", (size_t)6, (size_t)1, fd);
-+ if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
-+ io_error = TRUE;
- fclose(fd);
- fd = mch_fopen((char *)tmp_new, "w");
-- if (fd != NULL)
-+ if (fd == NULL)
-+ io_error = TRUE;
-+ else
- {
-- fwrite("line2\n", (size_t)6, (size_t)1, fd);
-+ if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
-+ io_error = TRUE;
- fclose(fd);
- diff_file(tmp_orig, tmp_new, tmp_diff);
- fd = mch_fopen((char *)tmp_diff, "r");
-- if (fd != NULL)
-+ if (fd == NULL)
-+ io_error = TRUE;
-+ else
- {
- char_u linebuf[LBUFLEN];
-
-@@ -761,6 +774,8 @@
- }
- if (!ok)
- {
-+ if (io_error)
-+ EMSG(_("E810: Cannot read or write temp files"));
- EMSG(_("E97: Cannot create diffs"));
- diff_a_works = MAYBE;
- #if defined(MSWIN) || defined(MSDOS)
-@@ -925,10 +940,10 @@
- {
- # ifdef TEMPDIRNAMES
- if (vim_tempdir != NULL)
-- mch_chdir((char *)vim_tempdir);
-+ ignored = mch_chdir((char *)vim_tempdir);
- else
- # endif
-- mch_chdir("/tmp");
-+ ignored = mch_chdir("/tmp");
- shorten_fnames(TRUE);
- }
- #endif
-diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
---- vim72.orig/src/eval.c 2008-08-07 20:37:22.000000000 +0100
-+++ vim72/src/eval.c 2008-12-06 11:37:50.000000000 +0000
-@@ -348,6 +348,7 @@
- {VV_NAME("mouse_col", VAR_NUMBER), 0},
- {VV_NAME("operator", VAR_STRING), VV_RO},
- {VV_NAME("searchforward", VAR_NUMBER), 0},
-+ {VV_NAME("oldfiles", VAR_LIST), 0},
- };
-
- /* shorthand */
-@@ -355,6 +356,7 @@
- #define vv_nr vv_di.di_tv.vval.v_number
- #define vv_float vv_di.di_tv.vval.v_float
- #define vv_str vv_di.di_tv.vval.v_string
-+#define vv_list vv_di.di_tv.vval.v_list
- #define vv_tv vv_di.di_tv
-
- /*
-@@ -426,7 +428,6 @@
- static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
- static void list_append __ARGS((list_T *l, listitem_T *item));
- static int list_append_tv __ARGS((list_T *l, typval_T *tv));
--static int list_append_string __ARGS((list_T *l, char_u *str, int len));
- static int list_append_number __ARGS((list_T *l, varnumber_T n));
- static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
- static int list_extend __ARGS((list_T *l1, list_T *l2, listitem_T *bef));
-@@ -845,11 +846,17 @@
- p = &vimvars[i];
- if (p->vv_di.di_tv.v_type == VAR_STRING)
- {
-- vim_free(p->vv_di.di_tv.vval.v_string);
-- p->vv_di.di_tv.vval.v_string = NULL;
-+ vim_free(p->vv_str);
-+ p->vv_str = NULL;
-+ }
-+ else if (p->vv_di.di_tv.v_type == VAR_LIST)
-+ {
-+ list_unref(p->vv_list);
-+ p->vv_list = NULL;
- }
- }
- hash_clear(&vimvarht);
-+ hash_init(&vimvarht); /* garbage_collect() will access it */
- hash_clear(&compat_hashtab);
-
- /* script-local variables */
-@@ -1256,23 +1263,26 @@
-
- /*
- * Top level evaluation function, returning a string.
-+ * When "convert" is TRUE convert a List into a sequence of lines and convert
-+ * a Float to a String.
- * Return pointer to allocated memory, or NULL for failure.
- */
- char_u *
--eval_to_string(arg, nextcmd, dolist)
-+eval_to_string(arg, nextcmd, convert)
- char_u *arg;
- char_u **nextcmd;
-- int dolist; /* turn List into sequence of lines */
-+ int convert;
- {
- typval_T tv;
- char_u *retval;
- garray_T ga;
-+ char_u numbuf[NUMBUFLEN];
-
- if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
- retval = NULL;
- else
- {
-- if (dolist && tv.v_type == VAR_LIST)
-+ if (convert && tv.v_type == VAR_LIST)
- {
- ga_init2(&ga, (int)sizeof(char), 80);
- if (tv.vval.v_list != NULL)
-@@ -1280,6 +1290,13 @@
- ga_append(&ga, NUL);
- retval = (char_u *)ga.ga_data;
- }
-+#ifdef FEAT_FLOAT
-+ else if (convert && tv.v_type == VAR_FLOAT)
-+ {
-+ vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
-+ retval = vim_strsave(numbuf);
-+ }
-+#endif
- else
- retval = vim_strsave(get_tv_string(&tv));
- clear_tv(&tv);
-@@ -3277,7 +3294,7 @@
-
- if (*startarg != '(')
- {
-- EMSG2(_("E107: Missing braces: %s"), eap->arg);
-+ EMSG2(_("E107: Missing parentheses: %s"), eap->arg);
- goto end;
- }
-
-@@ -3657,8 +3674,8 @@
- }
-
- /*
-- * Return TRUE if typeval "tv" is locked: Either tha value is locked itself or
-- * it refers to a List or Dictionary that is locked.
-+ * Return TRUE if typeval "tv" is locked: Either that value is locked itself
-+ * or it refers to a List or Dictionary that is locked.
- */
- static int
- tv_islocked(tv)
-@@ -6047,6 +6064,25 @@
- }
-
- /*
-+ * Get list item "l[idx - 1]" as a string. Returns NULL for failure.
-+ */
-+ char_u *
-+list_find_str(l, idx)
-+ list_T *l;
-+ long idx;
-+{
-+ listitem_T *li;
-+
-+ li = list_find(l, idx - 1);
-+ if (li == NULL)
-+ {
-+ EMSGN(_(e_listidx), idx);
-+ return NULL;
-+ }
-+ return get_tv_string(&li->li_tv);
-+}
-+
-+/*
- * Locate "item" list "l" and return its index.
- * Returns -1 when "item" is not in the list.
- */
-@@ -6137,7 +6173,7 @@
- * When "len" >= 0 use "str[len]".
- * Returns FAIL when out of memory.
- */
-- static int
-+ int
- list_append_string(l, str, len)
- list_T *l;
- char_u *str;
-@@ -6497,6 +6533,9 @@
- set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
- }
-
-+ /* v: vars */
-+ set_ref_in_ht(&vimvarht, copyID);
-+
- /*
- * 2. Go through the list of dicts and free items without the copyID.
- */
-@@ -6587,7 +6626,7 @@
- {
- case VAR_DICT:
- dd = tv->vval.v_dict;
-- if (dd->dv_copyID != copyID)
-+ if (dd != NULL && dd->dv_copyID != copyID)
- {
- /* Didn't see this dict yet. */
- dd->dv_copyID = copyID;
-@@ -6597,7 +6636,7 @@
-
- case VAR_LIST:
- ll = tv->vval.v_list;
-- if (ll->lv_copyID != copyID)
-+ if (ll != NULL && ll->lv_copyID != copyID)
- {
- /* Didn't see this list yet. */
- ll->lv_copyID = copyID;
-@@ -7525,8 +7564,8 @@
- {"getwinposx", 0, 0, f_getwinposx},
- {"getwinposy", 0, 0, f_getwinposy},
- {"getwinvar", 2, 2, f_getwinvar},
-- {"glob", 1, 1, f_glob},
-- {"globpath", 2, 2, f_globpath},
-+ {"glob", 1, 2, f_glob},
-+ {"globpath", 2, 3, f_globpath},
- {"has", 1, 1, f_has},
- {"has_key", 2, 2, f_has_key},
- {"haslocaldir", 0, 0, f_haslocaldir},
-@@ -9518,7 +9557,7 @@
- else
- {
- /* When the optional second argument is non-zero, don't remove matches
-- * for 'suffixes' and 'wildignore' */
-+ * for 'wildignore' and don't put matches for 'suffixes' at the end. */
- if (argvars[1].v_type != VAR_UNKNOWN
- && get_tv_number_chk(&argvars[1], &error))
- flags |= WILD_KEEP_ALL;
-@@ -10300,7 +10339,8 @@
- s = get_tv_string(&argvars[0]);
- if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
- EMSG2(_(e_invarg2), s);
-- else if (!function_exists(s))
-+ /* Don't check an autoload name for existence here. */
-+ else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
- EMSG2(_("E700: Unknown function: %s"), s);
- else
- {
-@@ -10602,7 +10642,7 @@
- # ifdef FEAT_WINDOWS
- win_T *wp;
- # endif
-- int n = 1;
-+ int winnr = 1;
-
- if (row >= 0 && col >= 0)
- {
-@@ -10612,9 +10652,9 @@
- (void)mouse_comp_pos(win, &row, &col, &lnum);
- # ifdef FEAT_WINDOWS
- for (wp = firstwin; wp != win; wp = wp->w_next)
-- ++n;
-+ ++winnr;
- # endif
-- vimvars[VV_MOUSE_WIN].vv_nr = n;
-+ vimvars[VV_MOUSE_WIN].vv_nr = winnr;
- vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
- vimvars[VV_MOUSE_COL].vv_nr = col + 1;
- }
-@@ -11284,13 +11324,25 @@
- typval_T *argvars;
- typval_T *rettv;
- {
-+ int flags = WILD_SILENT|WILD_USE_NL;
- expand_T xpc;
-+ int error = FALSE;
-
-- ExpandInit(&xpc);
-- xpc.xp_context = EXPAND_FILES;
-+ /* When the optional second argument is non-zero, don't remove matches
-+ * for 'wildignore' and don't put matches for 'suffixes' at the end. */
-+ if (argvars[1].v_type != VAR_UNKNOWN
-+ && get_tv_number_chk(&argvars[1], &error))
-+ flags |= WILD_KEEP_ALL;
- rettv->v_type = VAR_STRING;
-- rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
-- NULL, WILD_USE_NL|WILD_SILENT, WILD_ALL);
-+ if (!error)
-+ {
-+ ExpandInit(&xpc);
-+ xpc.xp_context = EXPAND_FILES;
-+ rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
-+ NULL, flags, WILD_ALL);
-+ }
-+ else
-+ rettv->vval.v_string = NULL;
- }
-
- /*
-@@ -11301,14 +11353,22 @@
- typval_T *argvars;
- typval_T *rettv;
- {
-+ int flags = 0;
- char_u buf1[NUMBUFLEN];
- char_u *file = get_tv_string_buf_chk(&argvars[1], buf1);
-+ int error = FALSE;
-
-+ /* When the optional second argument is non-zero, don't remove matches
-+ * for 'wildignore' and don't put matches for 'suffixes' at the end. */
-+ if (argvars[2].v_type != VAR_UNKNOWN
-+ && get_tv_number_chk(&argvars[2], &error))
-+ flags |= WILD_KEEP_ALL;
- rettv->v_type = VAR_STRING;
-- if (file == NULL)
-+ if (file == NULL || error)
- rettv->vval.v_string = NULL;
- else
-- rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file);
-+ rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file,
-+ flags);
- }
-
- /*
-@@ -15838,10 +15898,9 @@
- if (res == FAIL)
- res = ITEM_COMPARE_FAIL;
- else
-- /* return value has wrong type */
- res = get_tv_number_chk(&rettv, &item_compare_func_err);
- if (item_compare_func_err)
-- res = ITEM_COMPARE_FAIL;
-+ res = ITEM_COMPARE_FAIL; /* return value has wrong type */
- clear_tv(&rettv);
- return res;
- }
-@@ -16590,8 +16649,11 @@
- p = highlight_has_attr(id, HL_INVERSE, modec);
- break;
-
-- case 's': /* standout */
-- p = highlight_has_attr(id, HL_STANDOUT, modec);
-+ case 's':
-+ if (TOLOWER_ASC(what[1]) == 'p') /* sp[#] */
-+ p = highlight_color(id, what, modec);
-+ else /* standout */
-+ p = highlight_has_attr(id, HL_STANDOUT, modec);
- break;
-
- case 'u':
-@@ -16658,7 +16720,7 @@
- col = get_tv_number(&argvars[1]) - 1; /* -1 on type error */
-
- if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
-- && col >= 0 && col < (long)STRLEN(ml_get(lnum))
-+ && col >= 0 && (col == 0 || col < (long)STRLEN(ml_get(lnum)))
- && rettv_list_alloc(rettv) != FAIL)
- {
- (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
-@@ -18097,14 +18159,28 @@
- }
-
- /*
-- * Set v:count, v:count1 and v:prevcount.
-+ * Get List v: variable value. Caller must take care of reference count when
-+ * needed.
-+ */
-+ list_T *
-+get_vim_var_list(idx)
-+ int idx;
-+{
-+ return vimvars[idx].vv_list;
-+}
-+
-+/*
-+ * Set v:count to "count" and v:count1 to "count1".
-+ * When "set_prevcount" is TRUE first set v:prevcount from v:count.
- */
- void
--set_vcount(count, count1)
-+set_vcount(count, count1, set_prevcount)
- long count;
- long count1;
-+ int set_prevcount;
- {
-- vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
-+ if (set_prevcount)
-+ vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
- vimvars[VV_COUNT].vv_nr = count;
- vimvars[VV_COUNT1].vv_nr = count1;
- }
-@@ -18132,6 +18208,20 @@
- }
-
- /*
-+ * Set List v: variable to "val".
-+ */
-+ void
-+set_vim_var_list(idx, val)
-+ int idx;
-+ list_T *val;
-+{
-+ list_unref(vimvars[idx].vv_list);
-+ vimvars[idx].vv_list = val;
-+ if (val != NULL)
-+ ++val->lv_refcount;
-+}
-+
-+/*
- * Set v:register if needed.
- */
- void
-@@ -20590,6 +20680,9 @@
- int st_len = 0;
-
- todo = (int)func_hashtab.ht_used;
-+ if (todo == 0)
-+ return; /* nothing to dump */
-+
- sorttab = (ufunc_T **)alloc((unsigned)(sizeof(ufunc_T) * todo));
-
- for (hi = func_hashtab.ht_array; todo > 0; ++hi)
-@@ -20638,6 +20731,8 @@
- prof_self_cmp);
- prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
- }
-+
-+ vim_free(sorttab);
- }
-
- static void
-@@ -21082,8 +21177,11 @@
- init_var_dict(&fc.l_avars, &fc.l_avars_var);
- add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
- (varnumber_T)(argcount - fp->uf_args.ga_len));
-+ /* Use "name" to avoid a warning from some compiler that checks the
-+ * destination size. */
- v = &fc.fixvar[fixvar_idx++].var;
-- STRCPY(v->di_key, "000");
-+ name = v->di_key;
-+ STRCPY(name, "000");
- v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
- hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
- v->di_tv.v_type = VAR_LIST;
-@@ -21204,7 +21302,7 @@
- if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
- func_do_profile(fp);
- if (fp->uf_profiling
-- || (fc.caller != NULL && &fc.caller->func->uf_profiling))
-+ || (fc.caller != NULL && fc.caller->func->uf_profiling))
- {
- ++fp->uf_tm_count;
- profile_start(&call_start);
-@@ -21235,13 +21333,13 @@
-
- #ifdef FEAT_PROFILE
- if (do_profiling == PROF_YES && (fp->uf_profiling
-- || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
-+ || (fc.caller != NULL && fc.caller->func->uf_profiling)))
- {
- profile_end(&call_start);
- profile_sub_wait(&wait_start, &call_start);
- profile_add(&fp->uf_tm_total, &call_start);
- profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
-- if (fc.caller != NULL && &fc.caller->func->uf_profiling)
-+ if (fc.caller != NULL && fc.caller->func->uf_profiling)
- {
- profile_add(&fc.caller->func->uf_tm_children, &call_start);
- profile_add(&fc.caller->func->uf_tml_children, &call_start);
-@@ -21886,6 +21984,62 @@
- }
- }
-
-+/*
-+ * List v:oldfiles in a nice way.
-+ */
-+/*ARGSUSED*/
-+ void
-+ex_oldfiles(eap)
-+ exarg_T *eap;
-+{
-+ list_T *l = vimvars[VV_OLDFILES].vv_list;
-+ listitem_T *li;
-+ int nr = 0;
-+
-+ if (l == NULL)
-+ msg((char_u *)_("No old files"));
-+ else
-+ {
-+ msg_start();
-+ msg_scroll = TRUE;
-+ for (li = l->lv_first; li != NULL && !got_int; li = li->li_next)
-+ {
-+ msg_outnum((long)++nr);
-+ MSG_PUTS(": ");
-+ msg_outtrans(get_tv_string(&li->li_tv));
-+ msg_putchar('\n');
-+ out_flush(); /* output one line at a time */
-+ ui_breakcheck();
-+ }
-+ /* Assume "got_int" was set to truncate the listing. */
-+ got_int = FALSE;
-+
-+#ifdef FEAT_BROWSE_CMD
-+ if (cmdmod.browse)
-+ {
-+ quit_more = FALSE;
-+ nr = prompt_for_number(FALSE);
-+ msg_starthere();
-+ if (nr > 0)
-+ {
-+ char_u *p = list_find_str(get_vim_var_list(VV_OLDFILES),
-+ (long)nr);
-+
-+ if (p != NULL)
-+ {
-+ p = expand_env_save(p);
-+ eap->arg = p;
-+ eap->cmdidx = CMD_edit;
-+ cmdmod.browse = FALSE;
-+ do_exedit(eap, NULL);
-+ vim_free(p);
-+ }
-+ }
-+ }
-+#endif
-+ }
-+}
-+
- #endif /* FEAT_EVAL */
-
-
-diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
---- vim72.orig/src/ex_cmds2.c 2008-07-13 17:18:22.000000000 +0100
-+++ vim72/src/ex_cmds2.c 2008-12-06 11:37:49.000000000 +0000
-@@ -2132,8 +2132,8 @@
- * argument index. */
- if (do_ecmd(0, alist_name(&ARGLIST[curwin->w_arg_idx]), NULL,
- eap, ECMD_LAST,
-- (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0) +
-- (eap->forceit ? ECMD_FORCEIT : 0)) == FAIL)
-+ (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0)
-+ + (eap->forceit ? ECMD_FORCEIT : 0), curwin) == FAIL)
- curwin->w_arg_idx = old_arg_idx;
- /* like Vi: set the mark where the cursor is in the file. */
- else if (eap->cmdidx != CMD_argdo)
-@@ -3145,8 +3145,8 @@
- verbose_leave();
- }
- #ifdef STARTUPTIME
-- vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
-- time_msg(IObuff, &tv_start);
-+ vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
-+ time_msg((char *)IObuff, &tv_start);
- time_pop(&tv_rel);
- #endif
-
-diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
---- vim72.orig/src/ex_cmds.c 2008-08-04 20:15:00.000000000 +0100
-+++ vim72/src/ex_cmds.c 2008-12-06 11:37:50.000000000 +0000
-@@ -24,7 +24,7 @@
- static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
- #ifdef FEAT_VIMINFO
- static char_u *viminfo_filename __ARGS((char_u *));
--static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int want_info, int want_marks, int force_read));
-+static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int flags));
- static int viminfo_encoding __ARGS((vir_T *virp));
- static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
- #endif
-@@ -1676,14 +1676,12 @@
-
- /*
- * read_viminfo() -- Read the viminfo file. Registers etc. which are already
-- * set are not over-written unless force is TRUE. -- webb
-+ * set are not over-written unless "flags" includes VIF_FORCEIT. -- webb
- */
- int
--read_viminfo(file, want_info, want_marks, forceit)
-- char_u *file;
-- int want_info;
-- int want_marks;
-- int forceit;
-+read_viminfo(file, flags)
-+ char_u *file; /* file name or NULL to use default name */
-+ int flags; /* VIF_WANT_INFO et al. */
- {
- FILE *fp;
- char_u *fname;
-@@ -1691,7 +1689,7 @@
- if (no_viminfo())
- return FAIL;
-
-- fname = viminfo_filename(file); /* may set to default if NULL */
-+ fname = viminfo_filename(file); /* get file name in allocated buffer */
- if (fname == NULL)
- return FAIL;
- fp = mch_fopen((char *)fname, READBIN);
-@@ -1701,8 +1699,9 @@
- verbose_enter();
- smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"),
- fname,
-- want_info ? _(" info") : "",
-- want_marks ? _(" marks") : "",
-+ (flags & VIF_WANT_INFO) ? _(" info") : "",
-+ (flags & VIF_WANT_MARKS) ? _(" marks") : "",
-+ (flags & VIF_GET_OLDFILES) ? _(" oldfiles") : "",
- fp == NULL ? _(" FAILED") : "");
- verbose_leave();
- }
-@@ -1712,10 +1711,9 @@
- return FAIL;
-
- viminfo_errcnt = 0;
-- do_viminfo(fp, NULL, want_info, want_marks, forceit);
-+ do_viminfo(fp, NULL, flags);
-
- fclose(fp);
--
- return OK;
- }
-
-@@ -1943,7 +1941,7 @@
- * root.
- */
- if (fp_out != NULL)
-- (void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
-+ ignored = fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
- #endif
- }
- }
-@@ -1968,7 +1966,7 @@
- }
-
- viminfo_errcnt = 0;
-- do_viminfo(fp_in, fp_out, !forceit, !forceit, FALSE);
-+ do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS));
-
- fclose(fp_out); /* errors are ignored !? */
- if (fp_in != NULL)
-@@ -2041,12 +2039,10 @@
- * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
- */
- static void
--do_viminfo(fp_in, fp_out, want_info, want_marks, force_read)
-+do_viminfo(fp_in, fp_out, flags)
- FILE *fp_in;
- FILE *fp_out;
-- int want_info;
-- int want_marks;
-- int force_read;
-+ int flags;
- {
- int count = 0;
- int eof = FALSE;
-@@ -2061,8 +2057,9 @@
-
- if (fp_in != NULL)
- {
-- if (want_info)
-- eof = read_viminfo_up_to_marks(&vir, force_read, fp_out != NULL);
-+ if (flags & VIF_WANT_INFO)
-+ eof = read_viminfo_up_to_marks(&vir,
-+ flags & VIF_FORCEIT, fp_out != NULL);
- else
- /* Skip info, find start of marks */
- while (!(eof = viminfo_readline(&vir))
-@@ -2092,8 +2089,9 @@
- write_viminfo_bufferlist(fp_out);
- count = write_viminfo_marks(fp_out);
- }
-- if (fp_in != NULL && want_marks)
-- copy_viminfo_marks(&vir, fp_out, count, eof);
-+ if (fp_in != NULL
-+ && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT)))
-+ copy_viminfo_marks(&vir, fp_out, count, eof, flags);
-
- vim_free(vir.vir_line);
- #ifdef FEAT_MBYTE
-@@ -3054,7 +3052,8 @@
- retval = 0; /* it's in the same file */
- }
- else if (do_ecmd(fnum, ffname, sfname, NULL, lnum,
-- (P_HID(curbuf) ? ECMD_HIDE : 0) + (forceit ? ECMD_FORCEIT : 0)) == OK)
-+ (P_HID(curbuf) ? ECMD_HIDE : 0) + (forceit ? ECMD_FORCEIT : 0),
-+ curwin) == OK)
- retval = -1; /* opened another file */
- else
- retval = 1; /* error encountered */
-@@ -3087,17 +3086,21 @@
- * ECMD_OLDBUF: use existing buffer if it exists
- * ECMD_FORCEIT: ! used for Ex command
- * ECMD_ADDBUF: don't edit, just add to buffer list
-+ * oldwin: Should be "curwin" when editing a new buffer in the current
-+ * window, NULL when splitting the window first. When not NULL info
-+ * of the previous buffer for "oldwin" is stored.
- *
- * return FAIL for failure, OK otherwise
- */
- int
--do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
-+do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
- int fnum;
- char_u *ffname;
- char_u *sfname;
- exarg_T *eap; /* can be NULL! */
- linenr_T newlnum;
- int flags;
-+ win_T *oldwin;
- {
- int other_file; /* TRUE if editing another file */
- int oldbuf; /* TRUE if using existing buffer */
-@@ -3269,7 +3272,8 @@
- {
- if (!cmdmod.keepalt)
- curwin->w_alt_fnum = curbuf->b_fnum;
-- buflist_altfpos();
-+ if (oldwin != NULL)
-+ buflist_altfpos(oldwin);
- }
-
- if (fnum)
-@@ -3373,7 +3377,7 @@
-
- /* close the link to the current buffer */
- u_sync(FALSE);
-- close_buffer(curwin, curbuf,
-+ close_buffer(oldwin, curbuf,
- (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD);
-
- #ifdef FEAT_AUTOCMD
-@@ -5059,6 +5063,7 @@
-
- if (did_sub)
- ++sub_nlines;
-+ vim_free(new_start); /* for when substitute was cancelled */
- vim_free(sub_firstline); /* free the copy of the original line */
- sub_firstline = NULL;
- }
-@@ -5610,7 +5615,13 @@
- */
- alt_fnum = curbuf->b_fnum;
- (void)do_ecmd(0, NULL, NULL, NULL, ECMD_LASTL,
-- ECMD_HIDE + ECMD_SET_HELP);
-+ ECMD_HIDE + ECMD_SET_HELP,
-+#ifdef FEAT_WINDOWS
-+ NULL /* buffer is still open, don't store info */
-+#else
-+ curwin
-+#endif
-+ );
- if (!cmdmod.keepalt)
- curwin->w_alt_fnum = alt_fnum;
- empty_fnum = curbuf->b_fnum;
-diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
---- vim72.orig/src/ex_cmds.h 2008-06-21 19:47:57.000000000 +0100
-+++ vim72/src/ex_cmds.h 2008-12-06 11:37:49.000000000 +0000
-@@ -278,7 +278,7 @@
- EX(CMD_crewind, "crewind", ex_cc,
- RANGE|NOTADR|COUNT|TRLBAR|BANG),
- EX(CMD_cscope, "cscope", do_cscope,
-- EXTRA|NOTRLCOM|SBOXOK|XFILE),
-+ EXTRA|NOTRLCOM|XFILE),
- EX(CMD_cstag, "cstag", do_cstag,
- BANG|TRLBAR|WORD1),
- EX(CMD_cunmap, "cunmap", ex_unmap,
-@@ -506,7 +506,7 @@
- EX(CMD_lclose, "lclose", ex_cclose,
- RANGE|NOTADR|COUNT|TRLBAR),
- EX(CMD_lcscope, "lcscope", do_cscope,
-- EXTRA|NOTRLCOM|SBOXOK|XFILE),
-+ EXTRA|NOTRLCOM|XFILE),
- EX(CMD_left, "left", ex_align,
- TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
- EX(CMD_leftabove, "leftabove", ex_wrongmodifier,
-@@ -635,6 +635,8 @@
- RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
- EX(CMD_noremap, "noremap", ex_map,
- BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
-+EX(CMD_noautocmd, "noautocmd", ex_wrongmodifier,
-+ NEEDARG|EXTRA|NOTRLCOM),
- EX(CMD_nohlsearch, "nohlsearch", ex_nohlsearch,
- TRLBAR|SBOXOK|CMDWIN),
- EX(CMD_noreabbrev, "noreabbrev", ex_abbreviate,
-@@ -651,6 +653,8 @@
- EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
- EX(CMD_open, "open", ex_open,
- RANGE|EXTRA),
-+EX(CMD_oldfiles, "oldfiles", ex_oldfiles,
-+ BANG|TRLBAR|SBOXOK|CMDWIN),
- EX(CMD_omap, "omap", ex_map,
- EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
- EX(CMD_omapclear, "omapclear", ex_mapclear,
-@@ -802,7 +806,7 @@
- EX(CMD_scriptencoding, "scriptencoding", ex_scriptencoding,
- WORD1|TRLBAR|CMDWIN),
- EX(CMD_scscope, "scscope", do_scscope,
-- EXTRA|NOTRLCOM|SBOXOK),
-+ EXTRA|NOTRLCOM),
- EX(CMD_set, "set", ex_set,
- TRLBAR|EXTRA|CMDWIN|SBOXOK),
- EX(CMD_setfiletype, "setfiletype", ex_setfiletype,
-diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
---- vim72.orig/src/ex_docmd.c 2008-07-26 12:51:05.000000000 +0100
-+++ vim72/src/ex_docmd.c 2008-12-06 11:37:50.000000000 +0000
-@@ -364,6 +364,7 @@
- # define ex_function ex_ni
- # define ex_delfunction ex_ni
- # define ex_return ex_ni
-+# define ex_oldfiles ex_ni
- #endif
- static char_u *arg_all __ARGS((void));
- #ifdef FEAT_SESSION
-@@ -1770,7 +1771,7 @@
- }
- if (checkforcmd(&ea.cmd, "browse", 3))
- {
--#ifdef FEAT_BROWSE
-+#ifdef FEAT_BROWSE_CMD
- cmdmod.browse = TRUE;
- #endif
- continue;
-@@ -2978,6 +2979,7 @@
- {"keepmarks", 3, FALSE},
- {"leftabove", 5, FALSE},
- {"lockmarks", 3, FALSE},
-+ {"noautocmd", 3, FALSE},
- {"rightbelow", 6, FALSE},
- {"sandbox", 3, FALSE},
- {"silent", 3, FALSE},
-@@ -3608,6 +3610,7 @@
- return set_context_in_autocmd(xp, arg, FALSE);
-
- case CMD_doautocmd:
-+ case CMD_doautoall:
- return set_context_in_autocmd(xp, arg, TRUE);
- #endif
- case CMD_set:
-@@ -7485,7 +7488,8 @@
- /* ":new" or ":tabnew" without argument: edit an new empty buffer */
- setpcmark();
- (void)do_ecmd(0, NULL, NULL, eap, ECMD_ONE,
-- ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0));
-+ ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0),
-+ old_curwin == NULL ? curwin : NULL);
- }
- else if ((eap->cmdidx != CMD_split
- #ifdef FEAT_VERTSPLIT
-@@ -7522,7 +7526,7 @@
- #ifdef FEAT_LISTCMDS
- + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
- #endif
-- ) == FAIL)
-+ , old_curwin == NULL ? curwin : NULL) == FAIL)
- {
- /* Editing the file failed. If the window was split, close it. */
- #ifdef FEAT_WINDOWS
-@@ -8749,8 +8753,8 @@
- else if (*dirnow != NUL
- && (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
- {
-- (void)mch_chdir((char *)globaldir);
-- shorten_fnames(TRUE);
-+ if (mch_chdir((char *)globaldir) == OK)
-+ shorten_fnames(TRUE);
- }
-
- failed |= (makeopens(fd, dirnow) == FAIL);
-@@ -9506,24 +9510,50 @@
- break;
- }
- s = src + 1;
-+ if (*s == '<') /* "#<99" uses v:oldfiles */
-+ ++s;
- i = (int)getdigits(&s);
- *usedlen = (int)(s - src); /* length of what we expand */
-
-- buf = buflist_findnr(i);
-- if (buf == NULL)
-+ if (src[1] == '<')
- {
-- *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
-+ if (*usedlen < 2)
-+ {
-+ /* Should we give an error message for #<text? */
-+ *usedlen = 1;
-+ return NULL;
-+ }
-+#ifdef FEAT_EVAL
-+ result = list_find_str(get_vim_var_list(VV_OLDFILES),
-+ (long)i);
-+ if (result == NULL)
-+ {
-+ *errormsg = (char_u *)"";
-+ return NULL;
-+ }
-+#else
-+ *errormsg = (char_u *)_("E809: #< is not available without the +eval feature");
- return NULL;
-+#endif
- }
-- if (lnump != NULL)
-- *lnump = ECMD_LAST;
-- if (buf->b_fname == NULL)
-+ else
- {
-- result = (char_u *)"";
-- valid = 0; /* Must have ":p:h" to be valid */
-+ buf = buflist_findnr(i);
-+ if (buf == NULL)
-+ {
-+ *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
-+ return NULL;
-+ }
-+ if (lnump != NULL)
-+ *lnump = ECMD_LAST;
-+ if (buf->b_fname == NULL)
-+ {
-+ result = (char_u *)"";
-+ valid = 0; /* Must have ":p:h" to be valid */
-+ }
-+ else
-+ result = buf->b_fname;
- }
-- else
-- result = buf->b_fname;
- break;
-
- #ifdef FEAT_SEARCHPATH
-@@ -9541,6 +9571,15 @@
- #ifdef FEAT_AUTOCMD
- case SPEC_AFILE: /* file name for autocommand */
- result = autocmd_fname;
-+ if (result != NULL && !autocmd_fname_full)
-+ {
-+ /* Still need to turn the fname into a full path. It is
-+ * postponed to avoid a delay when <afile> is not used. */
-+ autocmd_fname_full = TRUE;
-+ result = FullName_save(autocmd_fname, FALSE);
-+ vim_free(autocmd_fname);
-+ autocmd_fname = result;
-+ }
- if (result == NULL)
- {
- *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
-@@ -10689,7 +10728,8 @@
- p_viminfo = (char_u *)"'100";
- if (eap->cmdidx == CMD_rviminfo)
- {
-- if (read_viminfo(eap->arg, TRUE, TRUE, eap->forceit) == FAIL)
-+ if (read_viminfo(eap->arg, VIF_WANT_INFO | VIF_WANT_MARKS
-+ | (eap->forceit ? VIF_FORCEIT : 0)) == FAIL)
- EMSG(_("E195: Cannot open viminfo file for reading"));
- }
- else
-diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
---- vim72.orig/src/ex_getln.c 2008-08-08 10:31:33.000000000 +0100
-+++ vim72/src/ex_getln.c 2008-12-06 11:37:50.000000000 +0000
-@@ -31,6 +31,8 @@
- int cmdattr; /* attributes for prompt */
- int overstrike; /* Typing mode on the command line. Shared by
- getcmdline() and put_on_cmdline(). */
-+ expand_T *xpc; /* struct being used for expansion, xp_pattern
-+ may point into cmdbuff */
- int xp_context; /* type of expansion */
- # ifdef FEAT_EVAL
- char_u *xp_arg; /* user-defined expansion arg */
-@@ -38,7 +40,11 @@
- # endif
- };
-
--static struct cmdline_info ccline; /* current cmdline_info */
-+/* The current cmdline_info. It is initialized in getcmdline() and after that
-+ * used by other functions. When invoking getcmdline() recursively it needs
-+ * to be saved with save_cmdline() and restored with restore_cmdline().
-+ * TODO: make it local to getcmdline() and pass it around. */
-+static struct cmdline_info ccline;
-
- static int cmd_showtail; /* Only show path tail in lists ? */
-
-@@ -238,6 +244,7 @@
- }
-
- ExpandInit(&xpc);
-+ ccline.xpc = &xpc;
-
- #ifdef FEAT_RIGHTLEFT
- if (curwin->w_p_rl && *curwin->w_p_rlc == 's'
-@@ -408,9 +415,10 @@
- #endif
-
- /*
-- * <S-Tab> works like CTRL-P (unless 'wc' is <S-Tab>).
-+ * When there are matching completions to select <S-Tab> works like
-+ * CTRL-P (unless 'wc' is <S-Tab>).
- */
-- if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles != -1)
-+ if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0)
- c = Ctrl_P;
-
- #ifdef FEAT_WILDMENU
-@@ -1513,6 +1521,7 @@
- int old_firstc;
-
- vim_free(ccline.cmdbuff);
-+ xpc.xp_context = EXPAND_NOTHING;
- if (hiscnt == hislen)
- p = lookfor; /* back to the old one */
- else
-@@ -1839,6 +1848,7 @@
- #endif
-
- ExpandCleanup(&xpc);
-+ ccline.xpc = NULL;
-
- #ifdef FEAT_SEARCH_EXTRA
- if (did_incsearch)
-@@ -2508,6 +2518,20 @@
- }
- mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1);
- vim_free(p);
-+
-+ if (ccline.xpc != NULL
-+ && ccline.xpc->xp_pattern != NULL
-+ && ccline.xpc->xp_context != EXPAND_NOTHING
-+ && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
-+ {
-+ int i = (int)(ccline.xpc->xp_pattern - p);
-+
-+ /* If xp_pattern points inside the old cmdbuff it needs to be adjusted
-+ * to point into the newly allocated memory. */
-+ if (i >= 0 && i <= ccline.cmdlen)
-+ ccline.xpc->xp_pattern = ccline.cmdbuff + i;
-+ }
-+
- return OK;
- }
-
-@@ -2875,6 +2899,7 @@
- prev_ccline = ccline;
- ccline.cmdbuff = NULL;
- ccline.cmdprompt = NULL;
-+ ccline.xpc = NULL;
- }
-
- /*
-@@ -3582,6 +3607,7 @@
- ExpandInit(xp)
- expand_T *xp;
- {
-+ xp->xp_pattern = NULL;
- xp->xp_backslash = XP_BS_NONE;
- #ifndef BACKSLASH_IN_FILENAME
- xp->xp_shell = FALSE;
-@@ -4871,7 +4897,7 @@
- if (s == NULL)
- return FAIL;
- sprintf((char *)s, "%s/%s*.vim", dirname, pat);
-- all = globpath(p_rtp, s);
-+ all = globpath(p_rtp, s, 0);
- vim_free(s);
- if (all == NULL)
- return FAIL;
-@@ -4912,9 +4938,10 @@
- * newlines. Returns NULL for an error or no matches.
- */
- char_u *
--globpath(path, file)
-+globpath(path, file, expand_options)
- char_u *path;
- char_u *file;
-+ int expand_options;
- {
- expand_T xpc;
- char_u *buf;
-@@ -4943,10 +4970,10 @@
- {
- add_pathsep(buf);
- STRCAT(buf, file);
-- if (ExpandFromContext(&xpc, buf, &num_p, &p, WILD_SILENT) != FAIL
-- && num_p > 0)
-+ if (ExpandFromContext(&xpc, buf, &num_p, &p,
-+ WILD_SILENT|expand_options) != FAIL && num_p > 0)
- {
-- ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT);
-+ ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options);
- for (len = 0, i = 0; i < num_p; ++i)
- len += (int)STRLEN(p[i]) + 1;
-
-@@ -6025,7 +6052,7 @@
- cmdwin_type = '-';
-
- /* Create the command-line buffer empty. */
-- (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
-+ (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
- (void)setfname(curbuf, (char_u *)"[Command Line]", NULL, TRUE);
- set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
- set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
-diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
---- vim72.orig/src/feature.h 2008-08-06 12:00:39.000000000 +0100
-+++ vim72/src/feature.h 2008-12-06 11:37:49.000000000 +0000
-@@ -767,9 +767,13 @@
-
- /*
- * +browse ":browse" command.
-+ * or just the ":browse" command modifier
- */
--#if defined(FEAT_NORMAL) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
--# define FEAT_BROWSE
-+#if defined(FEAT_NORMAL)
-+# define FEAT_BROWSE_CMD
-+# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
-+# define FEAT_BROWSE
-+# endif
- #endif
-
- /*
-diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
---- vim72.orig/src/fileio.c 2008-08-06 12:01:03.000000000 +0100
-+++ vim72/src/fileio.c 2008-12-06 11:37:50.000000000 +0000
-@@ -932,7 +932,10 @@
- else
- {
- if (eap != NULL && eap->force_ff != 0)
-+ {
- fileformat = get_fileformat_force(curbuf, eap);
-+ try_unix = try_dos = try_mac = FALSE;
-+ }
- else if (curbuf->b_p_bin)
- fileformat = EOL_UNIX; /* binary: use Unix format */
- else if (*p_ffs == NUL)
-@@ -2211,7 +2214,7 @@
- {
- /* Use stderr for stdin, makes shell commands work. */
- close(0);
-- dup(2);
-+ ignored = dup(2);
- }
- #endif
-
-@@ -2341,11 +2344,6 @@
- STRCAT(IObuff, _("[CR missing]"));
- c = TRUE;
- }
-- if (ff_error == EOL_MAC)
-- {
-- STRCAT(IObuff, _("[NL found]"));
-- c = TRUE;
-- }
- if (split)
- {
- STRCAT(IObuff, _("[long lines split]"));
-@@ -2711,7 +2709,7 @@
- {
- if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
- && curbuf->b_ffname != NULL)
-- read_viminfo(NULL, FALSE, TRUE, FALSE);
-+ read_viminfo(NULL, VIF_WANT_MARKS);
-
- /* Always set b_marks_read; needed when 'viminfo' is changed to include
- * the ' parameter after opening a buffer. */
-@@ -3451,7 +3449,7 @@
- {
- # ifdef UNIX
- # ifdef HAVE_FCHOWN
-- fchown(fd, st_old.st_uid, st_old.st_gid);
-+ ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
- # endif
- if (mch_stat((char *)IObuff, &st) < 0
- || st.st_uid != st_old.st_uid
-@@ -4367,7 +4365,7 @@
- || st.st_uid != st_old.st_uid
- || st.st_gid != st_old.st_gid)
- {
-- fchown(fd, st_old.st_uid, st_old.st_gid);
-+ ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
- if (perm >= 0) /* set permission again, may have changed */
- (void)mch_setperm(wfname, perm);
- }
-@@ -5550,9 +5548,10 @@
- name = "ucs-4le"; /* FF FE 00 00 */
- len = 4;
- }
-- else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L))
-+ else if (flags == (FIO_UCS2 | FIO_ENDIAN_L))
- name = "ucs-2le"; /* FF FE */
-- else if (flags == (FIO_UTF16 | FIO_ENDIAN_L))
-+ else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L))
-+ /* utf-16le is preferred, it also works for ucs-2le text */
- name = "utf-16le"; /* FF FE */
- }
- else if (p[0] == 0xfe && p[1] == 0xff
-@@ -6031,9 +6030,9 @@
- {
- tbuf[FGETS_SIZE - 2] = NUL;
- #ifdef USE_CR
-- fgets_cr((char *)tbuf, FGETS_SIZE, fp);
-+ ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp);
- #else
-- fgets((char *)tbuf, FGETS_SIZE, fp);
-+ ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp);
- #endif
- } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
- }
-@@ -8523,6 +8522,7 @@
- char_u *save_sourcing_name;
- linenr_T save_sourcing_lnum;
- char_u *save_autocmd_fname;
-+ int save_autocmd_fname_full;
- int save_autocmd_bufnr;
- char_u *save_autocmd_match;
- int save_autocmd_busy;
-@@ -8601,6 +8601,7 @@
- * Save the autocmd_* variables and info about the current buffer.
- */
- save_autocmd_fname = autocmd_fname;
-+ save_autocmd_fname_full = autocmd_fname_full;
- save_autocmd_bufnr = autocmd_bufnr;
- save_autocmd_match = autocmd_match;
- save_autocmd_busy = autocmd_busy;
-@@ -8618,14 +8619,15 @@
- if (fname != NULL && *fname != NUL)
- autocmd_fname = fname;
- else if (buf != NULL)
-- autocmd_fname = buf->b_fname;
-+ autocmd_fname = buf->b_ffname;
- else
- autocmd_fname = NULL;
- }
- else
- autocmd_fname = fname_io;
- if (autocmd_fname != NULL)
-- autocmd_fname = FullName_save(autocmd_fname, FALSE);
-+ autocmd_fname = vim_strsave(autocmd_fname);
-+ autocmd_fname_full = FALSE; /* call FullName_save() later */
-
- /*
- * Set the buffer number to be used for <abuf>.
-@@ -8810,6 +8812,7 @@
- sourcing_lnum = save_sourcing_lnum;
- vim_free(autocmd_fname);
- autocmd_fname = save_autocmd_fname;
-+ autocmd_fname_full = save_autocmd_fname_full;
- autocmd_bufnr = save_autocmd_bufnr;
- autocmd_match = save_autocmd_match;
- #ifdef FEAT_EVAL
-@@ -8918,7 +8921,7 @@
- {
- apc->curpat = NULL;
-
-- /* only use a pattern when it has not been removed, has commands and
-+ /* Only use a pattern when it has not been removed, has commands and
- * the group matches. For buffer-local autocommands only check the
- * buffer number. */
- if (ap->pat != NULL && ap->cmds != NULL
-@@ -9104,7 +9107,7 @@
- set_context_in_autocmd(xp, arg, doautocmd)
- expand_T *xp;
- char_u *arg;
-- int doautocmd; /* TRUE for :doautocmd, FALSE for :autocmd */
-+ int doautocmd; /* TRUE for :doauto*, FALSE for :autocmd */
- {
- char_u *p;
- int group;
-diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
---- vim72.orig/src/fold.c 2008-08-06 12:01:12.000000000 +0100
-+++ vim72/src/fold.c 2008-12-06 11:37:50.000000000 +0000
-@@ -48,7 +48,7 @@
- static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
- static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));
- static void checkupdate __ARGS((win_T *wp));
--static void setFoldRepeat __ARGS((linenr_T lnum, long count, int open));
-+static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open));
- static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));
- static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
- static void foldOpenNested __ARGS((fold_T *fpr));
-@@ -1241,10 +1241,10 @@
- * Repeat "count" times.
- */
- static void
--setFoldRepeat(lnum, count, open)
-+setFoldRepeat(lnum, count, do_open)
- linenr_T lnum;
- long count;
-- int open;
-+ int do_open;
- {
- int done;
- long n;
-@@ -1252,7 +1252,7 @@
- for (n = 0; n < count; ++n)
- {
- done = DONE_NOTHING;
-- (void)setManualFold(lnum, open, FALSE, &done);
-+ (void)setManualFold(lnum, do_open, FALSE, &done);
- if (!(done & DONE_ACTION))
- {
- /* Only give an error message when no fold could be opened. */
-diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
---- vim72.orig/src/getchar.c 2008-07-22 17:57:48.000000000 +0100
-+++ vim72/src/getchar.c 2008-12-06 11:37:50.000000000 +0000
-@@ -4702,7 +4702,7 @@
- return FAIL;
- if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
- return FAIL;
-- if (fprintf(fd, cmd) < 0)
-+ if (fputs(cmd, fd) < 0)
- return FAIL;
- if (buf != NULL && fputs(" <buffer>", fd) < 0)
- return FAIL;
-@@ -4801,7 +4801,7 @@
- }
- if (IS_SPECIAL(c) || modifiers) /* special key */
- {
-- if (fprintf(fd, (char *)get_special_key_name(c, modifiers)) < 0)
-+ if (fputs((char *)get_special_key_name(c, modifiers), fd) < 0)
- return FAIL;
- continue;
- }
-diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
---- vim72.orig/src/globals.h 2008-07-26 12:53:29.000000000 +0100
-+++ vim72/src/globals.h 2008-12-06 11:37:50.000000000 +0000
-@@ -1022,6 +1022,7 @@
- #endif
- #ifdef FEAT_AUTOCMD
- EXTERN char_u *autocmd_fname INIT(= NULL); /* fname for <afile> on cmdline */
-+EXTERN int autocmd_fname_full; /* autocmd_fname is full path */
- EXTERN int autocmd_bufnr INIT(= 0); /* fnum for <abuf> on cmdline */
- EXTERN char_u *autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
- EXTERN int did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
-@@ -1548,6 +1549,14 @@
- EXTERN time_t starttime;
-
- /*
-+ * Some compilers warn for not using a return value, but in some situations we
-+ * can't do anything useful with the value. Assign to this variable to avoid
-+ * the warning.
-+ */
-+EXTERN int ignored;
-+EXTERN char *ignoredp;
-+
-+/*
- * Optional Farsi support. Include it here, so EXTERN and INIT are defined.
- */
- #ifdef FEAT_FKMAP
-diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
---- vim72.orig/src/gui_at_sb.c 2004-06-07 15:32:25.000000000 +0100
-+++ vim72/src/gui_at_sb.c 2008-12-06 11:37:50.000000000 +0000
-@@ -1078,6 +1078,12 @@
- Cardinal *num_params; /* unused */
- {
- ScrollbarWidget sbw = (ScrollbarWidget)w;
-+ /* Use a union to avoid a warning for the weird conversion from float to
-+ * XtPointer. Comes from Xaw/Scrollbar.c. */
-+ union {
-+ XtPointer xtp;
-+ float xtf;
-+ } xtpf;
-
- if (LookAhead(w, event))
- return;
-@@ -1085,7 +1091,8 @@
- /* thumbProc is not pretty, but is necessary for backwards
- compatibility on those architectures for which it work{s,ed};
- the intent is to pass a (truncated) float by value. */
-- XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
-+ xtpf.xtf = sbw->scrollbar.top;
-+ XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
- XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
- }
-
-diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
---- vim72.orig/src/gui.c 2008-07-27 20:32:14.000000000 +0100
-+++ vim72/src/gui.c 2008-12-06 11:37:50.000000000 +0000
-@@ -139,7 +139,7 @@
- /* The read returns when the child closes the pipe (or when
- * the child dies for some reason). */
- close(pipefd[1]);
-- (void)read(pipefd[0], &dummy, (size_t)1);
-+ ignored = (int)read(pipefd[0], &dummy, (size_t)1);
- close(pipefd[0]);
- }
-
-@@ -3241,7 +3241,7 @@
- i = Rows;
- gui_update_tabline();
- Rows = i;
-- need_set_size = RESIZE_VERT;
-+ need_set_size |= RESIZE_VERT;
- if (using_tabline)
- fix_size = TRUE;
- if (!gui_use_tabline())
-@@ -3275,9 +3275,9 @@
- if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
- {
- if (i == SBAR_BOTTOM)
-- need_set_size = RESIZE_VERT;
-+ need_set_size |= RESIZE_VERT;
- else
-- need_set_size = RESIZE_HOR;
-+ need_set_size |= RESIZE_HOR;
- if (gui.which_scrollbars[i])
- fix_size = TRUE;
- }
-@@ -3297,7 +3297,7 @@
- gui_mch_enable_menu(gui.menu_is_active);
- Rows = i;
- prev_menu_is_active = gui.menu_is_active;
-- need_set_size = RESIZE_VERT;
-+ need_set_size |= RESIZE_VERT;
- if (gui.menu_is_active)
- fix_size = TRUE;
- }
-@@ -3308,7 +3308,7 @@
- {
- gui_mch_show_toolbar(using_toolbar);
- prev_toolbar = using_toolbar;
-- need_set_size = RESIZE_VERT;
-+ need_set_size |= RESIZE_VERT;
- if (using_toolbar)
- fix_size = TRUE;
- }
-@@ -3318,7 +3318,7 @@
- {
- gui_mch_enable_footer(using_footer);
- prev_footer = using_footer;
-- need_set_size = RESIZE_VERT;
-+ need_set_size |= RESIZE_VERT;
- if (using_footer)
- fix_size = TRUE;
- }
-@@ -3330,10 +3330,11 @@
- prev_tearoff = using_tearoff;
- }
- #endif
-- if (need_set_size)
-+ if (need_set_size != 0)
- {
- #ifdef FEAT_GUI_GTK
-- long c = Columns;
-+ long prev_Columns = Columns;
-+ long prev_Rows = Rows;
- #endif
- /* Adjust the size of the window to make the text area keep the
- * same size and to avoid that part of our window is off-screen
-@@ -3349,11 +3350,14 @@
- * If you remove this, please test this command for resizing
- * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
- * Don't do this while starting up though.
-- * And don't change Rows, it may have be reduced intentionally
-- * when adding menu/toolbar/tabline. */
-- if (!gui.starting)
-+ * Don't change Rows when adding menu/toolbar/tabline.
-+ * Don't change Columns when adding vertical toolbar. */
-+ if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
- (void)char_avail();
-- Columns = c;
-+ if ((need_set_size & RESIZE_VERT) == 0)
-+ Rows = prev_Rows;
-+ if ((need_set_size & RESIZE_HOR) == 0)
-+ Columns = prev_Columns;
- #endif
- }
- #ifdef FEAT_WINDOWS
-diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
---- vim72.orig/src/gui_gtk_x11.c 2008-07-04 11:46:24.000000000 +0100
-+++ vim72/src/gui_gtk_x11.c 2008-12-06 11:37:50.000000000 +0000
-@@ -4070,14 +4070,14 @@
-
- if (mask & (XValue | YValue))
- {
-- int w, h;
-- gui_mch_get_screen_dimensions(&w, &h);
-- h += p_ghr + get_menu_tool_height();
-- w += get_menu_tool_width();
-+ int ww, hh;
-+ gui_mch_get_screen_dimensions(&ww, &hh);
-+ hh += p_ghr + get_menu_tool_height();
-+ ww += get_menu_tool_width();
- if (mask & XNegative)
-- x += w - pixel_width;
-+ x += ww - pixel_width;
- if (mask & YNegative)
-- y += h - pixel_height;
-+ y += hh - pixel_height;
- #ifdef HAVE_GTK2
- gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
- #else
-diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
---- vim72.orig/src/gui_x11.c 2008-06-08 16:13:45.000000000 +0100
-+++ vim72/src/gui_x11.c 2008-12-06 11:37:49.000000000 +0000
-@@ -2450,7 +2450,7 @@
- *colorPtr = colortable[closest];
- }
-
-- free(colortable);
-+ vim_free(colortable);
- return OK;
- }
-
-diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
---- vim72.orig/src/gui_xmdlg.c 2008-06-21 17:05:32.000000000 +0100
-+++ vim72/src/gui_xmdlg.c 2008-12-06 11:37:50.000000000 +0000
-@@ -369,10 +369,10 @@
- char buf[TEMP_BUF_SIZE];
- XmString items[MAX_ENTRIES_IN_LIST];
- int i;
-- int index;
-+ int idx;
-
-- for (index = (int)ENCODING; index < (int)NONE; ++index)
-- count[index] = 0;
-+ for (idx = (int)ENCODING; idx < (int)NONE; ++idx)
-+ count[idx] = 0;
-
- /* First we insert the wild char into every single list. */
- if (fix != ENCODING)
-@@ -503,14 +503,14 @@
- /*
- * Now loop trough the remaining lists and set them up.
- */
-- for (index = (int)NAME; index < (int)NONE; ++index)
-+ for (idx = (int)NAME; idx < (int)NONE; ++idx)
- {
- Widget w;
-
-- if (fix == (enum ListSpecifier)index)
-+ if (fix == (enum ListSpecifier)idx)
- continue;
-
-- switch ((enum ListSpecifier)index)
-+ switch ((enum ListSpecifier)idx)
- {
- case NAME:
- w = data->list[NAME];
-@@ -525,21 +525,21 @@
- w = (Widget)0; /* for lint */
- }
-
-- for (i = 0; i < count[index]; ++i)
-+ for (i = 0; i < count[idx]; ++i)
- {
-- items[i] = XmStringCreateLocalized(list[index][i]);
-- XtFree(list[index][i]);
-+ items[i] = XmStringCreateLocalized(list[idx][i]);
-+ XtFree(list[idx][i]);
- }
- XmListDeleteAllItems(w);
-- XmListAddItems(w, items, count[index], 1);
-- if (data->sel[index])
-+ XmListAddItems(w, items, count[idx], 1);
-+ if (data->sel[idx])
- {
- XmStringFree(items[0]);
-- items[0] = XmStringCreateLocalized(data->sel[index]);
-+ items[0] = XmStringCreateLocalized(data->sel[idx]);
- XmListSelectItem(w, items[0], False);
- XmListSetBottomItem(w, items[0]);
- }
-- for (i = 0; i < count[index]; ++i)
-+ for (i = 0; i < count[idx]; ++i)
- XmStringFree(items[i]);
- }
- }
-@@ -695,14 +695,14 @@
- int n;
- XmString str;
- Arg args[4];
-- char *msg = _("no specific match");
-+ char *nomatch_msg = _("no specific match");
-
- n = 0;
-- str = XmStringCreateLocalized(msg);
-+ str = XmStringCreateLocalized(nomatch_msg);
- XtSetArg(args[n], XmNlabelString, str); ++n;
- XtSetValues(data->sample, args, n);
- apply_fontlist(data->sample);
-- XmTextSetString(data->name, msg);
-+ XmTextSetString(data->name, nomatch_msg);
- XmStringFree(str);
-
- return False;
-@@ -886,21 +886,21 @@
- {
- int i;
- int max;
-- int index = 0;
-+ int idx = 0;
- int size;
-- char str[128];
-+ char buf[128];
-
- for (i = 0, max = 0; i < data->num; i++)
- {
-- get_part(fn(data, i), 7, str);
-- size = atoi(str);
-+ get_part(fn(data, i), 7, buf);
-+ size = atoi(buf);
- if ((size > max) && (size < MAX_DISPLAY_SIZE))
- {
-- index = i;
-+ idx = i;
- max = size;
- }
- }
-- strcpy(big_font, fn(data, index));
-+ strcpy(big_font, fn(data, idx));
- }
- data->old = XLoadQueryFont(XtDisplay(parent), big_font);
- data->old_list = gui_motif_create_fontlist(data->old);
-@@ -1217,28 +1217,28 @@
-
- if (i != 0)
- {
-- char name[TEMP_BUF_SIZE];
-- char style[TEMP_BUF_SIZE];
-- char size[TEMP_BUF_SIZE];
-- char encoding[TEMP_BUF_SIZE];
-+ char namebuf[TEMP_BUF_SIZE];
-+ char stylebuf[TEMP_BUF_SIZE];
-+ char sizebuf[TEMP_BUF_SIZE];
-+ char encodingbuf[TEMP_BUF_SIZE];
- char *found;
-
- found = names[0];
-
-- name_part(found, name);
-- style_part(found, style);
-- size_part(found, size, data->in_pixels);
-- encoding_part(found, encoding);
--
-- if (strlen(name) > 0
-- && strlen(style) > 0
-- && strlen(size) > 0
-- && strlen(encoding) > 0)
-+ name_part(found, namebuf);
-+ style_part(found, stylebuf);
-+ size_part(found, sizebuf, data->in_pixels);
-+ encoding_part(found, encodingbuf);
-+
-+ if (strlen(namebuf) > 0
-+ && strlen(stylebuf) > 0
-+ && strlen(sizebuf) > 0
-+ && strlen(encodingbuf) > 0)
- {
-- data->sel[NAME] = XtNewString(name);
-- data->sel[STYLE] = XtNewString(style);
-- data->sel[SIZE] = XtNewString(size);
-- data->sel[ENCODING] = XtNewString(encoding);
-+ data->sel[NAME] = XtNewString(namebuf);
-+ data->sel[STYLE] = XtNewString(stylebuf);
-+ data->sel[SIZE] = XtNewString(sizebuf);
-+ data->sel[ENCODING] = XtNewString(encodingbuf);
- data->font_name = XtNewString(names[0]);
- display_sample(data);
- XmTextSetString(data->name, data->font_name);
-diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
---- vim72.orig/src/gui_xmebw.c 2007-09-06 11:57:51.000000000 +0100
-+++ vim72/src/gui_xmebw.c 2008-12-06 11:37:50.000000000 +0000
-@@ -1256,7 +1256,7 @@
- }
- else
- {
-- int adjust = 0;
-+ adjust = 0;
-
- #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
- /*
-@@ -1268,12 +1268,11 @@
- {
- case XmEXTERNAL_HIGHLIGHT:
- adjust = (eb->primitive.highlight_thickness -
-- (eb->pushbutton.default_button_shadow_thickness ?
-- Xm3D_ENHANCE_PIXEL : 0));
-+ (eb->pushbutton.default_button_shadow_thickness
-+ ? Xm3D_ENHANCE_PIXEL : 0));
- break;
-
- case XmINTERNAL_HIGHLIGHT:
-- adjust = 0;
- break;
-
- default:
-diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
---- vim72.orig/src/if_cscope.c 2008-06-24 17:32:34.000000000 +0100
-+++ vim72/src/if_cscope.c 2008-12-06 11:37:48.000000000 +0000
-@@ -74,7 +74,7 @@
- { "add", cs_add,
- N_("Add a new database"), "add file|dir [pre-path] [flags]", 0 },
- { "find", cs_find,
-- N_("Query for a pattern"), FIND_USAGE, 1 },
-+ N_("Query for a pattern"), "find c|d|e|f|g|i|s|t name", 1 },
- { "help", cs_help,
- N_("Show this message"), "help", 0 },
- { "kill", cs_kill,
-@@ -1180,7 +1180,16 @@
- (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
- cmdp->name, _(cmdp->help), cmdp->usage);
- if (strcmp(cmdp->name, "find") == 0)
-- MSG_PUTS(FIND_HELP);
-+ MSG_PUTS(_("\n"
-+ " c: Find functions calling this function\n"
-+ " d: Find functions called by this function\n"
-+ " e: Find this egrep pattern\n"
-+ " f: Find this file\n"
-+ " g: Find this definition\n"
-+ " i: Find files #including this file\n"
-+ " s: Find this C symbol\n"
-+ " t: Find assignments to\n"));
-+
- cmdp++;
- }
-
-diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
---- vim72.orig/src/if_cscope.h 2007-09-02 15:51:08.000000000 +0100
-+++ vim72/src/if_cscope.h 2008-12-06 11:37:48.000000000 +0000
-@@ -42,17 +42,6 @@
- * f 7name Find this file
- * i 8name Find files #including this file
- */
--#define FIND_USAGE "find c|d|e|f|g|i|s|t name"
--#define FIND_HELP "\n\
-- c: Find functions calling this function\n\
-- d: Find functions called by this function\n\
-- e: Find this egrep pattern\n\
-- f: Find this file\n\
-- g: Find this definition\n\
-- i: Find files #including this file\n\
-- s: Find this C symbol\n\
-- t: Find assignments to\n"
--
-
- typedef struct {
- char * name;
-diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
---- vim72.orig/src/if_perl.xs 2008-07-17 21:55:09.000000000 +0100
-+++ vim72/src/if_perl.xs 2008-12-06 11:37:50.000000000 +0000
-@@ -136,6 +136,9 @@
- # define Perl_newXS_flags dll_Perl_newXS_flags
- #endif
- # define Perl_sv_free dll_Perl_sv_free
-+# if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-+# define Perl_sv_free2 dll_Perl_sv_free2
-+# endif
- # define Perl_sv_isa dll_Perl_sv_isa
- # define Perl_sv_magic dll_Perl_sv_magic
- # define Perl_sv_setiv dll_Perl_sv_setiv
-@@ -163,7 +166,7 @@
- # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
- # define boot_DynaLoader dll_boot_DynaLoader
-
--# define Perl_sys_init3 dll_Perl_sys_init3
-+# define Perl_sys_init dll_Perl_sys_init
- # define Perl_sys_term dll_Perl_sys_term
- # define Perl_ISv_ptr dll_Perl_ISv_ptr
- # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
-@@ -268,7 +271,8 @@
- static void (*boot_DynaLoader)_((pTHX_ CV*));
-
- #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
--static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env);
-+static void (*Perl_sv_free2)(pTHX_ SV*);
-+static void (*Perl_sys_init)(int* argc, char*** argv);
- static void (*Perl_sys_term)(void);
- static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
- static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
-@@ -367,7 +371,8 @@
- {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr},
- {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
- #else
-- {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3},
-+ {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
-+ {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init},
- {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
- {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
- {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
-@@ -455,7 +460,7 @@
- static char *argv[] = { "", "-e", "" };
-
- #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-- Perl_sys_init3(&argc, (char***)&argv, NULL);
-+ Perl_sys_init(&argc, (char***)&argv);
- #endif
- perl_interp = perl_alloc();
- perl_construct(perl_interp);
-diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
---- vim72.orig/src/if_python.c 2008-07-17 22:09:32.000000000 +0100
-+++ vim72/src/if_python.c 2008-12-06 11:37:50.000000000 +0000
-@@ -531,6 +531,12 @@
- if (PythonMod_Init())
- goto fail;
-
-+ /* Remove the element from sys.path that was added because of our
-+ * argv[0] value in PythonMod_Init(). Previously we used an empty
-+ * string, but dependinding on the OS we then get an empty entry or
-+ * the current directory in sys.path. */
-+ PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
-+
- /* the first python thread is vim's, release the lock */
- Python_SaveThread();
-
-@@ -2345,7 +2351,8 @@
- {
- PyObject *mod;
- PyObject *dict;
-- static char *(argv[2]) = {"", NULL};
-+ /* The special value is removed from sys.path in Python_Init(). */
-+ static char *(argv[2]) = {"/must>not&exist/foo", NULL};
-
- /* Fixups... */
- BufferType.ob_type = &PyType_Type;
-diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
---- vim72.orig/src/if_xcmdsrv.c 2008-07-18 14:05:03.000000000 +0100
-+++ vim72/src/if_xcmdsrv.c 2008-12-06 11:37:49.000000000 +0000
-@@ -736,7 +736,7 @@
- + serverReply.ga_len;
- e.id = w;
- ga_init2(&e.strings, 1, 100);
-- memcpy(p, &e, sizeof(e));
-+ mch_memmove(p, &e, sizeof(e));
- serverReply.ga_len++;
- }
- }
-@@ -1018,7 +1018,7 @@
- p++;
- count = numItems - (p - regProp);
- if (count > 0)
-- memcpy(entry, p, count);
-+ mch_memmove(entry, p, count);
- XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING,
- 8, PropModeReplace, regProp,
- (int)(numItems - (p - entry)));
-@@ -1072,7 +1072,7 @@
- p++;
- lastHalf = numItems - (p - regProp);
- if (lastHalf > 0)
-- memcpy(entry, p, lastHalf);
-+ mch_memmove(entry, p, lastHalf);
- numItems = (entry - regProp) + lastHalf;
- p = entry;
- continue;
-diff -Naur vim72.orig/src/main.c vim72/src/main.c
---- vim72.orig/src/main.c 2008-07-24 09:40:56.000000000 +0100
-+++ vim72/src/main.c 2008-12-06 11:37:50.000000000 +0000
-@@ -645,11 +645,12 @@
-
- #ifdef FEAT_VIMINFO
- /*
-- * Read in registers, history etc, but not marks, from the viminfo file
-+ * Read in registers, history etc, but not marks, from the viminfo file.
-+ * This is where v:oldfiles gets filled.
- */
- if (*p_viminfo != NUL)
- {
-- read_viminfo(NULL, TRUE, FALSE, FALSE);
-+ read_viminfo(NULL, VIF_WANT_INFO | VIF_GET_OLDFILES);
- TIME_MSG("reading viminfo");
- }
- #endif
-@@ -1457,7 +1458,8 @@
- ++initstr;
- }
-
-- if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
-+ /* "gvim" starts the GUI. Also accept "Gvim" for MS-Windows. */
-+ if (TOLOWER_ASC(initstr[0]) == 'g')
- {
- main_start_gui();
- #ifdef FEAT_GUI
-@@ -1508,7 +1510,8 @@
- early_arg_scan(parmp)
- mparm_T *parmp;
- {
--#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
-+#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
-+ || !defined(FEAT_NETBEANS_INTG)
- int argc = parmp->argc;
- char **argv = parmp->argv;
- int i;
-@@ -1580,6 +1583,14 @@
- else if (STRICMP(argv[i], "--echo-wid") == 0)
- echo_wid_arg = TRUE;
- # endif
-+# ifndef FEAT_NETBEANS_INTG
-+ else if (strncmp(argv[i], "-nb", (size_t)3) == 0)
-+ {
-+ mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n"));
-+ mch_exit(2);
-+ }
-+# endif
-+
- }
- #endif
- }
-@@ -2361,7 +2372,7 @@
- * Is there any other system that cannot do this?
- */
- close(0);
-- dup(2);
-+ ignored = dup(2);
- #endif
- }
-
-@@ -2586,7 +2597,7 @@
- # endif
- (void)do_ecmd(0, arg_idx < GARGCOUNT
- ? alist_name(&GARGLIST[arg_idx]) : NULL,
-- NULL, NULL, ECMD_LASTL, ECMD_HIDE);
-+ NULL, NULL, ECMD_LASTL, ECMD_HIDE, curwin);
- # ifdef HAS_SWAP_EXISTS_ACTION
- if (swap_exists_did_quit)
- {
-diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
---- vim72.orig/src/mark.c 2008-08-08 23:06:49.000000000 +0100
-+++ vim72/src/mark.c 2008-12-06 11:37:49.000000000 +0000
-@@ -1627,15 +1627,17 @@
-
- /*
- * Handle marks in the viminfo file:
-- * fp_out == NULL read marks for current buffer only
-- * fp_out != NULL copy marks for buffers not in buffer list
-+ * fp_out != NULL: copy marks for buffers not in buffer list
-+ * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only
-+ * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles
- */
- void
--copy_viminfo_marks(virp, fp_out, count, eof)
-+copy_viminfo_marks(virp, fp_out, count, eof, flags)
- vir_T *virp;
- FILE *fp_out;
- int count;
- int eof;
-+ int flags;
- {
- char_u *line = virp->vir_line;
- buf_T *buf;
-@@ -1647,10 +1649,23 @@
- char_u *p;
- char_u *name_buf;
- pos_T pos;
-+#ifdef FEAT_EVAL
-+ list_T *list = NULL;
-+#endif
-
- if ((name_buf = alloc(LSIZE)) == NULL)
- return;
- *name_buf = NUL;
-+
-+#ifdef FEAT_EVAL
-+ if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT)))
-+ {
-+ list = list_alloc();
-+ if (list != NULL)
-+ set_vim_var_list(VV_OLDFILES, list);
-+ }
-+#endif
-+
- num_marked_files = get_viminfo_parameter('\'');
- while (!eof && (count < num_marked_files || fp_out == NULL))
- {
-@@ -1681,6 +1696,11 @@
- p++;
- *p = NUL;
-
-+#ifdef FEAT_EVAL
-+ if (list != NULL)
-+ list_append_string(list, str, -1);
-+#endif
-+
- /*
- * If fp_out == NULL, load marks for current buffer.
- * If fp_out != NULL, copy marks for buffers not in buflist.
-@@ -1688,7 +1708,7 @@
- load_marks = copy_marks_out = FALSE;
- if (fp_out == NULL)
- {
-- if (curbuf->b_ffname != NULL)
-+ if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL)
- {
- if (*name_buf == NUL) /* only need to do this once */
- home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE);
-diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
---- vim72.orig/src/mbyte.c 2008-07-14 13:38:05.000000000 +0100
-+++ vim72/src/mbyte.c 2008-12-06 11:37:50.000000000 +0000
-@@ -717,7 +717,7 @@
- * where mblen() returns 0 for invalid character.
- * Therefore, following condition includes 0.
- */
-- (void)mblen(NULL, 0); /* First reset the state. */
-+ ignored = mblen(NULL, 0); /* First reset the state. */
- if (mblen(buf, (size_t)1) <= 0)
- n = 2;
- else
-@@ -2540,7 +2540,6 @@
- return (int)(p - q);
- }
-
--#if defined(FEAT_EVAL) || defined(PROTO)
- /*
- * Copy a character from "*fp" to "*tp" and advance the pointers.
- */
-@@ -2555,7 +2554,6 @@
- *tp += l;
- *fp += l;
- }
--#endif
-
- /*
- * Return the offset from "p" to the first byte of a character. When "p" is
-@@ -3133,7 +3131,7 @@
- else
- s = p + 1;
- }
-- for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
-+ for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
- {
- if (s[i] == '_' || s[i] == '-')
- buf[i] = '-';
-@@ -5280,7 +5278,7 @@
-
- /*ARGSUSED*/
- static void
--preedit_start_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
- #ifdef XIM_DEBUG
- xim_log("xim_decide_input_style()\n");
-@@ -5314,7 +5312,7 @@
-
- /*ARGSUSED*/
- static void
--preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
- XIMPreeditDrawCallbackStruct *draw_data;
- XIMText *text;
-@@ -5386,7 +5384,7 @@
- draw_feedback = (char *)alloc(draw_data->chg_first
- + text->length);
- else
-- draw_feedback = realloc(draw_feedback,
-+ draw_feedback = vim_realloc(draw_feedback,
- draw_data->chg_first + text->length);
- if (draw_feedback != NULL)
- {
-@@ -5455,7 +5453,7 @@
-
- /*ARGSUSED*/
- static void
--preedit_caret_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
- #ifdef XIM_DEBUG
- xim_log("preedit_caret_cbproc()\n");
-@@ -5464,7 +5462,7 @@
-
- /*ARGSUSED*/
- static void
--preedit_done_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
- #ifdef XIM_DEBUG
- xim_log("preedit_done_cbproc()\n");
-@@ -6103,7 +6101,7 @@
-
- /* 1. codepage/UTF-8 -> ucs-2. */
- if (vcp->vc_cpfrom == 0)
-- tmp_len = utf8_to_ucs2(ptr, len, NULL, NULL);
-+ tmp_len = utf8_to_utf16(ptr, len, NULL, NULL);
- else
- tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0,
- ptr, len, 0, 0);
-@@ -6111,13 +6109,13 @@
- if (tmp == NULL)
- break;
- if (vcp->vc_cpfrom == 0)
-- utf8_to_ucs2(ptr, len, tmp, unconvlenp);
-+ utf8_to_utf16(ptr, len, tmp, unconvlenp);
- else
- MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, tmp, tmp_len);
-
- /* 2. ucs-2 -> codepage/UTF-8. */
- if (vcp->vc_cpto == 0)
-- retlen = ucs2_to_utf8(tmp, tmp_len, NULL);
-+ retlen = utf16_to_utf8(tmp, tmp_len, NULL);
- else
- retlen = WideCharToMultiByte(vcp->vc_cpto, 0,
- tmp, tmp_len, 0, 0, 0, 0);
-@@ -6125,7 +6123,7 @@
- if (retval != NULL)
- {
- if (vcp->vc_cpto == 0)
-- ucs2_to_utf8(tmp, tmp_len, retval);
-+ utf16_to_utf8(tmp, tmp_len, retval);
- else
- WideCharToMultiByte(vcp->vc_cpto, 0,
- tmp, tmp_len, retval, retlen, 0, 0);
-diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
---- vim72.orig/src/menu.c 2008-06-21 20:53:43.000000000 +0100
-+++ vim72/src/menu.c 2008-12-06 11:37:48.000000000 +0000
-@@ -1120,6 +1120,7 @@
- parent = menu;
- menu = menu->children;
- }
-+ vim_free(path_name);
-
- /* Now we have found the matching menu, and we list the mappings */
- /* Highlight title */
-diff -Naur vim72.orig/src/message.c vim72/src/message.c
---- vim72.orig/src/message.c 2008-07-09 19:24:55.000000000 +0100
-+++ vim72/src/message.c 2008-12-06 11:37:50.000000000 +0000
-@@ -4585,61 +4585,62 @@
- if (remove_trailing_zeroes)
- {
- int i;
-- char *p;
-+ char *tp;
-
- /* Using %g or %G: remove superfluous zeroes. */
- if (fmt_spec == 'f')
-- p = tmp + str_arg_l - 1;
-+ tp = tmp + str_arg_l - 1;
- else
- {
-- p = (char *)vim_strchr((char_u *)tmp,
-+ tp = (char *)vim_strchr((char_u *)tmp,
- fmt_spec == 'e' ? 'e' : 'E');
-- if (p != NULL)
-+ if (tp != NULL)
- {
- /* Remove superfluous '+' and leading
- * zeroes from the exponent. */
-- if (p[1] == '+')
-+ if (tp[1] == '+')
- {
- /* Change "1.0e+07" to "1.0e07" */
-- STRMOVE(p + 1, p + 2);
-+ STRMOVE(tp + 1, tp + 2);
- --str_arg_l;
- }
-- i = (p[1] == '-') ? 2 : 1;
-- while (p[i] == '0')
-+ i = (tp[1] == '-') ? 2 : 1;
-+ while (tp[i] == '0')
- {
- /* Change "1.0e07" to "1.0e7" */
-- STRMOVE(p + i, p + i + 1);
-+ STRMOVE(tp + i, tp + i + 1);
- --str_arg_l;
- }
-- --p;
-+ --tp;
- }
- }
-
-- if (p != NULL && !precision_specified)
-+ if (tp != NULL && !precision_specified)
- /* Remove trailing zeroes, but keep the one
- * just after a dot. */
-- while (p > tmp + 2 && *p == '0' && p[-1] != '.')
-+ while (tp > tmp + 2 && *tp == '0'
-+ && tp[-1] != '.')
- {
-- STRMOVE(p, p + 1);
-- --p;
-+ STRMOVE(tp, tp + 1);
-+ --tp;
- --str_arg_l;
- }
- }
- else
- {
-- char *p;
-+ char *tp;
-
- /* Be consistent: some printf("%e") use 1.0e+12
- * and some 1.0e+012. Remove one zero in the last
- * case. */
-- p = (char *)vim_strchr((char_u *)tmp,
-+ tp = (char *)vim_strchr((char_u *)tmp,
- fmt_spec == 'e' ? 'e' : 'E');
-- if (p != NULL && (p[1] == '+' || p[1] == '-')
-- && p[2] == '0'
-- && vim_isdigit(p[3])
-- && vim_isdigit(p[4]))
-+ if (tp != NULL && (tp[1] == '+' || tp[1] == '-')
-+ && tp[2] == '0'
-+ && vim_isdigit(tp[3])
-+ && vim_isdigit(tp[4]))
- {
-- STRMOVE(p + 2, p + 3);
-+ STRMOVE(tp + 2, tp + 3);
- --str_arg_l;
- }
- }
-diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
---- vim72.orig/src/misc1.c 2008-07-12 20:20:53.000000000 +0100
-+++ vim72/src/misc1.c 2008-12-06 11:37:50.000000000 +0000
-@@ -3245,9 +3245,9 @@
-
- /* When using ":silent" assume that <CR> was entered. */
- if (mouse_used != NULL)
-- MSG_PUTS(_("Type number or click with mouse (<Enter> cancels): "));
-+ MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): "));
- else
-- MSG_PUTS(_("Choice number (<Enter> cancels): "));
-+ MSG_PUTS(_("Type number and <Enter> (empty cancels): "));
-
- /* Set the state such that text can be selected/copied/pasted and we still
- * get mouse events. */
-@@ -8728,7 +8728,7 @@
- /* The active codepage differs from 'encoding'. Attempt using the
- * wide function. If it fails because it is not implemented fall back
- * to the non-wide version (for Windows 98) */
-- wn = enc_to_ucs2(buf, NULL);
-+ wn = enc_to_utf16(buf, NULL);
- if (wn != NULL)
- {
- hFind = FindFirstFileW(wn, &wfb);
-@@ -8756,7 +8756,7 @@
- #ifdef WIN3264
- # ifdef FEAT_MBYTE
- if (wn != NULL)
-- p = ucs2_to_enc(wfb.cFileName, NULL); /* p is allocated here */
-+ p = utf16_to_enc(wfb.cFileName, NULL); /* p is allocated here */
- else
- # endif
- p = (char_u *)fb.cFileName;
-@@ -8830,7 +8830,7 @@
- if (wn != NULL)
- {
- vim_free(wn);
-- wn = enc_to_ucs2(buf, NULL);
-+ wn = enc_to_utf16(buf, NULL);
- if (wn != NULL)
- hFind = FindFirstFileW(wn, &wfb);
- }
-diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
---- vim72.orig/src/misc2.c 2008-07-23 20:12:56.000000000 +0100
-+++ vim72/src/misc2.c 2008-12-06 11:37:49.000000000 +0000
-@@ -873,7 +873,7 @@
- /* 3. check for available memory: call mch_avail_mem() */
- if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
- {
-- vim_free((char *)p); /* System is low... no go! */
-+ free((char *)p); /* System is low... no go! */
- p = NULL;
- }
- else
-@@ -1257,7 +1257,6 @@
- return escaped_string;
- }
-
--#if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO)
- /*
- * Return TRUE when 'shell' has "csh" in the tail.
- */
-@@ -1266,9 +1265,7 @@
- {
- return (strstr((char *)gettail(p_sh), "csh") != NULL);
- }
--#endif
-
--#if defined(FEAT_EVAL) || defined(PROTO)
- /*
- * Escape "string" for use as a shell argument with system().
- * This uses single quotes, except when we know we need to use double qoutes
-@@ -1391,7 +1388,6 @@
-
- return escaped_string;
- }
--#endif
-
- /*
- * Like vim_strsave(), but make all characters uppercase.
-diff -Naur vim72.orig/src/move.c vim72/src/move.c
---- vim72.orig/src/move.c 2008-07-12 17:26:47.000000000 +0100
-+++ vim72/src/move.c 2008-12-06 11:37:49.000000000 +0000
-@@ -280,18 +280,20 @@
-
- if (curwin->w_botline <= curbuf->b_ml.ml_line_count)
- {
-- if (curwin->w_cursor.lnum < curwin->w_botline
-- && ((long)curwin->w_cursor.lnum
-+ if (curwin->w_cursor.lnum < curwin->w_botline)
-+ {
-+ if (((long)curwin->w_cursor.lnum
- >= (long)curwin->w_botline - p_so
- #ifdef FEAT_FOLDING
- || hasAnyFolding(curwin)
- #endif
- ))
-- {
-+ {
- lineoff_T loff;
-
-- /* Cursor is above botline, check if there are 'scrolloff'
-- * window lines below the cursor. If not, need to scroll. */
-+ /* Cursor is (a few lines) above botline, check if there are
-+ * 'scrolloff' window lines below the cursor. If not, need to
-+ * scroll. */
- n = curwin->w_empty_rows;
- loff.lnum = curwin->w_cursor.lnum;
- #ifdef FEAT_FOLDING
-@@ -317,6 +319,10 @@
- if (n >= p_so)
- /* sufficient context, no need to scroll */
- check_botline = FALSE;
-+ }
-+ else
-+ /* sufficient context, no need to scroll */
-+ check_botline = FALSE;
- }
- if (check_botline)
- {
-@@ -509,6 +515,9 @@
- /* Approximate the value of w_botline */
- wp->w_botline += lnum - wp->w_topline;
- wp->w_topline = lnum;
-+#ifdef FEAT_AUTOCMD
-+ wp->w_topline_was_set = TRUE;
-+#endif
- #ifdef FEAT_DIFF
- wp->w_topfill = 0;
- #endif
-diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
---- vim72.orig/src/netbeans.c 2008-07-13 17:19:54.000000000 +0100
-+++ vim72/src/netbeans.c 2008-12-06 11:37:50.000000000 +0000
-@@ -1043,7 +1043,7 @@
- nbdebug(("EVT: %s", buf));
- /* nb_send(buf, "netbeans_end"); avoid "write failed" messages */
- if (sd >= 0)
-- sock_write(sd, buf, (int)STRLEN(buf)); /* ignore errors */
-+ ignored = sock_write(sd, buf, (int)STRLEN(buf));
- }
- }
-
-@@ -1795,7 +1795,7 @@
- buf->displayname = NULL;
-
- netbeansReadFile = 0; /* don't try to open disk file */
-- do_ecmd(0, NULL, 0, 0, ECMD_ONE, ECMD_HIDE + ECMD_OLDBUF);
-+ do_ecmd(0, NULL, 0, 0, ECMD_ONE, ECMD_HIDE + ECMD_OLDBUF, curwin);
- netbeansReadFile = 1;
- buf->bufp = curbuf;
- maketitle();
-@@ -1960,7 +1960,7 @@
-
- netbeansReadFile = 0; /* don't try to open disk file */
- do_ecmd(0, (char_u *)buf->displayname, 0, 0, ECMD_ONE,
-- ECMD_HIDE + ECMD_OLDBUF);
-+ ECMD_HIDE + ECMD_OLDBUF, curwin);
- netbeansReadFile = 1;
- buf->bufp = curbuf;
- maketitle();
-@@ -1979,7 +1979,7 @@
- vim_free(buf->displayname);
- buf->displayname = nb_unquote(args, NULL);
- do_ecmd(0, (char_u *)buf->displayname, NULL, NULL, ECMD_ONE,
-- ECMD_HIDE + ECMD_OLDBUF);
-+ ECMD_HIDE + ECMD_OLDBUF, curwin);
- buf->bufp = curbuf;
- buf->initDone = TRUE;
- doupdate = 1;
-@@ -2277,9 +2277,6 @@
- int serNum;
- int localTypeNum;
- int typeNum;
--# ifdef NBDEBUG
-- int len;
--# endif
- pos_T *pos;
-
- if (buf == NULL || buf->bufp == NULL)
-@@ -2303,13 +2300,10 @@
- pos = get_off_or_lnum(buf->bufp, &args);
-
- cp = (char *)args;
--# ifdef NBDEBUG
-- len =
--# endif
-- strtol(cp, &cp, 10);
-+ ignored = (int)strtol(cp, &cp, 10);
- args = (char_u *)cp;
- # ifdef NBDEBUG
-- if (len != -1)
-+ if (ignored != -1)
- {
- nbdebug((" partial line annotation -- Not Yet Implemented!\n"));
- }
-diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
---- vim72.orig/src/normal.c 2008-07-31 21:03:08.000000000 +0100
-+++ vim72/src/normal.c 2008-12-06 11:37:50.000000000 +0000
-@@ -183,6 +183,8 @@
- static void nv_cursorhold __ARGS((cmdarg_T *cap));
- #endif
-
-+static char *e_noident = N_("E349: No identifier under cursor");
-+
- /*
- * Function to be called for a Normal or Visual mode command.
- * The argument is a cmdarg_T.
-@@ -578,6 +580,9 @@
- static int old_mapped_len = 0;
- #endif
- int idx;
-+#ifdef FEAT_EVAL
-+ int set_prevcount = FALSE;
-+#endif
-
- vim_memset(&ca, 0, sizeof(ca)); /* also resets ca.retval */
- ca.oap = oap;
-@@ -613,7 +618,12 @@
- /* When not finishing an operator and no register name typed, reset the
- * count. */
- if (!finish_op && !oap->regname)
-+ {
- ca.opcount = 0;
-+#ifdef FEAT_EVAL
-+ set_prevcount = TRUE;
-+#endif
-+ }
-
- #ifdef FEAT_AUTOCMD
- /* Restore counts from before receiving K_CURSORHOLD. This means after
-@@ -717,7 +727,15 @@
- * command, so that v:count can be used in an expression mapping
- * right after the count. */
- if (toplevel && stuff_empty())
-- set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
-+ {
-+ long count = ca.count0;
-+
-+ /* multiply with ca.opcount the same way as below */
-+ if (ca.opcount != 0)
-+ count = ca.opcount * (count == 0 ? 1 : count);
-+ set_vcount(count, count == 0 ? 1 : count, set_prevcount);
-+ set_prevcount = FALSE; /* only set v:prevcount once */
-+ }
- #endif
- if (ctrl_w)
- {
-@@ -804,7 +822,7 @@
- * Only set v:count when called from main() and not a stuffed command.
- */
- if (toplevel && stuff_empty())
-- set_vcount(ca.count0, ca.count1);
-+ set_vcount(ca.count0, ca.count1, set_prevcount);
- #endif
-
- /*
-@@ -1132,7 +1150,8 @@
- out_flush();
- #endif
- #ifdef FEAT_AUTOCMD
-- did_cursorhold = FALSE;
-+ if (ca.cmdchar != K_IGNORE)
-+ did_cursorhold = FALSE;
- #endif
-
- State = NORMAL;
-@@ -3509,7 +3528,7 @@
- if (find_type & FIND_STRING)
- EMSG(_("E348: No string under cursor"));
- else
-- EMSG(_("E349: No identifier under cursor"));
-+ EMSG(_(e_noident));
- return 0;
- }
- ptr += col;
-@@ -5469,6 +5488,20 @@
- STRCPY(buf, "he! ");
- else
- {
-+ /* An external command will probably use an argument starting
-+ * with "-" as an option. To avoid trouble we skip the "-". */
-+ while (*ptr == '-' && n > 0)
-+ {
-+ ++ptr;
-+ --n;
-+ }
-+ if (n == 0)
-+ {
-+ EMSG(_(e_noident)); /* found dashes only */
-+ vim_free(buf);
-+ return;
-+ }
-+
- /* When a count is given, turn it into a range. Is this
- * really what we want? */
- isman = (STRCMP(kp, "man") == 0);
-@@ -5511,37 +5544,59 @@
- /*
- * Now grab the chars in the identifier
- */
-- if (cmdchar == '*')
-- aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
-- else if (cmdchar == '#')
-- aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
-- else if (cmdchar == 'K' && !kp_help)
-- aux_ptr = (char_u *)" \t\\\"|!";
-- else
-- /* Don't escape spaces and Tabs in a tag with a backslash */
-- aux_ptr = (char_u *)"\\|\"";
--
-- p = buf + STRLEN(buf);
-- while (n-- > 0)
-- {
-- /* put a backslash before \ and some others */
-- if (vim_strchr(aux_ptr, *ptr) != NULL)
-- *p++ = '\\';
--#ifdef FEAT_MBYTE
-- /* When current byte is a part of multibyte character, copy all bytes
-- * of that character. */
-- if (has_mbyte)
-+ if (cmdchar == 'K' && !kp_help)
-+ {
-+ /* Escape the argument properly for a shell command */
-+ ptr = vim_strnsave(ptr, n);
-+ p = vim_strsave_shellescape(ptr, TRUE);
-+ vim_free(ptr);
-+ if (p == NULL)
- {
-- int i;
-- int len = (*mb_ptr2len)(ptr) - 1;
--
-- for (i = 0; i < len && n >= 1; ++i, --n)
-- *p++ = *ptr++;
-+ vim_free(buf);
-+ return;
- }
-+ buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
-+ if (buf == NULL)
-+ {
-+ vim_free(buf);
-+ vim_free(p);
-+ return;
-+ }
-+ STRCAT(buf, p);
-+ vim_free(p);
-+ }
-+ else
-+ {
-+ if (cmdchar == '*')
-+ aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
-+ else if (cmdchar == '#')
-+ aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
-+ else
-+ /* Don't escape spaces and Tabs in a tag with a backslash */
-+ aux_ptr = (char_u *)"\\|\"\n*?[";
-+
-+ p = buf + STRLEN(buf);
-+ while (n-- > 0)
-+ {
-+ /* put a backslash before \ and some others */
-+ if (vim_strchr(aux_ptr, *ptr) != NULL)
-+ *p++ = '\\';
-+#ifdef FEAT_MBYTE
-+ /* When current byte is a part of multibyte character, copy all
-+ * bytes of that character. */
-+ if (has_mbyte)
-+ {
-+ int i;
-+ int len = (*mb_ptr2len)(ptr) - 1;
-+
-+ for (i = 0; i < len && n >= 1; ++i, --n)
-+ *p++ = *ptr++;
-+ }
- #endif
-- *p++ = *ptr++;
-+ *p++ = *ptr++;
-+ }
-+ *p = NUL;
- }
-- *p = NUL;
-
- /*
- * Execute the command.
-@@ -6011,7 +6066,7 @@
- autowrite(curbuf, FALSE);
- setpcmark();
- (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST,
-- P_HID(curbuf) ? ECMD_HIDE : 0);
-+ P_HID(curbuf) ? ECMD_HIDE : 0, curwin);
- if (cap->nchar == 'F' && lnum >= 0)
- {
- curwin->w_cursor.lnum = lnum;
-diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
---- vim72.orig/src/ops.c 2008-06-21 21:08:59.000000000 +0100
-+++ vim72/src/ops.c 2008-12-06 11:37:50.000000000 +0000
-@@ -2209,12 +2209,15 @@
- {
- for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
- {
-+ int one_change;
-+
- block_prep(oap, &bd, pos.lnum, FALSE);
- pos.col = bd.textcol;
-- did_change = swapchars(oap->op_type, &pos, bd.textlen);
-+ one_change = swapchars(oap->op_type, &pos, bd.textlen);
-+ did_change |= one_change;
-
- # ifdef FEAT_NETBEANS_INTG
-- if (usingNetbeans && did_change)
-+ if (usingNetbeans && one_change)
- {
- char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
-
-diff -Naur vim72.orig/src/option.c vim72/src/option.c
---- vim72.orig/src/option.c 2008-07-18 14:05:33.000000000 +0100
-+++ vim72/src/option.c 2008-12-06 11:37:50.000000000 +0000
-@@ -2593,13 +2593,13 @@
- #ifdef FEAT_VIMINFO
- (char_u *)&p_viminfo, PV_NONE,
- #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
-- {(char_u *)"", (char_u *)"'20,<50,s10,h,rA:,rB:"}
-+ {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
- #else
- # ifdef AMIGA
- {(char_u *)"",
-- (char_u *)"'20,<50,s10,h,rdf0:,rdf1:,rdf2:"}
-+ (char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"}
- # else
-- {(char_u *)"", (char_u *)"'20,<50,s10,h"}
-+ {(char_u *)"", (char_u *)"'100,<50,s10,h"}
- # endif
- #endif
- #else
-@@ -7974,6 +7974,11 @@
- else /* curwin->w_p_scr > curwin->w_height */
- curwin->w_p_scr = curwin->w_height;
- }
-+ if (p_hi < 0)
-+ {
-+ errmsg = e_positive;
-+ p_hi = 0;
-+ }
- if (p_report < 0)
- {
- errmsg = e_positive;
-@@ -8227,13 +8232,13 @@
- {
- if (number == 0 && string != NULL)
- {
-- int index;
-+ int idx;
-
- /* Either we are given a string or we are setting option
- * to zero. */
-- for (index = 0; string[index] == '0'; ++index)
-+ for (idx = 0; string[idx] == '0'; ++idx)
- ;
-- if (string[index] != NUL || index == 0)
-+ if (string[idx] != NUL || idx == 0)
- {
- /* There's another character after zeros or the string
- * is empty. In both cases, we are trying to set a
-diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
---- vim72.orig/src/os_unix.c 2008-08-06 12:01:40.000000000 +0100
-+++ vim72/src/os_unix.c 2008-12-06 11:37:50.000000000 +0000
-@@ -315,12 +315,15 @@
- {-1, "Unknown!", FALSE}
- };
-
-+/*
-+ * Write s[len] to the screen.
-+ */
- void
- mch_write(s, len)
- char_u *s;
- int len;
- {
-- write(1, (char *)s, len);
-+ ignored = (int)write(1, (char *)s, len);
- if (p_wd) /* Unix is too fast, slow down a bit more */
- RealWaitForChar(read_cmd_fd, p_wd, NULL);
- }
-@@ -2905,7 +2908,7 @@
- * Ignore any errors.
- */
- #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
-- signal_stack = malloc(SIGSTKSZ);
-+ signal_stack = (char *)alloc(SIGSTKSZ);
- init_signal_stack();
- #endif
- }
-@@ -2936,7 +2939,8 @@
- }
- # endif
- # endif
--# ifdef FEAT_X11
-+ /* Don't close the display for GTK 1, it is done in exit(). */
-+# if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2))
- if (x11_display != NULL
- # ifdef FEAT_XCLIPBOARD
- && x11_display != xterm_dpy
-@@ -3926,9 +3930,9 @@
- */
- if (fd >= 0)
- {
-- dup(fd); /* To replace stdin (file descriptor 0) */
-- dup(fd); /* To replace stdout (file descriptor 1) */
-- dup(fd); /* To replace stderr (file descriptor 2) */
-+ ignored = dup(fd); /* To replace stdin (fd 0) */
-+ ignored = dup(fd); /* To replace stdout (fd 1) */
-+ ignored = dup(fd); /* To replace stderr (fd 2) */
-
- /* Don't need this now that we've duplicated it */
- close(fd);
-@@ -3996,13 +4000,13 @@
-
- /* set up stdin/stdout/stderr for the child */
- close(0);
-- dup(pty_slave_fd);
-+ ignored = dup(pty_slave_fd);
- close(1);
-- dup(pty_slave_fd);
-+ ignored = dup(pty_slave_fd);
- if (gui.in_use)
- {
- close(2);
-- dup(pty_slave_fd);
-+ ignored = dup(pty_slave_fd);
- }
-
- close(pty_slave_fd); /* has been dupped, close it now */
-@@ -4013,13 +4017,13 @@
- /* set up stdin for the child */
- close(fd_toshell[1]);
- close(0);
-- dup(fd_toshell[0]);
-+ ignored = dup(fd_toshell[0]);
- close(fd_toshell[0]);
-
- /* set up stdout for the child */
- close(fd_fromshell[0]);
- close(1);
-- dup(fd_fromshell[1]);
-+ ignored = dup(fd_fromshell[1]);
- close(fd_fromshell[1]);
-
- # ifdef FEAT_GUI
-@@ -4027,7 +4031,7 @@
- {
- /* set up stderr for the child */
- close(2);
-- dup(1);
-+ ignored = dup(1);
- }
- # endif
- }
-@@ -4158,7 +4162,8 @@
- && (lnum !=
- curbuf->b_ml.ml_line_count
- || curbuf->b_p_eol)))
-- write(toshell_fd, "\n", (size_t)1);
-+ ignored = write(toshell_fd, "\n",
-+ (size_t)1);
- ++lnum;
- if (lnum > curbuf->b_op_end.lnum)
- {
-@@ -6814,7 +6819,8 @@
- if (xsmp_icefd != -1)
- {
- SmcCloseConnection(xsmp.smcconn, 0, NULL);
-- vim_free(xsmp.clientid);
-+ if (xsmp.clientid != NULL)
-+ free(xsmp.clientid);
- xsmp.clientid = NULL;
- xsmp_icefd = -1;
- }
-diff -Naur vim72.orig/src/popupmnu.c vim72/src/popupmnu.c
---- vim72.orig/src/popupmnu.c 2008-07-12 17:28:18.000000000 +0100
-+++ vim72/src/popupmnu.c 2008-12-06 11:37:49.000000000 +0000
-@@ -573,7 +573,7 @@
- {
- /* Don't want to sync undo in the current buffer. */
- ++no_u_sync;
-- res = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, 0);
-+ res = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, 0, NULL);
- --no_u_sync;
- if (res == OK)
- {
-diff -Naur vim72.orig/src/proto/buffer.pro vim72/src/proto/buffer.pro
---- vim72.orig/src/proto/buffer.pro 2008-08-09 15:31:21.000000000 +0100
-+++ vim72/src/proto/buffer.pro 2008-12-06 11:37:49.000000000 +0000
-@@ -33,7 +33,7 @@
- char_u *getaltfname __ARGS((int errmsg));
- int buflist_add __ARGS((char_u *fname, int flags));
- void buflist_slash_adjust __ARGS((void));
--void buflist_altfpos __ARGS((void));
-+void buflist_altfpos __ARGS((win_T *win));
- int otherfile __ARGS((char_u *ffname));
- void buf_setino __ARGS((buf_T *buf));
- void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
-diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
---- vim72.orig/src/proto/eval.pro 2008-08-09 15:31:25.000000000 +0100
-+++ vim72/src/proto/eval.pro 2008-12-06 11:37:50.000000000 +0000
-@@ -17,7 +17,7 @@
- int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
- char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip));
- int skip_expr __ARGS((char_u **pp));
--char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int dolist));
-+char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int convert));
- char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd, int use_sandbox));
- int eval_to_number __ARGS((char_u *expr));
- list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
-@@ -46,7 +46,9 @@
- void list_unref __ARGS((list_T *l));
- void list_free __ARGS((list_T *l, int recurse));
- dictitem_T *dict_lookup __ARGS((hashitem_T *hi));
-+char_u *list_find_str __ARGS((list_T *l, long idx));
- int list_append_dict __ARGS((list_T *list, dict_T *dict));
-+int list_append_string __ARGS((list_T *l, char_u *str, int len));
- int garbage_collect __ARGS((void));
- dict_T *dict_alloc __ARGS((void));
- int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
-@@ -58,8 +60,10 @@
- void set_vim_var_nr __ARGS((int idx, long val));
- long get_vim_var_nr __ARGS((int idx));
- char_u *get_vim_var_str __ARGS((int idx));
--void set_vcount __ARGS((long count, long count1));
-+list_T *get_vim_var_list __ARGS((int idx));
-+void set_vcount __ARGS((long count, long count1, int set_prevcount));
- void set_vim_var_string __ARGS((int idx, char_u *val, int len));
-+void set_vim_var_list __ARGS((int idx, list_T *val));
- void set_reg_var __ARGS((int c));
- char_u *v_exception __ARGS((char_u *oldval));
- char_u *v_throwpoint __ARGS((char_u *oldval));
-@@ -94,6 +98,7 @@
- void write_viminfo_varlist __ARGS((FILE *fp));
- int store_session_globals __ARGS((FILE *fd));
- void last_set_msg __ARGS((scid_T scriptID));
-+void ex_oldfiles __ARGS((exarg_T *eap));
- int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen));
- char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags));
- /* vim: set ft=c : */
-diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
---- vim72.orig/src/proto/ex_cmds.pro 2008-08-09 15:31:25.000000000 +0100
-+++ vim72/src/proto/ex_cmds.pro 2008-12-06 11:37:49.000000000 +0000
-@@ -11,7 +11,7 @@
- char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
- void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
- int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
--int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
-+int read_viminfo __ARGS((char_u *file, int flags));
- void write_viminfo __ARGS((char_u *file, int forceit));
- int viminfo_readline __ARGS((vir_T *virp));
- char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
-@@ -27,7 +27,7 @@
- void do_wqall __ARGS((exarg_T *eap));
- int not_writing __ARGS((void));
- int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit));
--int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags));
-+int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags, win_T *oldwin));
- void ex_append __ARGS((exarg_T *eap));
- void ex_change __ARGS((exarg_T *eap));
- void ex_z __ARGS((exarg_T *eap));
-diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
---- vim72.orig/src/proto/ex_getln.pro 2008-08-09 15:31:28.000000000 +0100
-+++ vim72/src/proto/ex_getln.pro 2008-12-06 11:37:50.000000000 +0000
-@@ -31,7 +31,7 @@
- void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
- int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
- int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int))));
--char_u *globpath __ARGS((char_u *path, char_u *file));
-+char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options));
- void init_history __ARGS((void));
- int get_histtype __ARGS((char_u *name));
- void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));
-diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
---- vim72.orig/src/proto/mark.pro 2008-08-09 15:31:36.000000000 +0100
-+++ vim72/src/proto/mark.pro 2008-12-06 11:37:49.000000000 +0000
-@@ -26,5 +26,5 @@
- void write_viminfo_filemarks __ARGS((FILE *fp));
- int removable __ARGS((char_u *name));
- int write_viminfo_marks __ARGS((FILE *fp_out));
--void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof));
-+void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags));
- /* vim: set ft=c : */
-diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
---- vim72.orig/src/pty.c 2008-06-21 19:52:58.000000000 +0100
-+++ vim72/src/pty.c 2008-12-06 11:37:48.000000000 +0000
-@@ -270,9 +270,10 @@
- }
- #endif
-
--#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux)
-+#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X)
-
--/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! */
-+/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work!
-+ * Same for Mac OS X Leopard. */
- #define PTY_DONE
- int
- OpenPTY(ttyn)
-diff -Naur vim72.orig/src/quickfix.c vim72/src/quickfix.c
---- vim72.orig/src/quickfix.c 2008-07-18 13:53:02.000000000 +0100
-+++ vim72/src/quickfix.c 2008-12-06 11:37:49.000000000 +0000
-@@ -1420,6 +1420,7 @@
- win_T *win;
- win_T *altwin;
- #endif
-+ win_T *oldwin = curwin;
- int print_message = TRUE;
- int len;
- #ifdef FEAT_FOLDING
-@@ -1744,7 +1745,8 @@
- }
- else
- ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
-- ECMD_HIDE + ECMD_SET_HELP);
-+ ECMD_HIDE + ECMD_SET_HELP,
-+ oldwin == curwin ? curwin : NULL);
- }
- else
- ok = buflist_getfile(qf_ptr->qf_fnum,
-@@ -2267,6 +2269,7 @@
- win_T *win;
- tabpage_T *prevtab = curtab;
- buf_T *qf_buf;
-+ win_T *oldwin = curwin;
-
- if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow)
- {
-@@ -2326,14 +2329,16 @@
- win->w_llist->qf_refcount++;
- }
-
-+ if (oldwin != curwin)
-+ oldwin = NULL; /* don't store info when in another window */
- if (qf_buf != NULL)
- /* Use the existing quickfix buffer */
- (void)do_ecmd(qf_buf->b_fnum, NULL, NULL, NULL, ECMD_ONE,
-- ECMD_HIDE + ECMD_OLDBUF);
-+ ECMD_HIDE + ECMD_OLDBUF, oldwin);
- else
- {
- /* Create a new quickfix buffer */
-- (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
-+ (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, oldwin);
- /* switch off 'swapfile' */
- set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
- set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
-diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
---- vim72.orig/src/screen.c 2008-07-24 15:45:07.000000000 +0100
-+++ vim72/src/screen.c 2008-12-06 11:37:48.000000000 +0000
-@@ -2439,9 +2439,17 @@
-
- #ifdef FEAT_SYN_HL
- /* Show 'cursorcolumn' in the fold line. */
-- if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
-- ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
-- ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
-+ if (wp->w_p_cuc)
-+ {
-+ txtcol += wp->w_virtcol;
-+ if (wp->w_p_wrap)
-+ txtcol -= wp->w_skipcol;
-+ else
-+ txtcol -= wp->w_leftcol;
-+ if (txtcol >= 0 && txtcol < W_WIDTH(wp))
-+ ScreenAttrs[off + txtcol] = hl_combine_attr(
-+ ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
-+ }
- #endif
-
- SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
-diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
---- vim72.orig/src/spell.c 2008-07-12 20:20:55.000000000 +0100
-+++ vim72/src/spell.c 2008-12-06 11:37:50.000000000 +0000
-@@ -77,7 +77,7 @@
-
- /*
- * Do the opposite: based on a maximum end score and a known sound score,
-- * compute the the maximum word score that can be used.
-+ * compute the maximum word score that can be used.
- */
- #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
-
-@@ -469,6 +469,7 @@
- garray_T sl_comppat; /* CHECKCOMPOUNDPATTERN items */
- regprog_T *sl_compprog; /* COMPOUNDRULE turned into a regexp progrm
- * (NULL when no compounding) */
-+ char_u *sl_comprules; /* all COMPOUNDRULE concatenated (or NULL) */
- char_u *sl_compstartflags; /* flags for first compound word */
- char_u *sl_compallflags; /* all flags for compound words */
- char_u sl_nobreak; /* When TRUE: no spaces between words */
-@@ -625,7 +626,7 @@
- /* TRUE if a word appears in the list of banned words. */
- #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word)))
-
--/* Number of suggestions kept when cleaning up. we need to keep more than
-+/* Number of suggestions kept when cleaning up. We need to keep more than
- * what is displayed, because when rescore_suggestions() is called the score
- * may change and wrong suggestions may be removed later. */
- #define SUG_CLEAN_COUNT(su) ((su)->su_maxcount < 130 ? 150 : (su)->su_maxcount + 20)
-@@ -839,7 +840,10 @@
- static void slang_clear __ARGS((slang_T *lp));
- static void slang_clear_sug __ARGS((slang_T *lp));
- static void find_word __ARGS((matchinf_T *mip, int mode));
-+static int match_checkcompoundpattern __ARGS((char_u *ptr, int wlen, garray_T *gap));
- static int can_compound __ARGS((slang_T *slang, char_u *word, char_u *flags));
-+static int can_be_compound __ARGS((trystate_T *sp, slang_T *slang, char_u *compflags, int flag));
-+static int match_compoundrule __ARGS((slang_T *slang, char_u *compflags));
- static int valid_word_prefix __ARGS((int totprefcnt, int arridx, int flags, char_u *word, slang_T *slang, int cond_req));
- static void find_prefix __ARGS((matchinf_T *mip, int mode));
- static int fold_more __ARGS((matchinf_T *mip));
-@@ -1519,6 +1523,11 @@
- ((unsigned)flags >> 24)))
- continue;
-
-+ /* If there is a match with a CHECKCOMPOUNDPATTERN rule
-+ * discard the compound word. */
-+ if (match_checkcompoundpattern(ptr, wlen, &slang->sl_comppat))
-+ continue;
-+
- if (mode == FIND_COMPOUND)
- {
- int capflags;
-@@ -1577,6 +1586,11 @@
- if (!can_compound(slang, fword, mip->mi_compflags))
- continue;
- }
-+ else if (slang->sl_comprules != NULL
-+ && !match_compoundrule(slang, mip->mi_compflags))
-+ /* The compound flags collected so far do not match any
-+ * COMPOUNDRULE, discard the compounded word. */
-+ continue;
- }
-
- /* Check NEEDCOMPOUND: can't use word without compounding. */
-@@ -1727,6 +1741,39 @@
- }
-
- /*
-+ * Return TRUE if there is a match between the word ptr[wlen] and
-+ * CHECKCOMPOUNDPATTERN rules, assuming that we will concatenate with another
-+ * word.
-+ * A match means that the first part of CHECKCOMPOUNDPATTERN matches at the
-+ * end of ptr[wlen] and the second part matches after it.
-+ */
-+ static int
-+match_checkcompoundpattern(ptr, wlen, gap)
-+ char_u *ptr;
-+ int wlen;
-+ garray_T *gap; /* &sl_comppat */
-+{
-+ int i;
-+ char_u *p;
-+ int len;
-+
-+ for (i = 0; i + 1 < gap->ga_len; i += 2)
-+ {
-+ p = ((char_u **)gap->ga_data)[i + 1];
-+ if (STRNCMP(ptr + wlen, p, STRLEN(p)) == 0)
-+ {
-+ /* Second part matches at start of following compound word, now
-+ * check if first part matches at end of previous word. */
-+ p = ((char_u **)gap->ga_data)[i];
-+ len = STRLEN(p);
-+ if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
-+ return TRUE;
-+ }
-+ }
-+ return FALSE;
-+}
-+
-+/*
- * Return TRUE if "flags" is a valid sequence of compound flags and "word"
- * does not have too many syllables.
- */
-@@ -1773,6 +1820,98 @@
- }
-
- /*
-+ * Return TRUE when the sequence of flags in "compflags" plus "flag" can
-+ * possibly form a valid compounded word. This also checks the COMPOUNDRULE
-+ * lines if they don't contain wildcards.
-+ */
-+ static int
-+can_be_compound(sp, slang, compflags, flag)
-+ trystate_T *sp;
-+ slang_T *slang;
-+ char_u *compflags;
-+ int flag;
-+{
-+ /* If the flag doesn't appear in sl_compstartflags or sl_compallflags
-+ * then it can't possibly compound. */
-+ if (!byte_in_str(sp->ts_complen == sp->ts_compsplit
-+ ? slang->sl_compstartflags : slang->sl_compallflags, flag))
-+ return FALSE;
-+
-+ /* If there are no wildcards, we can check if the flags collected so far
-+ * possibly can form a match with COMPOUNDRULE patterns. This only
-+ * makes sense when we have two or more words. */
-+ if (slang->sl_comprules != NULL && sp->ts_complen > sp->ts_compsplit)
-+ {
-+ int v;
-+
-+ compflags[sp->ts_complen] = flag;
-+ compflags[sp->ts_complen + 1] = NUL;
-+ v = match_compoundrule(slang, compflags + sp->ts_compsplit);
-+ compflags[sp->ts_complen] = NUL;
-+ return v;
-+ }
-+
-+ return TRUE;
-+}
-+
-+
-+/*
-+ * Return TRUE if the compound flags in compflags[] match the start of any
-+ * compound rule. This is used to stop trying a compound if the flags
-+ * collected so far can't possibly match any compound rule.
-+ * Caller must check that slang->sl_comprules is not NULL.
-+ */
-+ static int
-+match_compoundrule(slang, compflags)
-+ slang_T *slang;
-+ char_u *compflags;
-+{
-+ char_u *p;
-+ int i;
-+ int c;
-+
-+ /* loop over all the COMPOUNDRULE entries */
-+ for (p = slang->sl_comprules; *p != NUL; ++p)
-+ {
-+ /* loop over the flags in the compound word we have made, match
-+ * them against the current rule entry */
-+ for (i = 0; ; ++i)
-+ {
-+ c = compflags[i];
-+ if (c == NUL)
-+ /* found a rule that matches for the flags we have so far */
-+ return TRUE;
-+ if (*p == '/' || *p == NUL)
-+ break; /* end of rule, it's too short */
-+ if (*p == '[')
-+ {
-+ int match = FALSE;
-+
-+ /* compare against all the flags in [] */
-+ ++p;
-+ while (*p != ']' && *p != NUL)
-+ if (*p++ == c)
-+ match = TRUE;
-+ if (!match)
-+ break; /* none matches */
-+ }
-+ else if (*p != c)
-+ break; /* flag of word doesn't match flag in pattern */
-+ ++p;
-+ }
-+
-+ /* Skip to the next "/", where the next pattern starts. */
-+ p = vim_strchr(p, '/');
-+ if (p == NULL)
-+ break;
-+ }
-+
-+ /* Checked all the rules and none of them match the flags, so there
-+ * can't possibly be a compound starting with these flags. */
-+ return FALSE;
-+}
-+
-+/*
- * Return non-zero if the prefix indicated by "arridx" matches with the prefix
- * ID in "flags" for the word "word".
- * The WF_RAREPFX flag is included in the return value for a rare prefix.
-@@ -2513,9 +2652,11 @@
- lp->sl_midword = NULL;
-
- vim_free(lp->sl_compprog);
-+ vim_free(lp->sl_comprules);
- vim_free(lp->sl_compstartflags);
- vim_free(lp->sl_compallflags);
- lp->sl_compprog = NULL;
-+ lp->sl_comprules = NULL;
- lp->sl_compstartflags = NULL;
- lp->sl_compallflags = NULL;
-
-@@ -3460,6 +3601,7 @@
- char_u *pp;
- char_u *cp;
- char_u *ap;
-+ char_u *crp;
- int cnt;
- garray_T *gap;
-
-@@ -3545,6 +3687,12 @@
- slang->sl_compallflags = ap;
- *ap = NUL;
-
-+ /* And a list of all patterns in their original form, for checking whether
-+ * compounding may work in match_compoundrule(). This is freed when we
-+ * encounter a wildcard, the check doesn't work then. */
-+ crp = alloc(todo + 1);
-+ slang->sl_comprules = crp;
-+
- pp = pat;
- *pp++ = '^';
- *pp++ = '\\';
-@@ -3587,6 +3735,20 @@
- atstart = 0;
- }
- }
-+
-+ /* Copy flag to "sl_comprules", unless we run into a wildcard. */
-+ if (crp != NULL)
-+ {
-+ if (c == '+' || c == '*')
-+ {
-+ vim_free(slang->sl_comprules);
-+ slang->sl_comprules = NULL;
-+ crp = NULL;
-+ }
-+ else
-+ *crp++ = c;
-+ }
-+
- if (c == '/') /* slash separates two items */
- {
- *pp++ = '\\';
-@@ -3611,6 +3773,9 @@
- *pp++ = '$';
- *pp = NUL;
-
-+ if (crp != NULL)
-+ *crp = NUL;
-+
- slang->sl_compprog = vim_regcomp(pat, RE_MAGIC + RE_STRING + RE_STRICT);
- vim_free(pat);
- if (slang->sl_compprog == NULL)
-@@ -4915,6 +5080,7 @@
- } spellinfo_T;
-
- static afffile_T *spell_read_aff __ARGS((spellinfo_T *spin, char_u *fname));
-+static int is_aff_rule __ARGS((char_u **items, int itemcnt, char *rulename, int mincount));
- static void aff_process_flags __ARGS((afffile_T *affile, affentry_T *entry));
- static int spell_info_item __ARGS((char_u *s));
- static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u *fname, int lnum));
-@@ -4950,7 +5116,7 @@
- static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
- static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
- static void clear_node __ARGS((wordnode_T *node));
--static int put_node __ARGS((FILE *fd, wordnode_T *node, int index, int regionmask, int prefixtree));
-+static int put_node __ARGS((FILE *fd, wordnode_T *node, int idx, int regionmask, int prefixtree));
- static void spell_make_sugfile __ARGS((spellinfo_T *spin, char_u *wfname));
- static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
- static int sug_maketable __ARGS((spellinfo_T *spin));
-@@ -5223,8 +5389,7 @@
- /* Handle non-empty lines. */
- if (itemcnt > 0)
- {
-- if (STRCMP(items[0], "SET") == 0 && itemcnt == 2
-- && aff->af_enc == NULL)
-+ if (is_aff_rule(items, itemcnt, "SET", 2) && aff->af_enc == NULL)
- {
- #ifdef FEAT_MBYTE
- /* Setup for conversion from "ENC" to 'encoding'. */
-@@ -5239,7 +5404,7 @@
- smsg((char_u *)_("Conversion in %s not supported"), fname);
- #endif
- }
-- else if (STRCMP(items[0], "FLAG") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "FLAG", 2)
- && aff->af_flagtype == AFT_CHAR)
- {
- if (STRCMP(items[1], "long") == 0)
-@@ -5284,69 +5449,71 @@
- spin->si_info = p;
- }
- }
-- else if (STRCMP(items[0], "MIDWORD") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "MIDWORD", 2)
- && midword == NULL)
- {
- midword = getroom_save(spin, items[1]);
- }
-- else if (STRCMP(items[0], "TRY") == 0 && itemcnt == 2)
-+ else if (is_aff_rule(items, itemcnt, "TRY", 2))
- {
- /* ignored, we look in the tree for what chars may appear */
- }
- /* TODO: remove "RAR" later */
-- else if ((STRCMP(items[0], "RAR") == 0
-- || STRCMP(items[0], "RARE") == 0) && itemcnt == 2
-- && aff->af_rare == 0)
-+ else if ((is_aff_rule(items, itemcnt, "RAR", 2)
-+ || is_aff_rule(items, itemcnt, "RARE", 2))
-+ && aff->af_rare == 0)
- {
- aff->af_rare = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
- /* TODO: remove "KEP" later */
-- else if ((STRCMP(items[0], "KEP") == 0
-- || STRCMP(items[0], "KEEPCASE") == 0) && itemcnt == 2
-+ else if ((is_aff_rule(items, itemcnt, "KEP", 2)
-+ || is_aff_rule(items, itemcnt, "KEEPCASE", 2))
- && aff->af_keepcase == 0)
- {
- aff->af_keepcase = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
-- else if (STRCMP(items[0], "BAD") == 0 && itemcnt == 2
-- && aff->af_bad == 0)
-+ else if ((is_aff_rule(items, itemcnt, "BAD", 2)
-+ || is_aff_rule(items, itemcnt, "FORBIDDENWORD", 2))
-+ && aff->af_bad == 0)
- {
- aff->af_bad = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
-- else if (STRCMP(items[0], "NEEDAFFIX") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "NEEDAFFIX", 2)
- && aff->af_needaffix == 0)
- {
- aff->af_needaffix = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
-- else if (STRCMP(items[0], "CIRCUMFIX") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "CIRCUMFIX", 2)
- && aff->af_circumfix == 0)
- {
- aff->af_circumfix = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
-- else if (STRCMP(items[0], "NOSUGGEST") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "NOSUGGEST", 2)
- && aff->af_nosuggest == 0)
- {
- aff->af_nosuggest = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
-- else if (STRCMP(items[0], "NEEDCOMPOUND") == 0 && itemcnt == 2
-+ else if ((is_aff_rule(items, itemcnt, "NEEDCOMPOUND", 2)
-+ || is_aff_rule(items, itemcnt, "ONLYINCOMPOUND", 2))
- && aff->af_needcomp == 0)
- {
- aff->af_needcomp = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
-- else if (STRCMP(items[0], "COMPOUNDROOT") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDROOT", 2)
- && aff->af_comproot == 0)
- {
- aff->af_comproot = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- }
-- else if (STRCMP(items[0], "COMPOUNDFORBIDFLAG") == 0
-- && itemcnt == 2 && aff->af_compforbid == 0)
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDFORBIDFLAG", 2)
-+ && aff->af_compforbid == 0)
- {
- aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
-@@ -5354,8 +5521,8 @@
- smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
- fname, lnum);
- }
-- else if (STRCMP(items[0], "COMPOUNDPERMITFLAG") == 0
-- && itemcnt == 2 && aff->af_comppermit == 0)
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDPERMITFLAG", 2)
-+ && aff->af_comppermit == 0)
- {
- aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
-@@ -5363,7 +5530,7 @@
- smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
- fname, lnum);
- }
-- else if (STRCMP(items[0], "COMPOUNDFLAG") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDFLAG", 2)
- && compflags == NULL)
- {
- /* Turn flag "c" into COMPOUNDRULE compatible string "c+",
-@@ -5376,7 +5543,15 @@
- compflags = p;
- }
- }
-- else if (STRCMP(items[0], "COMPOUNDRULE") == 0 && itemcnt == 2)
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDRULES", 2))
-+ {
-+ /* We don't use the count, but do check that it's a number and
-+ * not COMPOUNDRULE mistyped. */
-+ if (atoi((char *)items[1]) == 0)
-+ smsg((char_u *)_("Wrong COMPOUNDRULES value in %s line %d: %s"),
-+ fname, lnum, items[1]);
-+ }
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2))
- {
- /* Concatenate this string to previously defined ones, using a
- * slash to separate them. */
-@@ -5395,7 +5570,7 @@
- compflags = p;
- }
- }
-- else if (STRCMP(items[0], "COMPOUNDWORDMAX") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2)
- && compmax == 0)
- {
- compmax = atoi((char *)items[1]);
-@@ -5403,7 +5578,7 @@
- smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
- fname, lnum, items[1]);
- }
-- else if (STRCMP(items[0], "COMPOUNDMIN") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDMIN", 2)
- && compminlen == 0)
- {
- compminlen = atoi((char *)items[1]);
-@@ -5411,7 +5586,7 @@
- smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
- fname, lnum, items[1]);
- }
-- else if (STRCMP(items[0], "COMPOUNDSYLMAX") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "COMPOUNDSYLMAX", 2)
- && compsylmax == 0)
- {
- compsylmax = atoi((char *)items[1]);
-@@ -5419,32 +5594,29 @@
- smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
- fname, lnum, items[1]);
- }
-- else if (STRCMP(items[0], "CHECKCOMPOUNDDUP") == 0 && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDDUP", 1))
- {
- compoptions |= COMP_CHECKDUP;
- }
-- else if (STRCMP(items[0], "CHECKCOMPOUNDREP") == 0 && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDREP", 1))
- {
- compoptions |= COMP_CHECKREP;
- }
-- else if (STRCMP(items[0], "CHECKCOMPOUNDCASE") == 0 && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDCASE", 1))
- {
- compoptions |= COMP_CHECKCASE;
- }
-- else if (STRCMP(items[0], "CHECKCOMPOUNDTRIPLE") == 0
-- && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDTRIPLE", 1))
- {
- compoptions |= COMP_CHECKTRIPLE;
- }
-- else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
-- && itemcnt == 2)
-+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 2))
- {
- if (atoi((char *)items[1]) == 0)
- smsg((char_u *)_("Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"),
- fname, lnum, items[1]);
- }
-- else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
-- && itemcnt == 3)
-+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 3))
- {
- garray_T *gap = &spin->si_comppat;
- int i;
-@@ -5463,24 +5635,24 @@
- = getroom_save(spin, items[2]);
- }
- }
-- else if (STRCMP(items[0], "SYLLABLE") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "SYLLABLE", 2)
- && syllable == NULL)
- {
- syllable = getroom_save(spin, items[1]);
- }
-- else if (STRCMP(items[0], "NOBREAK") == 0 && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "NOBREAK", 1))
- {
- spin->si_nobreak = TRUE;
- }
-- else if (STRCMP(items[0], "NOSPLITSUGS") == 0 && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "NOSPLITSUGS", 1))
- {
- spin->si_nosplitsugs = TRUE;
- }
-- else if (STRCMP(items[0], "NOSUGFILE") == 0 && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1))
- {
- spin->si_nosugfile = TRUE;
- }
-- else if (STRCMP(items[0], "PFXPOSTPONE") == 0 && itemcnt == 1)
-+ else if (is_aff_rule(items, itemcnt, "PFXPOSTPONE", 1))
- {
- aff->af_pfxpostpone = TRUE;
- }
-@@ -5771,24 +5943,20 @@
- }
- }
- }
-- else if (STRCMP(items[0], "FOL") == 0 && itemcnt == 2
-- && fol == NULL)
-+ else if (is_aff_rule(items, itemcnt, "FOL", 2) && fol == NULL)
- {
- fol = vim_strsave(items[1]);
- }
-- else if (STRCMP(items[0], "LOW") == 0 && itemcnt == 2
-- && low == NULL)
-+ else if (is_aff_rule(items, itemcnt, "LOW", 2) && low == NULL)
- {
- low = vim_strsave(items[1]);
- }
-- else if (STRCMP(items[0], "UPP") == 0 && itemcnt == 2
-- && upp == NULL)
-+ else if (is_aff_rule(items, itemcnt, "UPP", 2) && upp == NULL)
- {
- upp = vim_strsave(items[1]);
- }
-- else if ((STRCMP(items[0], "REP") == 0
-- || STRCMP(items[0], "REPSAL") == 0)
-- && itemcnt == 2)
-+ else if (is_aff_rule(items, itemcnt, "REP", 2)
-+ || is_aff_rule(items, itemcnt, "REPSAL", 2))
- {
- /* Ignore REP/REPSAL count */;
- if (!isdigit(*items[1]))
-@@ -5819,7 +5987,7 @@
- : &spin->si_rep, items[1], items[2]);
- }
- }
-- else if (STRCMP(items[0], "MAP") == 0 && itemcnt == 2)
-+ else if (is_aff_rule(items, itemcnt, "MAP", 2))
- {
- /* MAP item or count */
- if (!found_map)
-@@ -5856,9 +6024,8 @@
- ga_append(&spin->si_map, '/');
- }
- }
-- /* Accept "SAL from to" and "SAL from to # comment". */
-- else if (STRCMP(items[0], "SAL") == 0
-- && (itemcnt == 3 || (itemcnt > 3 && items[3][0] == '#')))
-+ /* Accept "SAL from to" and "SAL from to #comment". */
-+ else if (is_aff_rule(items, itemcnt, "SAL", 3))
- {
- if (do_sal)
- {
-@@ -5877,12 +6044,12 @@
- : items[2]);
- }
- }
-- else if (STRCMP(items[0], "SOFOFROM") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "SOFOFROM", 2)
- && sofofrom == NULL)
- {
- sofofrom = getroom_save(spin, items[1]);
- }
-- else if (STRCMP(items[0], "SOFOTO") == 0 && itemcnt == 2
-+ else if (is_aff_rule(items, itemcnt, "SOFOTO", 2)
- && sofoto == NULL)
- {
- sofoto = getroom_save(spin, items[1]);
-@@ -5980,7 +6147,7 @@
- else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
- MSG(_("Too many compound flags"));
- else
-- MSG(_("Too many posponed prefixes and/or compound flags"));
-+ MSG(_("Too many postponed prefixes and/or compound flags"));
- }
-
- if (syllable != NULL)
-@@ -6017,6 +6184,22 @@
- }
-
- /*
-+ * Return TRUE when items[0] equals "rulename", there are "mincount" items or
-+ * a comment is following after item "mincount".
-+ */
-+ static int
-+is_aff_rule(items, itemcnt, rulename, mincount)
-+ char_u **items;
-+ int itemcnt;
-+ char *rulename;
-+ int mincount;
-+{
-+ return (STRCMP(items[0], rulename) == 0
-+ && (itemcnt == mincount
-+ || (itemcnt > mincount && items[mincount][0] == '#')));
-+}
-+
-+/*
- * For affix "entry" move COMPOUNDFORBIDFLAG and COMPOUNDPERMITFLAG from
- * ae_flags to ae_comppermit and ae_compforbid.
- */
-@@ -7926,6 +8109,8 @@
- char_u *p;
- int rr;
- int retval = OK;
-+ size_t fwv = 1; /* collect return value of fwrite() to avoid
-+ warnings from picky compiler */
-
- fd = mch_fopen((char *)fname, "w");
- if (fd == NULL)
-@@ -7936,11 +8121,11 @@
-
- /* <HEADER>: <fileID> <versionnr> */
- /* <fileID> */
-- if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1)
-- {
-- EMSG(_(e_write));
-- retval = FAIL;
-- }
-+ fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd);
-+ if (fwv != (size_t)1)
-+ /* Catch first write error, don't try writing more. */
-+ goto theend;
-+
- putc(VIMSPELLVERSION, fd); /* <versionnr> */
-
- /*
-@@ -7955,7 +8140,7 @@
-
- i = (int)STRLEN(spin->si_info);
- put_bytes(fd, (long_u)i, 4); /* <sectionlen> */
-- fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
-+ fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
- }
-
- /* SN_REGION: <regionname> ...
-@@ -7966,7 +8151,7 @@
- putc(SNF_REQUIRED, fd); /* <sectionflags> */
- l = spin->si_region_count * 2;
- put_bytes(fd, (long_u)l, 4); /* <sectionlen> */
-- fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
-+ fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
- /* <regionname> ... */
- regionmask = (1 << spin->si_region_count) - 1;
- }
-@@ -8016,7 +8201,7 @@
- }
-
- put_bytes(fd, (long_u)l, 2); /* <folcharslen> */
-- fwrite(folchars, (size_t)l, (size_t)1, fd); /* <folchars> */
-+ fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* <folchars> */
- }
-
- /* SN_MIDWORD: <midword> */
-@@ -8027,7 +8212,8 @@
-
- i = (int)STRLEN(spin->si_midword);
- put_bytes(fd, (long_u)i, 4); /* <sectionlen> */
-- fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* <midword> */
-+ fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd);
-+ /* <midword> */
- }
-
- /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
-@@ -8113,7 +8299,8 @@
- p = rr == 1 ? ftp->ft_from : ftp->ft_to;
- l = (int)STRLEN(p);
- putc(l, fd);
-- fwrite(p, l, (size_t)1, fd);
-+ if (l > 0)
-+ fwv &= fwrite(p, l, (size_t)1, fd);
- }
- }
-
-@@ -8131,11 +8318,11 @@
- /* <sectionlen> */
-
- put_bytes(fd, (long_u)l, 2); /* <sofofromlen> */
-- fwrite(spin->si_sofofr, l, (size_t)1, fd); /* <sofofrom> */
-+ fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* <sofofrom> */
-
- l = (int)STRLEN(spin->si_sofoto);
- put_bytes(fd, (long_u)l, 2); /* <sofotolen> */
-- fwrite(spin->si_sofoto, l, (size_t)1, fd); /* <sofoto> */
-+ fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* <sofoto> */
- }
-
- /* SN_WORDS: <word> ...
-@@ -8160,7 +8347,7 @@
- l = (int)STRLEN(hi->hi_key) + 1;
- len += l;
- if (round == 2) /* <word> */
-- fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
-+ fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
- --todo;
- }
- if (round == 1)
-@@ -8176,7 +8363,7 @@
- putc(0, fd); /* <sectionflags> */
- l = spin->si_map.ga_len;
- put_bytes(fd, (long_u)l, 4); /* <sectionlen> */
-- fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
-+ fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
- /* <mapstr> */
- }
-
-@@ -8232,10 +8419,11 @@
- {
- p = ((char_u **)(spin->si_comppat.ga_data))[i];
- putc((int)STRLEN(p), fd); /* <comppatlen> */
-- fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* <comppattext> */
-+ fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);
-+ /* <comppattext> */
- }
- /* <compflags> */
-- fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
-+ fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
- (size_t)1, fd);
- }
-
-@@ -8259,7 +8447,8 @@
-
- l = (int)STRLEN(spin->si_syllable);
- put_bytes(fd, (long_u)l, 4); /* <sectionlen> */
-- fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* <syllable> */
-+ fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd);
-+ /* <syllable> */
- }
-
- /* end of <SECTIONS> */
-@@ -8295,13 +8484,18 @@
- (void)put_node(fd, tree, 0, regionmask, round == 3);
- }
-
-- /* Write another byte to check for errors. */
-+ /* Write another byte to check for errors (file system full). */
- if (putc(0, fd) == EOF)
- retval = FAIL;
--
-+theend:
- if (fclose(fd) == EOF)
- retval = FAIL;
-
-+ if (fwv != (size_t)1)
-+ retval = FAIL;
-+ if (retval == FAIL)
-+ EMSG(_(e_write));
-+
- return retval;
- }
-
-@@ -9890,6 +10084,7 @@
- char_u *p;
- int len;
- int totlen;
-+ size_t x = 1; /* collect return value of fwrite() */
-
- if (fd != NULL)
- put_bytes(fd, (long_u)gap->ga_len, 2); /* <prefcondcnt> */
-@@ -9906,7 +10101,7 @@
- if (fd != NULL)
- {
- fputc(len, fd);
-- fwrite(p, (size_t)len, (size_t)1, fd);
-+ x &= fwrite(p, (size_t)len, (size_t)1, fd);
- }
- totlen += len;
- }
-@@ -11480,15 +11675,24 @@
- vim_strncpy(preword + sp->ts_prewordlen,
- tword + sp->ts_splitoff,
- sp->ts_twordlen - sp->ts_splitoff);
-- p = preword;
-- while (*skiptowhite(p) != NUL)
-- p = skipwhite(skiptowhite(p));
-- if (fword_ends && !can_compound(slang, p,
-- compflags + sp->ts_compsplit))
-- /* Compound is not allowed. But it may still be
-- * possible if we add another (short) word. */
-+
-+ /* Verify CHECKCOMPOUNDPATTERN rules. */
-+ if (match_checkcompoundpattern(preword, sp->ts_prewordlen,
-+ &slang->sl_comppat))
- compound_ok = FALSE;
-
-+ if (compound_ok)
-+ {
-+ p = preword;
-+ while (*skiptowhite(p) != NUL)
-+ p = skipwhite(skiptowhite(p));
-+ if (fword_ends && !can_compound(slang, p,
-+ compflags + sp->ts_compsplit))
-+ /* Compound is not allowed. But it may still be
-+ * possible if we add another (short) word. */
-+ compound_ok = FALSE;
-+ }
-+
- /* Get pointer to last char of previous word. */
- p = preword + sp->ts_prewordlen;
- mb_ptr_back(preword, p);
-@@ -11685,10 +11889,9 @@
- && (slang->sl_compsylmax < MAXWLEN
- || sp->ts_complen + 1 - sp->ts_compsplit
- < slang->sl_compmax)
-- && (byte_in_str(sp->ts_complen == sp->ts_compsplit
-- ? slang->sl_compstartflags
-- : slang->sl_compallflags,
-- ((unsigned)flags >> 24))))
-+ && (can_be_compound(sp, slang,
-+ compflags, ((unsigned)flags >> 24))))
-+
- {
- try_compound = TRUE;
- compflags[sp->ts_complen] = ((unsigned)flags >> 24);
-diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
---- vim72.orig/src/structs.h 2008-07-30 21:02:50.000000000 +0100
-+++ vim72/src/structs.h 2008-12-06 11:37:49.000000000 +0000
-@@ -459,7 +459,7 @@
- typedef struct
- {
- int hide; /* TRUE when ":hide" was used */
--# ifdef FEAT_BROWSE
-+# ifdef FEAT_BROWSE_CMD
- int browse; /* TRUE to invoke file dialog */
- # endif
- # ifdef FEAT_WINDOWS
-@@ -1784,10 +1784,15 @@
- #endif
-
- /*
-- * The next three specify the offsets for displaying the buffer:
-+ * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
-+ * displaying the buffer.
- */
- linenr_T w_topline; /* buffer line number of the line at the
- top of the window */
-+#ifdef FEAT_AUTOCMD
-+ char w_topline_was_set; /* flag set to TRUE when topline is set,
-+ e.g. by winrestview() */
-+#endif
- #ifdef FEAT_DIFF
- int w_topfill; /* number of filler lines above w_topline */
- int w_old_topfill; /* w_topfill at last redraw */
-diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
---- vim72.orig/src/testdir/Makefile 2008-06-19 21:29:46.000000000 +0100
-+++ vim72/src/testdir/Makefile 2008-12-06 11:37:48.000000000 +0000
-@@ -26,15 +26,17 @@
-
- .SUFFIXES: .in .out
-
--nongui: nolog $(SCRIPTS)
-- @echo
-- @cat test.log
-- @echo ALL DONE
-+nongui: nolog $(SCRIPTS) report
-+
-+gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) report
-
--gui: nolog $(SCRIPTS) $(SCRIPTS_GUI)
-+report:
- @echo
-- @cat test.log
-- @echo ALL DONE
-+ @echo 'Test results:'
-+ @/bin/sh -c "if test -f test.log; \
-+ then cat test.log; echo TEST FAILURE; exit 1; \
-+ else echo ALL DONE; \
-+ fi"
-
- $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
-
-@@ -71,4 +73,4 @@
- test60.out: test60.vim
-
- nolog:
-- -echo Test results: >test.log
-+ -rm -f test.log
-diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
---- vim72.orig/src/testdir/Make_ming.mak 1970-01-01 01:00:00.000000000 +0100
-+++ vim72/src/testdir/Make_ming.mak 2008-12-06 11:37:48.000000000 +0000
-@@ -0,0 +1,91 @@
-+# Makefile to run tests for Vim, on Dos-like machines
-+# with sh.exe or zsh.exe in the path or not.
-+#
-+# Author: Bill McCarthy
-+#
-+# Note that test54 has been removed until it is fixed.
-+#
-+# Requires a set of Unix tools: echo, diff, etc.
-+
-+ifneq (sh.exe, $(SHELL))
-+DEL = rm -f
-+MV = mv
-+CP = cp
-+DIRSLASH = /
-+else
-+DEL = del
-+MV = rename
-+CP = copy
-+DIRSLASH = \\
-+endif
-+
-+VIMPROG = ..$(DIRSLASH)vim
-+
-+# Omitted:
-+# test2 "\\tmp" doesn't work.
-+# test10 'errorformat' is different
-+# test12 can't unlink a swap file
-+# test25 uses symbolic link
-+# test27 can't edit file with "*" in file name
-+# test31 16 bit version runs out of memory...
-+
-+SCRIPTS16 = test1.out test19.out test20.out test22.out \
-+ test23.out test24.out test28.out test29.out \
-+ test35.out test36.out test43.out \
-+ test44.out test45.out test46.out test47.out \
-+ test48.out test51.out test53.out \
-+ test55.out test56.out test57.out test58.out test59.out \
-+ test60.out test61.out test62.out test63.out test64.out
-+
-+# Had to remove test54 which doesn't work yet.
-+# test54.out
-+
-+SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
-+ test8.out test9.out test11.out test13.out test14.out \
-+ test15.out test17.out test18.out test21.out test26.out \
-+ test30.out test31.out test32.out test33.out test34.out \
-+ test37.out test38.out test39.out test40.out test41.out \
-+ test42.out test52.out test65.out
-+
-+SCRIPTS32 = test50.out
-+
-+SCRIPTS_GUI = test16.out
-+
-+.SUFFIXES: .in .out
-+
-+vimall: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
-+ echo ALL DONE
-+
-+nongui: fixff $(SCRIPTS16) $(SCRIPTS)
-+ echo ALL DONE
-+
-+small:
-+ echo ALL DONE
-+
-+gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
-+ echo ALL DONE
-+
-+win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
-+ echo ALL DONE
-+
-+fixff:
-+ -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
-+
-+clean:
-+ -$(DEL) *.out
-+ -$(DEL) test.ok
-+ -$(DEL) small.vim
-+ -$(DEL) tiny.vim
-+ -$(DEL) mbyte.vim
-+ -$(DEL) X*
-+ -$(DEL) viminfo
-+
-+.in.out:
-+ $(CP) $*.ok test.ok
-+ $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
-+ diff test.out $*.ok
-+ -$(DEL) $*.out
-+ $(MV) test.out $*.out
-+ -$(DEL) X*
-+ -$(DEL) test.ok
-+ -$(DEL) viminfo
-diff -Naur vim72.orig/src/testdir/test30.in vim72/src/testdir/test30.in
---- vim72.orig/src/testdir/test30.in 2008-06-25 22:33:01.000000000 +0100
-+++ vim72/src/testdir/test30.in 2008-12-06 11:37:48.000000000 +0000
-@@ -24,10 +24,17 @@
- :set nobin eol
- :bwipe XXUnix XXDos XXMac
- :" create mixed format files
--:!cat XXUnix XXDos >XXUxDs
--:!cat XXUnix XXMac >XXUxMac
--:!cat XXDos XXMac >XXDosMac
--:!cat XXUnix XXDos XXMac >XXUxDsMc
-+:if has("vms")
-+: !copy XXUnix,XXDos XXUxDs.
-+: !copy XXUnix,XXMac XXUxMac.
-+: !copy XXDos,XXMac XXDosMac.
-+: !copy XXUnix,XXDos,XXMac XXUxDsMc.
-+:else
-+: !cat XXUnix XXDos >XXUxDs
-+: !cat XXUnix XXMac >XXUxMac
-+: !cat XXDos XXMac >XXDosMac
-+: !cat XXUnix XXDos XXMac >XXUxDsMc
-+:endif
- :"
- :" try reading and writing with 'fileformats' empty
- :set fileformat=unix
-diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
---- vim72.orig/src/testdir/test42.ok 2008-02-20 12:27:37.000000000 +0000
-+++ vim72/src/testdir/test42.ok 2008-12-06 11:37:49.000000000 +0000
-@@ -20,7 +20,7 @@
- ucs-2
-
-
-- fileencoding=ucs-2le
-+ fileencoding=utf-16le
- bomb
- ucs-2le
-
-diff -Naur vim72.orig/src/testdir/test54.in vim72/src/testdir/test54.in
---- vim72.orig/src/testdir/test54.in 2005-01-01 11:21:16.000000000 +0000
-+++ vim72/src/testdir/test54.in 2008-12-06 11:37:48.000000000 +0000
-@@ -3,8 +3,13 @@
- STARTTEST
- :so small.vim
- :e xx
--:!rm -f test.out
--:au BufLeave <buffer> :!echo buffer-local autommand in %>> test.out
-+:if has("vms")
-+: !del test.out.*
-+: au BufLeave <buffer> :!write sys$output "buffer-local autommand in %" > test.out
-+:else
-+: !rm -f test.out
-+: au BufLeave <buffer> :!echo buffer-local autommand in %>> test.out
-+:endif
- :e somefile " here, autocommand for xx shall write test.out
- : " but autocommand shall not apply to buffer named <buffer>
- :bwipe xx " here, autocommand shall be auto-deleted
-diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
---- vim72.orig/src/ui.c 2008-07-14 19:14:56.000000000 +0100
-+++ vim72/src/ui.c 2008-12-06 11:37:50.000000000 +0000
-@@ -1820,7 +1820,7 @@
- #ifdef HAVE_DUP
- /* Use stderr for stdin, also works for shell commands. */
- close(0);
-- dup(2);
-+ ignored = dup(2);
- #else
- read_cmd_fd = 2; /* read from stderr instead of stdin */
- #endif
-@@ -2020,7 +2020,7 @@
-
- if (value == NULL || *length == 0)
- {
-- clip_free_selection(cbd); /* ??? [what's the query?] */
-+ clip_free_selection(cbd); /* nothing received, clear register */
- *(int *)success = FALSE;
- return;
- }
-@@ -2076,7 +2076,7 @@
- text_prop.value = (unsigned char *)value;
- text_prop.encoding = *type;
- text_prop.format = *format;
-- text_prop.nitems = STRLEN(value);
-+ text_prop.nitems = len;
- status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
- &text_list, &n_text);
- if (status != Success || n_text < 1)
-@@ -2110,6 +2110,8 @@
- int i;
- int nbytes = 0;
- char_u *buffer;
-+ time_t start_time;
-+ int timed_out = FALSE;
-
- for (i =
- #ifdef FEAT_MBYTE
-@@ -2129,6 +2131,7 @@
- case 3: type = text_atom; break;
- default: type = XA_STRING;
- }
-+ success = MAYBE;
- XtGetSelectionValue(myShell, cbd->sel_atom, type,
- clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
-
-@@ -2141,27 +2144,48 @@
- * characters, then they will appear before the one that requested the
- * paste! Don't worry, we will catch up with any other events later.
- */
-- for (;;)
-+ start_time = time(NULL);
-+ while (success == MAYBE)
- {
-- if (XCheckTypedEvent(dpy, SelectionNotify, &event))
-- break;
-- if (XCheckTypedEvent(dpy, SelectionRequest, &event))
-- /* We may get a SelectionRequest here and if we don't handle
-- * it we hang. KDE klipper does this, for example. */
-+ if (XCheckTypedEvent(dpy, SelectionNotify, &event)
-+ || XCheckTypedEvent(dpy, SelectionRequest, &event)
-+ || XCheckTypedEvent(dpy, PropertyNotify, &event))
-+ {
-+ /* This is where clip_x11_request_selection_cb() should be
-+ * called. It may actually happen a bit later, so we loop
-+ * until "success" changes.
-+ * We may get a SelectionRequest here and if we don't handle
-+ * it we hang. KDE klipper does this, for example.
-+ * We need to handle a PropertyNotify for large selections. */
- XtDispatchEvent(&event);
-+ continue;
-+ }
-+
-+ /* Time out after 2 to 3 seconds to avoid that we hang when the
-+ * other process doesn't respond. Note that the SelectionNotify
-+ * event may still come later when the selection owner comes back
-+ * to life and the text gets inserted unexpectedly. Don't know
-+ * why that happens or how to avoid that :-(. */
-+ if (time(NULL) > start_time + 2)
-+ {
-+ timed_out = TRUE;
-+ break;
-+ }
-
- /* Do we need this? Probably not. */
- XSync(dpy, False);
-
-- /* Bernhard Walle solved a slow paste response in an X terminal by
-- * adding: usleep(10000); here. */
-+ /* Wait for 1 msec to avoid that we eat up all CPU time. */
-+ ui_delay(1L, TRUE);
- }
-
-- /* this is where clip_x11_request_selection_cb() is actually called */
-- XtDispatchEvent(&event);
--
-- if (success)
-+ if (success == TRUE)
- return;
-+
-+ /* don't do a retry with another type after timing out, otherwise we
-+ * hang for 15 seconds. */
-+ if (timed_out)
-+ break;
- }
-
- /* Final fallback position - use the X CUT_BUFFER0 store */
-diff -Naur vim72.orig/src/version.c vim72/src/version.c
---- vim72.orig/src/version.c 2008-08-09 15:24:52.000000000 +0100
-+++ vim72/src/version.c 2008-12-06 11:37:50.000000000 +0000
-@@ -677,9 +677,152 @@
- static int included_patches[] =
- { /* Add new patch number below this line */
- /**/
-+ 65,
-+/**/
-+ 64,
-+/**/
-+ 63,
-+/**/
-+ 62,
-+/**/
-+ 61,
-+/**/
-+ 60,
-+/**/
-+ 59,
-+/**/
-+ 58,
-+/**/
-+ 57,
-+/**/
-+ 56,
-+/**/
-+ 55,
-+/**/
-+ 54,
-+/**/
-+ 53,
-+/**/
-+ 52,
-+/**/
-+ 51,
-+/**/
-+ 50,
-+/**/
-+ 49,
-+/**/
-+ 48,
-+/**/
-+ 47,
-+/**/
-+ 46,
-+/**/
-+ 45,
-+/**/
-+ 44,
-+/**/
-+ 43,
-+/**/
-+ 42,
-+/**/
-+ 41,
-+/**/
-+ 40,
-+/**/
-+ 39,
-+/**/
-+ 38,
-+/**/
-+ 37,
-+/**/
-+ 36,
-+/**/
-+ 35,
-+/**/
-+ 34,
-+/**/
-+ 33,
-+/**/
-+ 32,
-+/**/
-+ 31,
-+/**/
-+ 30,
-+/**/
-+ 29,
-+/**/
-+ 28,
-+/**/
-+ 27,
-+/**/
-+ 26,
-+/**/
-+ 25,
-+/**/
-+ 24,
-+/**/
-+ 23,
-+/**/
-+ 22,
-+/**/
-+ 21,
-+/**/
-+ 20,
-+/**/
-+ 19,
-+/**/
-+ 18,
-+/**/
-+ 17,
-+/**/
-+ 16,
-+/**/
-+ 15,
-+/**/
-+ 14,
-+/**/
-+ 13,
-+/**/
-+ 12,
-+/**/
-+ 11,
-+/**/
-+ 10,
-+/**/
-+ 9,
-+/**/
-+ 8,
-+/**/
-+ 7,
-+/**/
-+ 6,
-+/**/
-+ 5,
-+/**/
-+ 4,
-+/**/
-+ 3,
-+/**/
-+ 2,
-+/**/
-+ 1,
-+/**/
- 0
- };
-
-+/*
-+ * Place to put a short description when adding a feature with a patch.
-+ * Keep it short, e.g.,: "relative numbers", "persistent undo".
-+ * Also add a comment marker to separate the lines.
-+ * See the official Vim patches for the diff format: It must use a context of
-+ * one line only. Use "diff -C2".
-+ */
-+static char *(extra_patches[]) =
-+{ /* Add your patch description below this line */
-+/**/
-+ NULL
-+};
-+
- int
- highest_patch()
- {
-@@ -786,7 +929,7 @@
- MSG_PUTS(_("\nRISC OS version"));
- #endif
- #ifdef VMS
-- MSG_PUTS("\nOpenVMS version");
-+ MSG_PUTS(_("\nOpenVMS version"));
- # ifdef HAVE_PATHDEF
- if (*compiled_arch != NUL)
- {
-@@ -825,6 +968,19 @@
- }
- }
-
-+ /* Print the list of extra patch descriptions if there is at least one. */
-+ if (extra_patches[0] != NULL)
-+ {
-+ MSG_PUTS(_("\nExtra patches: "));
-+ s = "";
-+ for (i = 0; extra_patches[i] != NULL; ++i)
-+ {
-+ MSG_PUTS(s);
-+ s = ", ";
-+ MSG_PUTS(extra_patches[i]);
-+ }
-+ }
-+
- #ifdef MODIFIED_BY
- MSG_PUTS("\n");
- MSG_PUTS(_("Modified by "));
-diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
---- vim72.orig/src/vim.h 2008-08-09 17:03:38.000000000 +0100
-+++ vim72/src/vim.h 2008-12-06 11:37:50.000000000 +0000
-@@ -341,8 +341,14 @@
- #ifdef BACKSLASH_IN_FILENAME
- # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
- #else
--# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
--# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
-+# ifdef VMS
-+ /* VMS allows a lot of characters in the file name */
-+# define PATH_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'\"|!")
-+# define SHELL_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'|!()&")
-+# else
-+# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
-+# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
-+# endif
- #endif
-
- #define NUMBUFLEN 30 /* length of a buffer to store a number in ASCII */
-@@ -370,7 +376,7 @@
- * Define __w64 as an empty token for everything but MSVC 7.x or later.
- */
- # if !defined(_MSC_VER) || (_MSC_VER < 1300)
--# define __w64
-+# define __w64
- # endif
- typedef unsigned long __w64 long_u;
- typedef long __w64 long_i;
-@@ -1728,7 +1734,8 @@
- #define VV_MOUSE_COL 51
- #define VV_OP 52
- #define VV_SEARCHFORWARD 53
--#define VV_LEN 54 /* number of v: vars */
-+#define VV_OLDFILES 54
-+#define VV_LEN 55 /* number of v: vars */
-
- #ifdef FEAT_CLIPBOARD
-
-@@ -1979,6 +1986,9 @@
- # endif
- #endif
-
-+#ifndef FEAT_NETBEANS_INTG
-+# undef NBDEBUG
-+#endif
- #ifdef NBDEBUG /* Netbeans debugging. */
- # include "nbdebug.h"
- #else
-@@ -2054,4 +2064,10 @@
- #define DOSO_VIMRC 1 /* loading vimrc file */
- #define DOSO_GVIMRC 2 /* loading gvimrc file */
-
-+/* flags for read_viminfo() and children */
-+#define VIF_WANT_INFO 1 /* load non-mark info */
-+#define VIF_WANT_MARKS 2 /* load file marks */
-+#define VIF_FORCEIT 4 /* overwrite info already read */
-+#define VIF_GET_OLDFILES 8 /* load v:oldfiles */
-+
- #endif /* VIM__H */
-diff -Naur vim72.orig/src/window.c vim72/src/window.c
---- vim72.orig/src/window.c 2008-08-06 12:00:30.000000000 +0100
-+++ vim72/src/window.c 2008-12-06 11:37:50.000000000 +0000
-@@ -531,7 +531,8 @@
- # ifdef FEAT_SCROLLBIND
- curwin->w_p_scb = FALSE;
- # endif
-- (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, ECMD_HIDE);
-+ (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL,
-+ ECMD_HIDE, NULL);
- if (nchar == 'F' && lnum >= 0)
- {
- curwin->w_cursor.lnum = lnum;
-@@ -4028,14 +4029,14 @@
- if (mch_dirname(cwd, MAXPATHL) == OK)
- globaldir = vim_strsave(cwd);
- }
-- mch_chdir((char *)curwin->w_localdir);
-- shorten_fnames(TRUE);
-+ if (mch_chdir((char *)curwin->w_localdir) == 0)
-+ shorten_fnames(TRUE);
- }
- else if (globaldir != NULL)
- {
- /* Window doesn't have a local directory and we are not in the global
- * directory: Change to the global directory. */
-- mch_chdir((char *)globaldir);
-+ ignored = mch_chdir((char *)globaldir);
- vim_free(globaldir);
- globaldir = NULL;
- shorten_fnames(TRUE);
-diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
---- vim72.orig/src/workshop.c 2008-06-21 19:53:26.000000000 +0100
-+++ vim72/src/workshop.c 2008-12-06 11:37:50.000000000 +0000
-@@ -1121,8 +1121,12 @@
- ? (char *)curbuf->b_sfname : "<None>");
- #endif
-
-- strcpy(ffname, (char *) curbuf->b_ffname);
-- *filename = ffname; /* copy so nobody can change b_ffname */
-+ if (curbuf->b_ffname == NULL)
-+ ffname[0] = NUL;
-+ else
-+ /* copy so nobody can change b_ffname */
-+ strcpy(ffname, (char *) curbuf->b_ffname);
-+ *filename = ffname;
- *curLine = curwin->w_cursor.lnum;
- *curCol = curwin->w_cursor.col;
-
+++ /dev/null
-Submitted By: Alexander E. Patrakov
-Date: 2006-05-27
-Initial Package Version: 7.0
-Upstream status: LFS specific
-Description: Adjusts installation of manual pages to meet Man-DB expectations.
-
- Additional change to explicitly install the man pages into
- /usr/share/man instead of /usr/man by Ag Hatzim.
-
---- vim70/src/Makefile.orig 2006-05-27 12:49:31.767959808 +0300
-+++ vim70/src/Makefile 2006-05-27 12:49:55.778309680 +0300
-@@ -867,7 +867,7 @@
- # Uncomment the next line to install Vim in "/usr/bin"
- #BINDIR = /usr/bin
- # Uncomment the next line to install Vim manuals in "/usr/share/man/man1"
--#MANDIR = /usr/share/man
-+MANDIR = /usr/share/man
- # Uncomment the next line to install Vim help files in "/usr/share/vim"
- #DATADIR = /usr/share
-
-@@ -1325,7 +1325,7 @@
- DEST_MAN_PL = $(DEST_MAN_TOP)/pl$(MAN1DIR)
- DEST_MAN_PL_I = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR)
- DEST_MAN_PL_U = $(DEST_MAN_TOP)/pl.UTF-8$(MAN1DIR)
--DEST_MAN_RU = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
-+DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR)
- DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
-
- # BASIC_SRC: files that are always used
-@@ -1905,52 +1905,24 @@
- # install the language specific files for tools, if they were unpacked
- install-tool-languages:
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
-
- # install the language specific files, if they were unpacked
- install-languages: languages $(DEST_LANG) $(DEST_KMAP)
- -$(SHELL) ./installman.sh install $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh install $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh install $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
-- -$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_FR) $(INSTALLMLARGS)
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
-- $(DEST_MAN_FR_I) $(INSTALLMLARGS)
-- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
-- $(DEST_MAN_FR_U) $(INSTALLMLARGS)
-- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_IT) $(INSTALLMLARGS)
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
-- $(DEST_MAN_IT_I) $(INSTALLMLARGS)
-- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
-- $(DEST_MAN_IT_U) $(INSTALLMLARGS)
-- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_PL) $(INSTALLMLARGS)
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
-- $(DEST_MAN_PL_I) $(INSTALLMLARGS)
-- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
-- $(DEST_MAN_PL_U) $(INSTALLMLARGS)
-- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_RU) $(INSTALLMLARGS)
-- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
-- $(DEST_MAN_RU_U) $(INSTALLMLARGS)
- if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
- cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
- INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
projects / ipfire-2.x.git / commitdiff
