Updated runtime files.

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 275b7ac45a8a1f4abbd550fb354c651d80f75a35..b0fa84147b57e72485c7914e2ab17a28119d3b3c 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2012 Oct 03
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Oct 04
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -34,6 +34,11 @@ not be repeated below, unless there is extra information.
                                                        *known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Patch with Test for patch  7.3.673 (Christian Brabandt, 2012 Oct 3)
+
+Patch for C-\ e when editing expression. (Christian Brabandt, 2012 Oct 3)
+Correction by ZyX.
+
 Go through more coverity reports.
 
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
@@ -81,6 +86,8 @@ Aug 16)
 the order they were made.  Also ":gredo".  Both with a count.  Useful when
 tests fail after making changes and you forgot in which files.
 
+Patch to make updating tabline faster. (Arseny Kapoulkine, 2012 Oct 3)
+
 Crash with vimdiff. (Don Cruickshank, 2012 Sep 23)
 
 Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30)
@@ -118,6 +125,9 @@ MS-Windows: Crash opening very long file name starting with "\\".
 Win32: patch for current directory, "loading iof conv". (Ken Takata, 2012 Sep
 15)
 
+It's probably a good idea to make a negative value for 'sts' use the value of
+'sw'.  Patch by So8res, Oct 3 2012
+
 Syntax update problem in one buffer opened in two windows, bottom window is
 not correctly updated. (Paul Harris, 2012 Feb 27)
 

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 5010d687739f8888aa461a73aaac3a9be80439b2..8162acec8107b5fc8fecc23dcb396c8662d40e1f 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2012 Oct 03
+" Last Change: 2012 Oct 05
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -128,6 +128,11 @@ au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf set
 " Arc Macro Language
 au BufNewFile,BufRead *.aml                    setf aml
 
+" APT config file
+au BufNewFile,BufRead apt.conf                 setf aptconf
+au BufNewFile,BufRead */.aptitude/config       setf aptconf
+au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} setf aptconf
+
 " Arch Inventory file
 au BufNewFile,BufRead .arch-inventory,=tagging-method  setf arch
 

