Skip to content

Commit 5f72aed

Browse files
committed
Merge remote-tracking branch 'macvim/vim' into kaoriya
2 parents 3ac0cac + a7aeaef commit 5f72aed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+3138
-2060
lines changed

.hgtags

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2751,3 +2751,33 @@ d5eb32dc231cd870c562e7b0be96fa994b505d9f v7-4-019
27512751
c1ae5baa41f47bbf96be81e0158707a88af48b34 v7-4-020
27522752
c514693882b9f1c7be2e76a0307926df799da3ea v7-4-021
27532753
965044860b7f4884657fcaa042853238c7b13e69 v7-4-022
2754+
09361f13580b075b6e87707c47165e8d45ee98a5 v7-4-023
2755+
00d61a47df66cad21b80c6a683164e8d19180045 v7-4-024
2756+
9085d32d7424963013650805452ede5dad22211c v7-4-025
2757+
6bbb2ae990c92f6858b86c047e16dd12183d4273 v7-4-026
2758+
73cc7272de5e0173b9578f715c4794a8b3803bce v7-4-027
2759+
923738744a60e5e0bd2d9990758a2169106807ca v7-4-028
2760+
2d3fbc68b3a84ad2bf4d58c77244043328e3fb81 v7-4-029
2761+
0978e99043d2a9faedb1a3bad75b59121c270bde v7-4-030
2762+
b21b5dcdca2197fc86b9bde77bd6777f0e2d5175 v7-4-031
2763+
71e92a1cb37db719d6406858a50ca3bdfc9881fb v7-4-032
2764+
91f6a28e010d49ae73c13c85dbb8b14c9e5edb36 v7-4-033
2765+
22dfcd1494e4f7ea8ddc96e8dd895482e77e3b5a v7-4-034
2766+
5481f188dcbb7143596f2d470c7d674bf36efe64 v7-4-035
2767+
90e2f0729a0df249931a2dbe5f4310ba6c91cab4 v7-4-036
2768+
c3d379c2a115b957d82eaa5f2215b688f36a22da v7-4-037
2769+
6daa78b6b99a2ec07d20336db47c9f8165098062 v7-4-038
2770+
4dfba3df303c51fe31efd1255338e9fcbedc5401 v7-4-039
2771+
8336fd924e057d8c797043430325379d9a3ae37b v7-4-040
2772+
408f2a1a953feef25a2c5c96352c82674655e797 v7-4-041
2773+
70915ede509a737ac78c421f43c4447c9682ba41 v7-4-042
2774+
6d11572e2c8b1117b90adf588ff1467b185c1b57 v7-4-043
2775+
c0e3990aed3f179ef006e6de1458e9818c9ab896 v7-4-044
2776+
8ced827b2e8ba49f9ae0da2033670fee83e7b55b v7-4-045
2777+
68056d414f09fccb39219d7fde77fa06769ffa3b v7-4-046
2778+
c21b2f52f1dd003d860e3b574602ed3fdc2b4f1c v7-4-047
2779+
31c9acfeda8f1b84d51a480c1efbb56f384e76b1 v7-4-048
2780+
15c1b8a20da6d650ee3ed0e73c2e3832093b60dd v7-4-049
2781+
eb33cadafcabfc9cb3fc0741e169e84cafec11f8 v7-4-050
2782+
e7a2f217a385e6aebfddc4d29182924ac017d262 v7-4-051
2783+
b9c1c1f4cda9b82a2e703feec441d865b4722d56 v7-4-052
Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
" Vim completion script
2-
" Language: Clojure
3-
" Maintainer: Sung Pae <[email protected]>
4-
" URL: https://github.com/guns/vim-clojure-static
5-
" License: Same as Vim
6-
" Last Change: 05 February 2013
2+
" Language: Clojure
3+
" Maintainer: Sung Pae <[email protected]>
4+
" URL: https://github.com/guns/vim-clojure-static
5+
" License: Same as Vim
6+
" Last Change: 08 September 2013
77