diff --git a/runtime/syntax/aptconf.vim b/runtime/syntax/aptconf.vim
new file mode 100644 (file)
index 0000000..40fe92b
--- /dev/null
+++ b/runtime/syntax/aptconf.vim
@@ -0,0 +1,493 @@
+" Vim syntax file
+" Language:    APT config file
+" Maintainer:  Yann Amar <quidame@poivron.org>
+" Last Change: 2012 Oct 05
+
+" For version 5.x: Clear all syntax items
+" For version 6.x and 7.x: Quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'aptconf'
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Errors:
+" Catch all that is not overridden by next rules/items:
+syn match      aptconfError            display '[^[:blank:]]'
+syn match      aptconfError            display '^[^[:blank:]][^:{]*'
+
+" Options:
+" Define a general regular expression for the options that are not defined
+" later as keywords. Following apt.conf(5), we know that options are case
+" insensitive, and can contain alphanumeric characters and '/-:._+'; we
+" assume that there can not be consecutive colons (::) which is used as
+" syntax operator; we also assume that an option name can not start or end
+" by a colon.
+syn case       ignore
+syn match      aptconfRegexpOpt        '[-[:alnum:]/.+_]\+\(:[-[:alnum:]/.+_]\+\)*' contained display
+
+" Keywords:
+setlocal iskeyword+=/,-,.,_,+
+"setlocal iskeyword+=: is problematic, because of the '::' separator
+
+" Incomplete keywords will be treated differently than completely bad strings:
+syn keyword    aptconfGroupIncomplete
+       \ a[cquire] a[ptitude] d[ebtags] d[ebug] d[ir] d[pkg] d[select]
+       \ o[rderlist] p[ackagemanager] p[kgcachegen] q[uiet] r[pm]
+       \ u[nattended-upgrade]
+
+" Only the following keywords can be used at toplevel (to begin an option):
+syn keyword    aptconfGroup
+       \ acquire apt aptitude debtags debug dir dpkg dselect
+       \ orderlist packagemanager pkgcachegen quiet rpm
+       \ unattended-upgrade
+
+" Possible options for each group:
+" Acquire: {{{
+syn keyword    aptconfAcquire contained
+       \ cdrom Check-Valid-Until CompressionTypes ForceHash ftp gpgv
+       \ GzipIndexes http https Languages Max-ValidTime Min-ValidTime PDiffs
+       \ Queue-Mode Retries Source-Symlinks
+
+syn keyword    aptconfAcquireCDROM contained
+       \ AutoDetect CdromOnly Mount UMount
+
+syn keyword    aptconfAcquireCompressionTypes contained
+       \ bz2 lzma gz Order
+
+syn keyword    aptconfAcquireFTP contained
+       \ Passive Proxy ProxyLogin Timeout
+
+syn keyword    aptconfAcquireHTTP contained
+       \ AllowRedirect Dl-Limit Max-Age No-Cache No-Store Pipeline-Depth
+       \ Proxy Timeout User-Agent
+
+syn keyword    aptconfAcquireHTTPS contained
+       \ CaInfo CaPath CrlFile IssuerCert SslCert SslForceVersion SslKey
+       \ Verify-Host Verify-Peer
+
+syn keyword    aptconfAcquireMaxValidTime contained
+       \ Debian Debian-Security
+
+syn keyword    aptconfAcquirePDiffs contained
+       \ FileLimit SizeLimit
+
+syn cluster    aptconfAcquire_ contains=aptconfAcquire,
+       \ aptconfAcquireCDROM,aptconfAcquireCompressionTypes,aptconfAcquireFTP,
+       \ aptconfAcquireHTTP,aptconfAcquireHTTPS,aptconfAcquireMaxValidTime,
+       \ aptconfAcquirePDiffs
+" }}}
+" Apt: {{{
+syn keyword    aptconfApt contained
+       \ Architecture Architectures Archive Authentication AutoRemove
+       \ Build-Essential Cache Cache-Grow Cache-Limit Cache-Start CDROM
+       \ Changelogs Clean-Installed Compressor Default-Release
+       \ Force-LoopBreak Get Ignore-Hold Immediate-Configure
+       \ Install-Recommends Install-Suggests Keep-Fds List-Cleanup
+       \ NeverAutoRemove Never-MarkAuto-Sections Periodic Status-Fd Update
+
+syn keyword    aptconfAptAuthentication contained
+       \ TrustCDROM
+
+syn keyword    aptconfAptAutoRemove contained
+       \ RecommendsImportant SuggestsImportant
+
+syn keyword    aptconfAptCache contained
+       \ AllNames AllVersions Generate GivenOnly Important Installed NamesOnly
+       \ RecurseDepends ShowFull
+
+syn keyword    aptconfAptCDROM contained
+       \ Fast NoAct NoMount Rename
+
+syn keyword    aptconfAptChangelogs contained
+       \ Server
+
+syn keyword    aptconfAptCompressor contained
+       \ bzip2 gzip lzma xz
+
+syn keyword    aptconfAptCompressorAll contained
+       \ Binary CompressArg Cost Extension Name UncompressArg
+
+syn keyword    aptconfAptGet contained
+       \ AllowUnauthenticated Arch-Only Assume-No Assume-Yes AutomaticRemove
+       \ Build-Dep-Automatic Compile Diff-Only Download Download-Only Dsc-Only
+       \ Fix-Broken Fix-Missing Force-Yes HideAutoRemove Host-Architecture
+       \ List-Cleanup Only-Source Print-URIs Purge ReInstall Remove
+       \ Show-Upgraded Show-User-Simulation-Note Show-Versions Simulate
+       \ Tar-Only Trivial-Only Upgrade
+
+syn keyword    aptconfAptPeriodic contained
+       \ AutocleanInterval BackupArchiveInterval BackupLevel
+       \ Download-Upgradeable-Packages MaxAge MaxSize MinAge
+       \ Unattended-Upgrade Update-Package-Lists Verbose
+
+syn keyword    aptconfAptUpdate contained
+       \ Pre-Invoke Post-Invoke Post-Invoke-Success
+
+syn cluster    aptconfApt_ contains=aptconfApt,
+       \ aptconfAptAuthentication,aptconfAptAutoRemove,aptconfAptCache,
+       \ aptconfAptCDROM,aptconfAptChangelogs,aptconfAptCompressor,
+       \ aptconfAptCompressorAll,aptconfAptGet,aptconfAptPeriodic,
+       \ aptconfAptUpdate
+" }}}
+" Aptitude: {{{
+syn keyword    aptconfAptitude contained
+       \ Allow-Null-Upgrade Always-Use-Safe-Resolver Autoclean-After-Update
+       \ Auto-Install Auto-Fix-Broken Cmdline Debtags-Binary
+       \ Debtags-Update-Options Delete-Unused Delete-Unused-Pattern
+       \ Display-Planned-Action Forget-New-On-Install Forget-New-On-Update
+       \ Get-Root-Command Ignore-Old-Tmp Ignore-Recommends-Important
+       \ Keep-Recommends Keep-Suggests Keep-Unused-Pattern LockFile Log
+       \ Logging Parse-Description-Bullets Pkg-Display-Limit ProblemResolver
+       \ Purge-Unused Recommends-Important Safe-Resolver Screenshot Sections
+       \ Simulate Spin-Interval Suggests-Important Suppress-Read-Only-Warning
+       \ Theme Track-Dselect-State UI Warn-Not-Root
+
+syn keyword    aptconfAptitudeCmdline contained
+       \ Always-Prompt Assume-Yes Disable-Columns Download-Only Fix-Broken
+       \ Ignore-Trust-Violations Package-Display-Format Package-Display-Width
+       \ Progress Request-Strictness Resolver-Debug Resolver-Dump
+       \ Resolver-Show-Steps Safe-Upgrade Show-Deps Show-Size-Changes
+       \ Show-Versions Show-Why Simulate Verbose Version-Display-Format
+       \ Versions-Group-By Versions-Show-Package-Names Visual-Preview
+       \ Why-Display-Mode
+
+syn keyword    aptconfAptitudeCmdlineProgress contained
+       \ Percent-On-Right Retain-Completed
+
+syn keyword    aptconfAptitudeCmdlineSafeUpgrade contained
+       \ No-New-Installs
+
+syn keyword    aptconfAptitudeLogging contained
+       \ File Levels
+
+syn keyword    aptconfAptitudeProblemResolver contained
+       \ Allow-Break-Holds BreakHoldScore Break-Hold-Level BrokenScore
+       \ DefaultResolutionScore Discard-Null-Solution
+       \ EssentialRemoveScore ExtraScore FullReplacementScore FutureHorizon
+       \ Hints ImportantScore Infinity InstallScore Keep-All-Level KeepScore
+       \ NonDefaultScore Non-Default-Level OptionalScore PreserveAutoScore
+       \ PreserveManualScore RemoveScore Remove-Essential-Level Remove-Level
+       \ RequiredScore ResolutionScore Safe-Level SolutionCost StandardScore
+       \ StepLimit StepScore Trace-Directory Trace-File
+       \ UndoFullReplacementScore UnfixedSoftScore UpgradeScore
+
+syn keyword    aptconfAptitudeSafeResolver contained
+       \ No-New-Installs No-New-Upgrades Show-Resolver-Actions
+
+syn keyword    aptconfAptitudeScreenshot contained
+       \ Cache-Max IncrementalLoadLimit
+
+syn keyword    aptconfAptitudeSections contained
+       \ Descriptions Top-Sections
+
+syn keyword    aptconfAptitudeUI contained
+       \ Advance-On-Action Auto-Show-Reasons Default-Grouping
+       \ Default-Package-View Default-Preview-Grouping Default-Sorting
+       \ Description-Visible-By-Default Exit-On-Last-Close Fill-Text
+       \ Flat-View-As-First-View HelpBar Incremental-Search InfoAreaTabs
+       \ KeyBindings MenuBar-Autohide Minibuf-Download-Bar Minibuf-Prompts
+       \ New-package-Commands Package-Display-Format Package-Header-Format
+       \ Package-Status-Format Pause-After-Download Preview-Limit
+       \ Prompt-On-Exit Styles ViewTabs
+
+syn keyword    aptconfAptitudeUIStyles contained
+       \ Bullet ChangeLogNewerVersion Default DepBroken DisabledMenuEntry
+       \ DownloadHit DownloadProgress EditLine Error Header HighlightedMenuBar
+       \ HighlightedMenuEntry MediaChange MenuBar MenuBorder MenuEntry
+       \ MineBomb MineBorder MineFlag MineNumber1 MineNumber2 MineNumber3
+       \ MineNumber4 MineNumber5 MineNumber6 MineNumber7 MineNumber8
+       \ MultiplexTab MultiplexTabHighlighted PkgBroken PkgBrokenHighlighted
+       \ PkgIsInstalled PkgIsInstalledHighlighted PkgNotInstalled
+       \ PkgNotInstalledHighlighted PkgToDowngrade PkgToDowngradeHighlighted
+       \ PkgToHold PkgToHoldHighlighted PkgToInstall PkgToInstallHighlighted
+       \ PkgToRemove PkgToRemoveHighlighted PkgToUpgrade
+       \ PkgToUpgradeHighlighted Progress SolutionActionApproved
+       \ SolutionActionRejected Status TreeBackground TrustWarning
+
+syn keyword    aptconfAptitudeUIStylesElements contained
+       \ bg clear fg flip set
+
+syn cluster    aptconfAptitude_ contains=aptconfAptitude,
+       \ aptconfAptitudeCmdline,aptconfAptitudeCmdlineProgress,
+       \ aptconfAptitudeCmdlineSafeUpgrade,aptconfAptitudeLogging,
+       \ aptconfAptitudeProblemResolver,aptconfAptitudeSafeResolver,
+       \ aptconfAptitudeScreenshot,aptconfAptitudeSections,aptconfAptitudeUI,
+       \ aptconfAptitudeUIStyles,aptconfAptitudeUIStylesElements
+" }}}
+" DebTags: {{{
+syn keyword    aptconfDebTags contained
+       \ Vocabulary
+
+syn cluster    aptconfDebTags_ contains=aptconfDebTags
+" }}}
+" Debug: {{{
+syn keyword    aptconfDebug contained
+       \ Acquire aptcdrom BuildDeps Hashes IdentCdrom Nolocking
+       \ pkgAcquire pkgAutoRemove pkgCacheGen pkgDepCache pkgDPkgPM
+       \ pkgDPkgProgressReporting pkgInitialize pkgOrderList
+       \ pkgPackageManager pkgPolicy pkgProblemResolver sourceList
+
+syn keyword    aptconfDebugAcquire contained
+       \ cdrom Ftp gpgv Http Https netrc
+
+syn keyword    aptconfDebugPkgAcquire contained
+       \ Auth Diffs RRed Worker
+
+syn keyword    aptconfDebugPkgDepCache contained
+       \ AutoInstall Marker
+
+syn keyword    aptconfDebugPkgProblemResolver contained
+       \ ShowScores
+
+syn cluster    aptconfDebug_ contains=aptconfDebug,
+       \ aptconfDebugAcquire,aptconfDebugPkgAcquire,aptconfDebugPkgDepCache,
+       \ aptconfDebugPkgProblemResolver
+" }}}
+" Dir: {{{
+syn keyword    aptconfDir contained
+       \ Aptitude Bin Cache Etc Ignore-Files-Silently Log Media Parts RootDir
+       \ State
+
+syn keyword    aptconfDirAptitude contained
+       \ state
+
+syn keyword    aptconfDirBin contained
+       \ apt-get apt-cache dpkg dpkg-buildpackage dpkg-source gpg gzip Methods
+       \ solvers
+
+syn keyword    aptconfDirCache contained
+       \ Archives Backup pkgcache srcpkgcache
+
+syn keyword    aptconfDirEtc contained
+       \ Main Netrc Parts Preferences PreferencesParts SourceList SourceParts
+       \ VendorList VendorParts Trusted TrustedParts
+
+syn keyword    aptconfDirLog contained
+       \ History Terminal
+
+syn keyword    aptconfDirMedia contained
+       \ MountPath
+
+syn keyword    aptconfDirState contained
+       \ cdroms extended_states Lists mirrors status
+
+syn cluster    aptconfDir_ contains=aptconfDir,
+       \ aptconfDirAptitude,aptconfDirBin,aptconfDirCache,aptconfDirEtc,
+       \ aptconfDirLog,aptconfDirMedia,aptconfDirState
+" }}}
+" DPkg: {{{
+syn keyword    aptconfDPkg contained
+       \ Build-Options Chroot-Directory ConfigurePending FlushSTDIN MaxArgs
+       \ MaxBytes NoTriggers options Pre-Install-Pkgs Pre-Invoke Post-Invoke
+       \ Run-Directory StopOnError Tools TriggersPending
+
+syn keyword    aptconfDPkgTools contained
+       \ Options Version
+
+syn cluster    aptconfDPkg_ contains=aptconfDPkg,
+       \ aptconfDPkgOrderList,aptconfDPkgOrderListScore,aptconfDPkgTools
+" }}}
+" DSelect: {{{
+syn keyword    aptconfDSelect contained
+       \ CheckDir Clean Options PromptAfterUpdate UpdateOptions
+
+syn cluster    aptconfDSelect_ contains=aptconfDSelect
+" }}}
+" OrderList: {{{
+syn keyword    aptconfOrderList contained
+       \ Score
+
+syn keyword    aptconfOrderListScore contained
+       \ Delete Essential Immediate PreDepends
+
+syn cluster    aptconfOrderList_ contains=aptconfOrderList,
+       \ aptconfOrderListScore
+" }}}
+" PackageManager: {{{
+syn keyword    aptconfPackageManager contained
+       \ Configure
+
+syn cluster    aptconfPackageManager_ contains=aptconfPackageManager
+" }}}
+" PkgCacheGen: {{{
+syn keyword    aptconfPkgCacheGen contained
+       \ Essential
+
+syn cluster    aptconfPkgCacheGen_ contains=aptconfPkgCacheGen
+" }}}
+" Quiet: {{{
+syn keyword    aptconfQuiet contained
+       \ NoUpdate
+
+syn cluster    aptconfQuiet_ contains=aptconfQuiet
+" }}}
+" Rpm: {{{
+syn keyword    aptconfRpm contained
+       \ Post-Invoke Pre-Invoke
+
+syn cluster    aptconfRpm_ contains=aptconfRpm
+" }}}
+" Unattened Upgrade: {{{
+syn keyword    aptconfUnattendedUpgrade contained
+       \ AutoFixInterruptedDpkg Automatic-Reboot InstallOnShutdown Mail
+       \ MailOnlyOnError MinimalSteps Origins-Pattern Package-Blacklist
+       \ Remove-Unused-Dependencies
+
+syn cluster    aptconfUnattendedUpgrade_ contains=aptconfUnattendedUpgrade
+" }}}
+
+syn case       match
+
+" Now put all the keywords (and 'valid' options) in a single cluster:
+syn cluster    aptconfOptions contains=aptconfRegexpOpt,
+       \ @aptconfAcquire_,@aptconfApt_,@aptconfAptitude_,@aptconfDebTags_,
+       \ @aptconfDebug_,@aptconfDir_,@aptconfDPkg_,@aptconfDSelect_,
+       \ @aptconfOrderList_,@aptconfPackageManager_,@aptconfPkgCacheGen_,
+       \ @aptconfQuiet_,@aptconfRpm_,@aptconfUnattendedUpgrade_
+
+" Syntax:
+syn match      aptconfSemiColon        ';'
+syn match      aptconfDoubleColon      '::'
+syn match      aptconfCurlyBraces      '[{}]'
+syn region     aptconfValue            start='"' end='"' oneline display
+syn region     aptconfInclude          matchgroup=aptconfOperator start='{' end='}' contains=ALLBUT,aptconfGroup,aptconfGroupIncomplete,@aptconfCommentSpecial
+syn region     aptconfInclude          matchgroup=aptconfOperator start='::' end='{'me=s-1 contains=@aptconfOptions,aptconfError display
+syn region     aptconfInclude          matchgroup=aptconfOperator start='::' end='::\|\s'me=s-1 oneline contains=@aptconfOptions,aptconfError display
+
+" Basic Syntax Errors: XXX avoid to generate false positives !!!
+"
+" * Invalid comment format (seems to not cause errors, but...):
+syn match      aptconfAsError          display '^#.*'
+"
+" * When a semicolon is missing after a double-quoted string:
+" There are some cases (for example in the Dir group of options, but not only)
+" where this syntax is valid. So we don't treat it as a strict error.
+syn match      aptconfAsError          display '"[^"]*"[^;]'me=e-1
+syn match      aptconfAsError          display '"[^"]*"$'
+"
+" * When double quotes are missing around a value (before a semicolon):
+" This omission has no effect if the value is a single string (without blank
+" characters). But apt.conf(5) says that quotes are required, and this item
+" avoids to match unquoted keywords.
+syn match      aptconfAsError          display '\s[^"[:blank:]]*[^}"];'me=e-1
+"
+" * When only one double quote is missing around a value (before a semicolon):
+" No comment for that: it must be highly visible.
+syn match      aptconfError            display '\(\s\|;\)"[^"[:blank:]]\+;'me=e-1
+syn match      aptconfError            display '\(\s\|;\)[^"[:blank:]]\+";'me=e-1
+"
+" * When space is missing between option and (quoted) value:
+" TODO (partially implemented)
+syn match      aptconfError            display '::[^[:blank:]]*"'
+
+" Special Actions:
+syn match      aptconfAction           '^#\(clear\|include\)\>'
+syn region     aptconfAction           matchgroup=aptconfAction start='^#clear\>' end=';'me=s-1 oneline contains=aptconfGroup,aptconfDoubleColon,@aptconfOptions
+syn region     aptconfAction           matchgroup=aptconfAction start='^#include\>' end=';'me=s-1 oneline contains=aptconfRegexpOpt
+
+" Comments:
+syn keyword    aptconfTodo             TODO FIXME NOTE XXX contained
+syn cluster    aptconfCommentSpecial   contains=@Spell,aptconfTodo
+syn match      aptconfComment          '//.*' contains=@aptconfCommentSpecial
+syn region     aptconfComment          start='/\*' end='\*/' contains=@aptconfCommentSpecial
+
+" Highlight Definitions:
+hi def link aptconfTodo                                Todo
+hi def link aptconfError                       Error
+hi def link aptconfComment                     Comment
+hi def link aptconfOperator                    Operator
+
+hi def link aptconfAction                      PreProc
+hi def link aptconfOption                      Type
+hi def link aptconfValue                       String
+hi def link aptconfRegexpOpt                   Normal
+hi def link aptconfAsError                     Special
+
+hi def link aptconfSemiColon                   aptconfOperator
+hi def link aptconfDoubleColon                 aptconfOperator
+hi def link aptconfCurlyBraces                 aptconfOperator
+
+hi def link aptconfGroupIncomplete             Special
+hi def link aptconfGroup                       aptconfOption
+
+hi def link aptconfAcquire                     aptconfOption
+hi def link aptconfAcquireCDROM                        aptconfOption
+hi def link aptconfAcquireCompressionTypes     aptconfOption
+hi def link aptconfAcquireFTP                  aptconfOption
+hi def link aptconfAcquireHTTP                 aptconfOption
+hi def link aptconfAcquireHTTPS                        aptconfOption
+hi def link aptconfAcquireMaxValidTime         aptconfOption
+hi def link aptconfAcquirePDiffs               aptconfOption
+
+hi def link aptconfApt                         aptconfOption
+hi def link aptconfAptAuthentication           aptconfOption
+hi def link aptconfAptAutoRemove               aptconfOption
+hi def link aptconfAptCache                    aptconfOption
+hi def link aptconfAptCDROM                    aptconfOption
+hi def link aptconfAptChangelogs               aptconfOption
+hi def link aptconfAptCompressor               aptconfOption
+hi def link aptconfAptCompressorAll            aptconfOption
+hi def link aptconfAptGet                      aptconfOption
+hi def link aptconfAptPeriodic                 aptconfOption
+hi def link aptconfAptUpdate                   aptconfOption
+
+hi def link aptconfAptitude                    aptconfOption
+hi def link aptconfAptitudeCmdline             aptconfOption
+hi def link aptconfAptitudeCmdlineProgress     aptconfOption
+hi def link aptconfAptitudeCmdlineSafeUpgrade  aptconfOption
+hi def link aptconfAptitudeLogging             aptconfOption
+hi def link aptconfAptitudeProblemResolver     aptconfOption
+hi def link aptconfAptitudeSafeResolver                aptconfOption
+hi def link aptconfAptitudeScreenshot          aptconfOption
+hi def link aptconfAptitudeSections            aptconfOption
+hi def link aptconfAptitudeUI                  aptconfOption
+hi def link aptconfAptitudeUIStyles            aptconfOption
+hi def link aptconfAptitudeUIStylesElements    aptconfOption
+
+hi def link aptconfDebTags                     aptconfOption
+
+hi def link aptconfDebug                       aptconfOption
+hi def link aptconfDebugAcquire                        aptconfOption
+hi def link aptconfDebugPkgAcquire             aptconfOption
+hi def link aptconfDebugPkgDepCache            aptconfOption
+hi def link aptconfDebugPkgProblemResolver     aptconfOption
+
+hi def link aptconfDir                         aptconfOption
+hi def link aptconfDirAptitude                 aptconfOption
+hi def link aptconfDirBin                      aptconfOption
+hi def link aptconfDirCache                    aptconfOption
+hi def link aptconfDirEtc                      aptconfOption
+hi def link aptconfDirLog                      aptconfOption
+hi def link aptconfDirMedia                    aptconfOption
+hi def link aptconfDirState                    aptconfOption
+
+hi def link aptconfDPkg                                aptconfOption
+hi def link aptconfDPkgTools                   aptconfOption
+
+hi def link aptconfDSelect                     aptconfOption
+
+hi def link aptconfOrderList                   aptconfOption
+hi def link aptconfOrderListScore              aptconfOption
+
+hi def link aptconfPackageManager              aptconfOption
+
+hi def link aptconfPkgCacheGen                 aptconfOption
+
+hi def link aptconfQuiet                       aptconfOption
+
+hi def link aptconfRpm                         aptconfOption
+
+hi def link aptconfUnattendedUpgrade           aptconfOption
+
+let b:current_syntax = "aptconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+

diff --git a/runtime/syntax/asn.vim b/runtime/syntax/asn.vim
index 9fc3d2468296874526e087d0052dff37d98550b0..28c8efba952e41238c7ed50975ec43038afb9c47 100644 (file)
--- a/runtime/syntax/asn.vim
+++ b/runtime/syntax/asn.vim
@@ -2,7 +2,7 @@
 " Language:    ASN.1
 " Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " URL:         http://www.fleiner.com/vim/syntax/asn.vim
-" Last Change: 2001 Apr 26
+" Last Change: 2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -12,6 +12,9 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " keyword definitions
 syn keyword asnExternal                DEFINITIONS BEGIN END IMPORTS EXPORTS FROM
 syn match   asnExternal                "\<IMPLICIT\s\+TAGS\>"
@@ -76,6 +79,8 @@ if version >= 508 || !exists("did_asn_syn_inits")
   delcommand HiLink
 endif
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 let b:current_syntax = "asn"
 
 " vim: ts=8

diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index 324dce3cc8b7e14057492124c07154c77458085a..df7f2a1aae01fec79edf60901260f08f34885bdb 100644 (file)
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -5,7 +5,7 @@
 "               Yeti            (Add full CSS2, HTML4 support)
 "               Nikolai Weibull (Add CSS2 support)
 " Maintainer:   Jules Wang      <w.jq0722@gmail.com>