88
" Special forms and public vars in clojure.core
9-
" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-002/vim_clojure_static.clj
10-
" Clojure 1.5.0-RC6
11-
let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*read-whitelist*","*source-path*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn","bound-fn*","bound?","butlast","byte","byte-array","bytes","case","cast","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","doubles","drop","drop-last","drop-while","empty","empty?","ensure","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-set","identical?","identity","if","if-let","if-not","ifn?","import","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","quot","quote","rand","rand-int","rand-nth","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","realized?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some->","some->>","some-fn","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","sync","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","update-in","update-proxy","use","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","when","when-first","when-let","when-not","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
9+
" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-005/clj/src/vim_clojure_static/generate.clj
10+
" Clojure version 1.5.1
11+
let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*source-path*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn","bound-fn*","bound?","butlast","byte","byte-array","bytes","case","cast","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","doubles","drop","drop-last","drop-while","empty","empty?","ensure","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-set","identical?","identity","if","if-let","if-not","ifn?","import","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","quot","quote","rand","rand-int","rand-nth","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","realized?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some->","some->>","some-fn","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","sync","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","update-in","update-proxy","use","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","when","when-first","when-let","when-not","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
1212

1313
" Simple word completion omnifunc
1414
function! clojurecomplete#Complete(findstart, base)
15-
if a:findstart
16-
return searchpos('\<', 'bnW', line('.'))[1] - 1
17-
else
18-
return { 'words': filter(copy(s:words), 'v:val =~ "\\V\\^' . a:base . '"') }
19-
endif
15+
if a:findstart
16+
return searchpos('\<', 'bnW', line('.'))[1] - 1
17+
else
18+
return { 'words': filter(copy(s:words), 'v:val =~ "\\V\\^' . a:base . '"') }
19+
endif
2020
endfunction
21+
22+
" vim:sts=8:sw=8:ts=8:noet

runtime/doc/change.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.4. Last change: 2013 Jul 17
1+
*change.txt* For Vim version 7.4. Last change: 2013 Aug 25
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1069,6 +1069,11 @@ another register. E.g., yank the text to copy, Visually select the text to
10691069
replace and use "0p . You can repeat this as many times as you like, the
10701070
unnamed register will be changed each time.
10711071

1072+
When you use a blockwise Visual mode command and yank only a single line into
1073+
a register, a paste on a visual selected area will paste that single line on
1074+
each of the selected lines (thus replacing the blockwise selected region by a
1075+
block of the pasted line).
1076+
10721077
*blockwise-register*
10731078
If you use a blockwise Visual mode command to get the text into the register,
10741079
the block of text will be inserted before ("P") or after ("p") the cursor
@@ -1126,6 +1131,8 @@ less than one line (the small delete register is used then). An exception is
11261131
made for the delete operator with these movement commands: |%|, |(|, |)|, |`|,
11271132
|/|, |?|, |n|, |N|, |{| and |}|. Register "1 is always used then (this is Vi
11281133
compatible). The "- register is used as well if the delete is within a line.
1134+
Note that these characters may be mapped. E.g. |%| is mapped by the matchit
1135+
plugin.
11291136
With each successive deletion or change, Vim shifts the previous contents
11301137
of register 1 into register 2, 2 into 3, and so forth, losing the previous
11311138
contents of register 9.

runtime/doc/diff.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*diff.txt* For Vim version 7.4. Last change: 2013 Jul 07
1+
*diff.txt* For Vim version 7.4. Last change: 2013 Sep 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -123,10 +123,14 @@ Since the option values are remembered with the buffer, you can edit another
123123
file for a moment and come back to the same file and be in diff mode again.
124124

125125
*:diffo* *:diffoff*
126-
:diffo[ff] Switch off diff mode for the current window.
126+
:diffo[ff] Switch off diff mode for the current window. Resets related
127+
options also when 'diff' was not set.
127128

128129
:diffo[ff]! Switch off diff mode for the current window and in all windows
129-
in the current tab page where 'diff' is set.
130+
in the current tab page where 'diff' is set. Resetting
131+
related options only happens in a window that has 'diff' set,
132+
if the current window does not have 'diff' set then no options
133+
in it are changed.
130134

131135
The ":diffoff" command resets the relevant options to the values they had when
132136
using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode.

0 commit comments

Comments
 (0)