-" Last Change:  2012 Aug 21
+" Last Change:  2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -18,6 +18,9 @@ endif
   let main_syntax = 'css'
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn case ignore
 
 " All HTML4 tags
@@ -449,6 +452,7 @@ if main_syntax == 'css'
   unlet main_syntax
 endif
 
-
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8
 

diff --git a/runtime/syntax/dts.vim b/runtime/syntax/dts.vim
new file mode 100644 (file)
index 0000000..84e37ae
--- /dev/null
+++ b/runtime/syntax/dts.vim
@@ -0,0 +1,26 @@
+" Vim syntax file
+" Language:    dts/dtsi (device tree files)
+" Maintainer:  Daniel Mack <vim@zonque.org>
+" Last Change: 2012 Oct 04
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax region dtsComment        start="/\*"  end="\*/"
+syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"
+syntax region dtsBinaryProperty start="\[" end="\]" 
+syntax match  dtsStringProperty "\".*\""
+syntax match  dtsKeyword        "/.*/"
+syntax match  dtsLabel          "^[[:space:]]*[[:alpha:][:digit:]_]\+:"
+syntax region dtsCellProperty   start="<" end=">" contains=dtsReference,dtsBinaryProperty,dtsStringProperty,dtsComment
+syntax region dtsCommentInner   start="/\*"  end="\*/"
+
+hi def link dtsCellProperty     Number
+hi def link dtsBinaryProperty   Number
+hi def link dtsStringProperty   String
+hi def link dtsKeyword          Include
+hi def link dtsLabel            Label
+hi def link dtsReference        Macro
+hi def link dtsComment          Comment
+hi def link dtsCommentInner     Comment 

diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim
index aada70e5479089ac9d0f1b249493f5cd1dc6306b..64e89cce7fac2a026b6b47cbe9635cb9217c153a 100644 (file)
--- a/runtime/syntax/gdb.vim
+++ b/runtime/syntax/gdb.vim
@@ -2,7 +2,7 @@
 " Language:    GDB command files
 " Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " URL:         http://www.fleiner.com/vim/syntax/gdb.vim
-" Last Change: 2009 May 25
+" Last Change: 2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -12,6 +12,9 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword gdbInfo contained address architecture args breakpoints catch common copying dcache
 syn keyword gdbInfo contained display files float frame functions handle line
 syn keyword gdbInfo contained locals program registers scope set sharedlibrary signals
@@ -32,7 +35,7 @@ syn match gdbFuncDef "\<define\>.*"
 syn match gdbStatmentContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef
 syn match gdbStatement "^\s*info" nextgroup=gdbInfo skipwhite skipempty
 
-" some commonly used abreviations
+" some commonly used abbreviations
 syn keyword gdbStatement c disp undisp disas p
 
 syn region gdbDocument matchgroup=gdbFuncDef start="\<document\>.*$" matchgroup=gdbFuncDef end="^end\s*$"
@@ -65,12 +68,12 @@ syn match gdbSet "\<input-radix\>"
 syn match gdbSet "\<demangle-style\>"
 syn match gdbSet "\<output-radix\>"
 
-syn match gdbComment "^\s*#.*"
+syn match gdbComment "^\s*#.*" contains=@Spell
 
 syn match gdbVariable "\$\K\k*"
 
 " Strings and constants
-syn region  gdbString          start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn region  gdbString          start=+"+  skip=+\\\\\|\\"+  end=+"+ contains=@Spell
 syn match   gdbCharacter       "'[^']*'" contains=gdbSpecialChar,gdbSpecialCharError
 syn match   gdbCharacter       "'\\''" contains=gdbSpecialChar
 syn match   gdbCharacter       "'[^\\]'"
@@ -108,4 +111,6 @@ endif
 
 let b:current_syntax = "gdb"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8

diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index 137c13c5b02f68fd855356eafc215ce5de757a54..d59126dede9e1e982a7a2d82e4ba03cbbe1aa6ac 100644 (file)
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -2,7 +2,7 @@
 " Language:    HTML
 " Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " URL:         http://www.fleiner.com/vim/syntax/html.vim
-" Last Change:  2006 Jun 19
+" Last Change: 2012 Oct 05
 
 " Please check :help html.vim for some comments and a description of the options
 
@@ -17,6 +17,9 @@ if !exists("main_syntax")
   let main_syntax = 'html'
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " don't use standard HiLink, it will not work with included syntax files
 if version < 508
   command! -nargs=+ HtmlHiLink hi link <args>
@@ -37,7 +40,7 @@ syn region  htmlString   contained start=+"+ end=+"+ contains=htmlSpecialChar,ja
 syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
 syn match   htmlValue    contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1   contains=javaScriptExpression,@htmlPreproc
 syn region  htmlEndTag             start=+</+      end=+>+ contains=htmlTagN,htmlTagError
-syn region  htmlTag                start=+<[^/]+   end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
+syn region  htmlTag                start=+<[^/]+   end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
 syn match   htmlTagN     contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
 syn match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
 syn match   htmlTagError contained "[^>]<"ms=s+1
@@ -98,11 +101,11 @@ syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
 
 " Comments (the real ones or the old netscape ones)
 if exists("html_wrong_comments")
-  syn region htmlComment                start=+<!--+    end=+--\s*>+
+  syn region htmlComment                start=+<!--+    end=+--\s*>+ contains=@Spell
 else
-  syn region htmlComment                start=+<!+      end=+>+   contains=htmlCommentPart,htmlCommentError
+  syn region htmlComment                start=+<!+      end=+>+   contains=htmlCommentPart,htmlCommentError,@Spell
   syn match  htmlCommentError contained "[^><!]"
-  syn region htmlCommentPart  contained start=+--+      end=+--\s*+  contains=@htmlPreProc
+  syn region htmlCommentPart  contained start=+--+      end=+--\s*+  contains=@htmlPreProc,@Spell
 endif
 syn region htmlComment                  start=+<!DOCTYPE+ keepend end=+>+
 
@@ -147,7 +150,8 @@ if !exists("html_no_rendering")
   syn region htmlItalicUnderlineBold contained start="<b\>" end="</b>"me=e-4 contains=@htmlTop
   syn region htmlItalicUnderlineBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop
 
-  syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc
+  syn match htmlLeadingSpace "^\s\+" contained
+  syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc
   syn region htmlH1 start="<h1\>" end="</h1>"me=e-5 contains=@htmlTop
   syn region htmlH2 start="<h2\>" end="</h2>"me=e-5 contains=@htmlTop
   syn region htmlH3 start="<h3\>" end="</h3>"me=e-5 contains=@htmlTop
@@ -164,8 +168,8 @@ if main_syntax != 'java' || exists("java_javascript")
   " JAVA SCRIPT
   syn include @htmlJavaScript syntax/javascript.vim
   unlet b:current_syntax
-  syn region  javaScript start=+<script[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
-  syn region  htmlScriptTag     contained start=+<script+ end=+>+       contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
+  syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+  syn region  htmlScriptTag     contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
   HtmlHiLink htmlScriptTag htmlTag
 
   " html events (i.e. arguments that include javascript commands)
@@ -189,7 +193,7 @@ if main_syntax != 'java' || exists("java_vb")
   " VB SCRIPT
   syn include @htmlVbScript syntax/vb.vim
   unlet b:current_syntax
-  syn region  javaScript start=+<script [^>]*language *=[^>]*vbscript[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+  syn region  javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
 endif
 
 syn cluster htmlJavaScript      add=@htmlPreproc
@@ -246,6 +250,7 @@ if version >= 508 || !exists("did_html_syn_inits")
     HtmlHiLink htmlItalicBoldUnderline     htmlBoldUnderlineItalic
     HtmlHiLink htmlItalicUnderlineBold     htmlBoldUnderlineItalic
     HtmlHiLink htmlLink                    Underlined
+    HtmlHiLink htmlLeadingSpace            None
     if !exists("html_my_rendering")
       hi def htmlBold                term=bold cterm=bold gui=bold
       hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
@@ -289,4 +294,6 @@ if main_syntax == 'html'
   unlet main_syntax
 endif
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8

diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index 13ca62ca45853ad361a86d73f60328283ae156a1..e5491b2612c1a04c4d02e81b9c37a3a35f668c32 100644 (file)
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -1,7 +1,8 @@
-" Vim syntax file " Language:    Java
+" Vim syntax file
+" Language:    Java
 " Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " URL:         http://www.fleiner.com/vim/syntax/java.vim
-" Last Change: 2011 Dec 30
+" Last Change: 2012 Oct 05
 
 " Please check :help java.vim for comments on some of the options available.
 
@@ -17,6 +18,9 @@ if !exists("main_syntax")
   syn region javaFold start="{" end="}" transparent fold
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " don't use standard HiLink, it will not work with included syntax files
 if version < 508
   command! -nargs=+ JavaHiLink hi link <args>
@@ -26,7 +30,8 @@ endif
 
 " some characters that cannot be in a java program (outside a string)
 syn match javaError "[\\@`]"
-syn match javaError "<<<\|\.\.\|=>\|<>\|||=\|&&=\|[^-]->\|\*\/"
+syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|[^-]->\|\*\/"
+
 syn match javaOK "\.\.\."
 
 " use separate name so that it can be deleted in javacc.vim
@@ -161,7 +166,7 @@ if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
   syn region  javaDocComment   start="/\*\*"  end="\*/" keepend contains=javaCommentTitle,@javaHtml,javaDocTags,javaDocSeeTag,javaTodo,@Spell
   syn region  javaCommentTitle contained matchgroup=javaDocComment start="/\*\*"   matchgroup=javaCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@javaHtml,javaCommentStar,javaTodo,@Spell,javaDocTags,javaDocSeeTag
 
-  syn region javaDocTags        contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn region javaDocTags        contained start="{@\(code\|link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
   syn match  javaDocTags        contained "@\(param\|exception\|throws\|since\)\s\+\S\+" contains=javaDocParam
   syn match  javaDocParam       contained "\s\S\+"
   syn match  javaDocTags        contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
@@ -341,5 +346,7 @@ if main_syntax == 'java'
 endif
 
 let b:spell_options="contained"
+let &cpo = s:cpo_save
+unlet s:cpo_save
 
 " vim: ts=8

diff --git a/runtime/syntax/javacc.vim b/runtime/syntax/javacc.vim
index 57c57b568c582514202e7effc993698a4fe66a1a..5458de754efecde069b16dfe83ddbec82c976947 100644 (file)
--- a/runtime/syntax/javacc.vim
+++ b/runtime/syntax/javacc.vim
@@ -2,7 +2,7 @@
 " Language:    JavaCC, a Java Compiler Compiler written by JavaSoft
 " Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " URL:         http://www.fleiner.com/vim/syntax/javacc.vim
-" Last Change: 2001 Jun 20
+" Last Change: 2012 Oct 05
 
 " Uses java.vim, and adds a few special things for JavaCC Parser files.
 " Those files usually have the extension  *.jj
@@ -15,6 +15,9 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " source the java.vim file
 if version < 600
   source <sfile>:p:h/java.vim
@@ -44,7 +47,7 @@ syn keyword javaccPackages options DEBUG_PARSER DEBUG_LOOKAHEAD DEBUG_TOKEN_MANA
 syn keyword javaccPackages COMMON_TOKEN_ACTION IGNORE_CASE CHOICE_AMBIGUITY_CHECK
 syn keyword javaccPackages OTHER_AMBIGUITY_CHECK STATIC LOOKAHEAD ERROR_REPORTING
 syn keyword javaccPackages USER_TOKEN_MANAGER  USER_CHAR_STREAM JAVA_UNICODE_ESCAPE
-syn keyword javaccPackages UNICODE_INPUT
+syn keyword javaccPackages UNICODE_INPUT JDK_VERSION
 syn match javaccPackages "PARSER_END([^)]*)"
 syn match javaccPackages "PARSER_BEGIN([^)]*)"
 syn match javaccSpecToken "<EOF>"
@@ -73,5 +76,7 @@ if version >= 508 || !exists("did_css_syn_inits")
 endif
 
 let b:current_syntax = "javacc"
+let &cpo = s:cpo_save
+unlet s:cpo_save
 
 " vim: ts=8

diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index b293eb8069ef05b6ebb37006ba1212d7676abe45..8bf677bf5f83b5db0405d510fece0cfd3dde8b4e 100644 (file)
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -7,7 +7,7 @@
 "              (ss) repaired several quoting and grouping glitches
 "              (ss) fixed regex parsing issue with multiple qualifiers [gi]
 "              (ss) additional factoring of keywords, globals, and members
-" Last Change: 2010 Mar 25
+" Last Change: 2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -23,6 +23,9 @@ if !exists("main_syntax")
   let main_syntax = 'javascript'
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " Drop fold if it set but vim doesn't support it.
 if version < 600 && exists("javaScript_fold")
   unlet javaScript_fold
@@ -131,5 +134,7 @@ let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
   unlet main_syntax
 endif
+let &cpo = s:cpo_save
+unlet s:cpo_save
 
 " vim: ts=8

diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index e9d7ee99d6a42522d6411a28481d60ae65a409ef..6fd46aaa545288a1c2725d70685009f24af3fe46 100644 (file)
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -2,7 +2,7 @@
 " Language:    Makefile
 " Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " URL:         http://www.fleiner.com/vim/syntax/make.vim
-" Last Change: 2008 Aug 04
+" Last Change: 2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -12,6 +12,10 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
+
 " some special characters
 syn match makeSpecial  "^\s*[@+-]\+"
 syn match makeNextLine "\\\n\s*"
@@ -25,8 +29,8 @@ syn match makeOverride        "^ *override"
 hi link makeOverride makeStatement
 hi link makeExport makeStatement
 
-" Koehler: catch unmatched define/endef keywords.  endef only matches it is by itself on a line
-syn region makeDefine start="^\s*define\s" end="^\s*endef\s*$" contains=makeStatement,makeIdent,makePreCondit,makeDefine
+" catch unmatched define/endef keywords.  endef only matches it is by itself on a line, possibly followed by a commend
+syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$" contains=makeStatement,makeIdent,makePreCondit,makeDefine
 
 " Microsoft Makefile specials
 syn case ignore
@@ -48,8 +52,8 @@ syn match makeConfig "@[A-Za-z0-9_]\+@"
 
 " make targets
 " syn match makeSpecTarget     "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>"
-syn match makeImplicit         "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource
 syn match makeImplicit         "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 nextgroup=makeSource
+syn match makeImplicit         "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource
 
 syn region makeTarget  transparent matchgroup=makeTarget start="^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands
 syn match makeTarget           "^[A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget skipnl nextgroup=makeCommands,makeCommandError
@@ -134,4 +138,6 @@ endif
 
 let b:current_syntax = "make"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8

diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index 2734ee8ca353e5fd95d0beb69011ed5c2ccb26e6..69b3d3621906ccdd0e560494b24d73828ee90528 100644 (file)
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -633,7 +633,7 @@ Note:  
   3. ¤Ç¤Ï :w TEST ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦ (TEST ¤Ï¡¢Áª¤ó¤À¥Õ¥¡¥¤¥ë̾¤Ç¤¹)¡£
 
   4. ¤³¤ì¤Ë¤è¤ê¥Õ¥¡¥¤¥ëÁ´ÂΤ¬ TEST ¤È¤¤¤¦Ì¾Á°¤ÇÊݸ¤µ¤ì¤Þ¤¹¡£
-     ¤â¤¦°ìÅÙ :!dir ¤â¤·¤¯¤Ï !ls ¤È¥¿¥¤¥×¤·¤Æ³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£
+     ¤â¤¦°ìÅÙ :!dir ¤â¤·¤¯¤Ï :!ls ¤È¥¿¥¤¥×¤·¤Æ³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£
 
 Note: ¤³¤³¤Ç Vim ¤ò½ªÎ»¤·¡¢¥Õ¥¡¥¤¥ë̾ TEST ¤È¶¦¤Ëµ¯Æ°¤¹¤ë¤È¡¢Êݸ¤·¤¿»þ¤Î
      ¥Á¥å¡¼¥È¥ê¥¢¥ë¤ÎÊ£À½¤¬¤Ç¤­¾å¤¬¤ë¤Ï¤º¤Ç¤¹¡£

diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index fe3be23b4418531fd8430f196cb0a015461a3b4b..6880cd3ae383e4fd324abd3cb73f8a037835c62b 100644 (file)
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -633,7 +633,7 @@ Note:  
   3. \82Å\82Í :w TEST \82Æ\83^\83C\83v\82µ\82Ü\82µ\82å\82¤ (TEST \82Í\81A\91I\82ñ\82¾\83t\83@\83C\83\8b\96¼\82Å\82·)\81B
 
   4. \82±\82ê\82É\82æ\82è\83t\83@\83C\83\8b\91S\91Ì\82ª TEST \82Æ\82¢\82¤\96¼\91O\82Å\95Û\91¶\82³\82ê\82Ü\82·\81B
-     \82à\82¤\88ê\93x :!dir \82à\82µ\82­\82Í !ls \82Æ\83^\83C\83v\82µ\82Ä\8am\94F\82µ\82Ä\82Ý\82Ü\82µ\82å\82¤\81B
+     \82à\82¤\88ê\93x :!dir \82à\82µ\82­\82Í :!ls \82Æ\83^\83C\83v\82µ\82Ä\8am\94F\82µ\82Ä\82Ý\82Ü\82µ\82å\82¤\81B
 
 Note: \82±\82±\82Å Vim \82ð\8fI\97¹\82µ\81A\83t\83@\83C\83\8b\96¼ TEST \82Æ\8b¤\82É\8bN\93®\82·\82é\82Æ\81A\95Û\91¶\82µ\82½\8e\9e\82Ì
      \83`\83\85\81[\83g\83\8a\83A\83\8b\82Ì\95¡\90»\82ª\82Å\82«\8fã\82ª\82é\82Í\82¸\82Å\82·\81B

diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index a620cd57a3dc1b6ec99789e49105d4fcf1c336a3..248d696e842cb99a5b6d0f4dcdd8d71a038c00ae 100644 (file)
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -633,7 +633,7 @@ Note:  全ての : コマンドは <ENTER> を押して終了しなければな
   3. では :w TEST とタイプしましょう (TEST は、選んだファイル名です)。
 
   4. これによりファイル全体が TEST という名前で保存されます。
-     もう一度 :!dir もしくは !ls とタイプして確認してみましょう。
+     もう一度 :!dir もしくは :!ls とタイプして確認してみましょう。
 
 Note: ここで Vim を終了し、ファイル名 TEST と共に起動すると、保存した時の
      チュートリアルの複製ができ上がるはずです。