# HG changeset patch # User Bram Moolenaar # Date 1395955807 -3600 # Node ID c52a655d927d02b3358541d2fd3e1d21de7ea4ad # Parent 0fce068e5803281470561c30488941033490d09b Update runtime files. diff --git a/runtime/autoload/clojurecomplete.vim b/runtime/autoload/clojurecomplete.vim --- a/runtime/autoload/clojurecomplete.vim +++ b/runtime/autoload/clojurecomplete.vim @@ -3,19 +3,19 @@ " Maintainer: Sung Pae " URL: https://github.com/guns/vim-clojure-static " License: Same as Vim -" Last Change: 08 September 2013 +" Last Change: 27 March 2014 -" Special forms and public vars in clojure.core -" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-005/clj/src/vim_clojure_static/generate.clj -" Clojure version 1.5.1 -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"] +" -*- COMPLETION WORDS -*- +" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj +" Clojure version 1.6.0 +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-ordered-coll","hash-set","hash-unordered-coll","identical?","identity","if","if-let","if-not","if-some","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","mix-collection-hash","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?","record?","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","some?","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","unsigned-bit-shift-right","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","when-some","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"] -" Simple word completion omnifunc +" Simple word completion for special forms and public vars in clojure.core function! clojurecomplete#Complete(findstart, base) if a:findstart return searchpos('\<', 'bnW', line('.'))[1] - 1 else - return { 'words': filter(copy(s:words), 'v:val =~ "\\V\\^' . a:base . '"') } + return { 'words': filter(copy(s:words), 'v:val =~# "\\V\\^' . a:base . '"') } endif endfunction diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.4. Last change: 2013 Apr 27 +*develop.txt* For Vim version 7.4. Last change: 2014 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -19,7 +19,6 @@ code. Vim is open source software. Everybody is encouraged to contribute to help improving Vim. For sending patches a context diff "diff -c" is preferred. -Also see http://www.vim.org/tips/tip.php?tip_id=618. Also see http://vim.wikia.com/wiki/How_to_make_and_submit_a_patch. ============================================================================== diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2014 Mar 22 +*eval.txt* For Vim version 7.4. Last change: 2014 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5978,7 +5978,7 @@ tabpagenr([{arg}]) *tabpagenr()* The number can be used with the |:tab| command. -tabpagewinnr({tabarg}, [{arg}]) *tabpagewinnr()* +tabpagewinnr({tabarg} [, {arg}]) *tabpagewinnr()* Like |winnr()| but for tab page {tabarg}. {tabarg} specifies the number of tab page to be used. {arg} is used like with |winnr()|: @@ -7481,11 +7481,19 @@ 7. Commands *expression-commands* :execute "!ls " . shellescape(filename, 1) < Note: The executed string may be any command-line, but - you cannot start or end a "while" or "for" command. - Thus this is illegal: > - :execute 'while i > 5' - :execute 'echo "test" | break' - :endwhile + starting or ending "if", "while" and "for" does not + always work, because when commands are skipped the + ":execute" is not evaluated and Vim loses track of + where blocks start and end. Also "break" and + "continue" should not be inside ":execute". + This example does not work, because the ":execute" is + not evaluated and Vim does not see the "while", and + gives an error for finding an ":endwhile": > + :if 0 + : execute 'while i > 5' + : echo "test" + : endwhile + :endif < It is allowed to have a "while" or "if" command completely in the executed string: > diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -686,7 +686,7 @@ two spaces relative to the opening paren baz) < Setting this option changes this behavior so that all subforms are aligned to -the same column: +the same column, emulating the default behavior of clojure-mode.el: > (foo bar @@ -698,7 +698,6 @@ This option is off by default. let g:clojure_align_subforms = 0 < - FORTRAN *ft-fortran-indent* Block if, select case, where, and forall constructs are indented. So are diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.4. Last change: 2014 Mar 22 +*index.txt* For Vim version 7.4. Last change: 2014 Mar 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1361,13 +1361,14 @@ tag command action ~ |:nmenu| :nme[nu] add menu for Normal mode |:nnoremap| :nn[oremap] like ":noremap" but for Normal mode |:nnoremenu| :nnoreme[nu] like ":noremenu" but for Normal mode -|:noautocmd| :noa[utocmd] following command don't trigger autocommands +|:noautocmd| :noa[utocmd] following commands don't trigger autocommands |:noremap| :no[remap] enter a mapping that will not be remapped |:nohlsearch| :noh[lsearch] suspend 'hlsearch' highlighting |:noreabbrev| :norea[bbrev] enter an abbreviation that will not be remapped |:noremenu| :noreme[nu] enter a menu that will not be remapped |:normal| :norm[al] execute Normal mode commands +|:noswapfile| :nos[wapfile] following commands don't create a swap file |:number| :nu[mber] print lines with line number |:nunmap| :nun[map] like ":unmap" but for Normal mode |:nunmenu| :nunme[nu] remove menu for Normal mode diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2013 Dec 04 +*options.txt* For Vim version 7.4. Last change: 2014 Mar 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -6882,6 +6882,8 @@ A jump table for the options with a shor immediately deleted. When 'swapfile' is set, and 'updatecount' is non-zero, a swap file is immediately created. Also see |swap-file| and |'swapsync'|. + If you want to open a new buffer without creating a swap file for it, + use the |:noswapfile| modifier. This option is used together with 'bufhidden' and 'buftype' to specify special kinds of buffers. See |special-buffers|. diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.4. Last change: 2014 Mar 22 +*quickfix.txt* For Vim version 7.4. Last change: 2014 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -203,7 +203,7 @@ command with 'l'. list. *:cad* *:caddbuffer* -:caddb[uffer] [bufnr] Read the error list from the current buffer and add +:cad[dbuffer] [bufnr] Read the error list from the current buffer and add the errors to the current quickfix list. If a quickfix list is not present, then a new list is created. Otherwise, same as ":cbuffer". @@ -241,7 +241,7 @@ command with 'l'. current window is used instead of the quickfix list. *:cadde* *:caddexpr* -:cad[dexpr] {expr} Evaluate {expr} and add the resulting lines to the +:cadde[xpr] {expr} Evaluate {expr} and add the resulting lines to the current quickfix list. If a quickfix list is not present, then a new list is created. The current cursor position will not be changed. See |:cexpr| for @@ -304,18 +304,23 @@ 2. The error window *quickfix-window *:cope* *:copen* *w:quickfix_title* :cope[n] [height] Open a window to show the current list of errors. + When [height] is given, the window becomes that high - (if there is room). Otherwise the window is made ten - lines high. + (if there is room). When [height] is omitted the + window is made ten lines high. + + If there already is a quickfix window, it will be made + the current window. It is not possible to open a + second quickfix window. If [height] is given the + existing window will be resized to it. + The window will contain a special buffer, with 'buftype' equal to "quickfix". Don't change this! - If there already is a quickfix window, it will be made - the current window. It is not possible to open a - second quickfix window. The window will have the - w:quickfix_title variable set which will indicate the - command that produced the quickfix list. This can be - used to compose a custom status line if the value of - 'statusline' is adjusted properly. + The window will have the w:quickfix_title variable set + which will indicate the command that produced the + quickfix list. This can be used to compose a custom + status line if the value of 'statusline' is adjusted + properly. *:lop* *:lopen* :lop[en] [height] Open a window to show the location list for the diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -1,4 +1,4 @@ -*recover.txt* For Vim version 7.4. Last change: 2010 Jul 20 +*recover.txt* For Vim version 7.4. Last change: 2014 Mar 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -84,7 +84,7 @@ created anyway. The 'swapfile' option can be reset to avoid creating a swapfile. And the |:noswapfile| modifier can be used to not create a swapfile for a new buffer. -:noswap[file] {command} *:noswap* *:noswapfile* +:noswap[file] {command} *:nos* *:noswapfile* Execute {command}. If it contains a command that loads a new buffer, it will be loaded without creating a swapfile and the 'swapfile' option will be reset. If a buffer already had a diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.4. Last change: 2014 Feb 11 +*repeat.txt* For Vim version 7.4. Last change: 2014 Mar 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -588,6 +588,12 @@ the |+reltime| feature, which is present For profiling syntax highlighting see |:syntime|. +For example, to profile the one_script.vim script file: > + :profile start /tmp/one_script_profile + :profile file one_script.vim + :source one_script.vim + :exit + :prof[ile] start {fname} *:prof* *:profile* *E750* Start profiling, write the output in {fname} upon exit. @@ -612,8 +618,10 @@ For profiling syntax highlighting see |: This only profiles the script itself, not the functions defined in it. When the [!] is added then all functions defined in the script - will also be profiled. But only if the script is loaded after - this command. + will also be profiled. + Note that profiling only starts when the script is loaded + after this command. A :profile command in the script itself + won't work. :profd[el] ... *:profd* *:profdel* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1022,6 +1022,21 @@ Or to avoid the highlighting: > This works immediately. +CLOJURE *ft-clojure-syntax* + +Setting *g:clojure_fold* enables folding Clojure code via the syntax engine. +Any list, vector, or map that extends over more than one line can be folded +using the standard Vim |fold-commands|. + +Please note that this option does not work with scripts that redefine the +bracket syntax regions, such as rainbow-parentheses plugins. + +This option is off by default. +> + " Default + let g:clojure_fold = 0 +< + COBOL *cobol.vim* *ft-cobol-syntax* COBOL highlighting has different needs for legacy code than it does for fresh diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2530,6 +2530,8 @@ 90.5 usr_90.txt /*90.5* :norm various.txt /*:norm* :normal various.txt /*:normal* :normal-range various.txt /*:normal-range* +:nos recover.txt /*:nos* +:noswapfile recover.txt /*:noswapfile* :nu various.txt /*:nu* :number various.txt /*:number* :nun map.txt /*:nun* @@ -4308,6 +4310,7 @@ E879 syntax.txt /*E879* E88 windows.txt /*E88* E880 if_pyth.txt /*E880* E881 autocmd.txt /*E881* +E882 eval.txt /*E882* E89 message.txt /*E89* E90 message.txt /*E90* E91 options.txt /*E91* @@ -5725,6 +5728,7 @@ ft-changelog-plugin filetype.txt /*ft-ch ft-changelog-syntax syntax.txt /*ft-changelog-syntax* ft-chill-syntax syntax.txt /*ft-chill-syntax* ft-clojure-indent indent.txt /*ft-clojure-indent* +ft-clojure-syntax syntax.txt /*ft-clojure-syntax* ft-cobol-syntax syntax.txt /*ft-cobol-syntax* ft-coldfusion-syntax syntax.txt /*ft-coldfusion-syntax* ft-cpp-syntax syntax.txt /*ft-cpp-syntax* @@ -5895,6 +5899,7 @@ g:ada_with_gnat_project_files ft_ada.txt g:ada_withuse_ordinary ft_ada.txt /*g:ada_withuse_ordinary* g:clojure_align_multiline_strings indent.txt /*g:clojure_align_multiline_strings* g:clojure_align_subforms indent.txt /*g:clojure_align_subforms* +g:clojure_fold syntax.txt /*g:clojure_fold* g:clojure_fuzzy_indent indent.txt /*g:clojure_fuzzy_indent* g:clojure_fuzzy_indent_blacklist indent.txt /*g:clojure_fuzzy_indent_blacklist* g:clojure_fuzzy_indent_patterns indent.txt /*g:clojure_fuzzy_indent_patterns* @@ -8316,6 +8321,7 @@ undo_ftplugin usr_41.txt /*undo_ftplugin undofile() eval.txt /*undofile()* undotree() eval.txt /*undotree()* unicode mbyte.txt /*unicode* +uniq() eval.txt /*uniq()* unix os_unix.txt /*unix* unlisted-buffer windows.txt /*unlisted-buffer* up-down-motions motion.txt /*up-down-motions* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2014 Mar 22 +*todo.txt* For Vim version 7.4. Last change: 2014 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -66,18 +66,8 @@ when an option is set? Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15) -Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in -ftplugins. - Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) -Patch to add :noswapfile modifier. (Christian Brabandt, 2014 Mar 13) - -Patch to make ":sp {current-buffer-name}" not reload the buffer. -(Christian Brabandt, 2013 Mar 13) - -Patch for quickfix window resizing. Issue 199. (Christian Brabandt) - Using autoconf 2.69 gives a lot of warnings. Problem with 'spellsuggest' file, only works for some words. @@ -86,13 +76,6 @@ Additional remark by glts: the suggested Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21) -Patch to use rubyarchhdrdir for Ruby 2.x. (James McCoy, 2014 Feb 24) - -Dynamic Ruby linking issues. Patch by Danek Duvall (2014 Feb 26) -and by Yukihiro Nakadaira (2014 Feb 27) - -Patch: Detect grep options for Solaris. (Danek Duvall, 2014 Feb 26) - Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19) Syntax file for gnuplot. Existing one is very old. (Andrew Rasmussen, 2014 @@ -135,6 +118,40 @@ Patch to make has() check for Vim versio Regression on pach 7.4.034. (Ingo Karkat, 2013 Nov 20) +Include a plugin manager with Vim? Neobundle seems to be the best currently. +Long message about this from ZyX, 2014 Mar 23. And following replies. +Also see http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html +User view: +- Support multiple sources, basically any http:// URL. Be able to look into + the files before deciding to install. +- Be able to try out a plugin and remove it again with (almost) no traces. +- Each plugin needs a "manifest" file that has the version, dependencies + (including Vim version and features), conflicts, list of files, etc. + Updater uses that to decide what/how to update. + Dependencies can use a URL for specific versions, or short name for scripts + on vim.org. +- Once a plugin is installed it remembers where it came from, updater checks + there. Can manually update when really needed. +- Must be possible to install for one user. Also system wide? +- Can edit plugin config with Vim. Can temporarily disable a plugin. +- Run the update manually, find latest version and install. +- Be able to download without special tools, must work for 95% of users. +Implementation: +- Avoid the 'runtimepath' getting long. Need some other way to keep each + plugin separate. +- When installing or updating, first figure out what needs to be done. This + may involve recursively fetching manifest files for dependencies. Then show + the user what's going to change and ask for OK. +- Scripts on Vim.org must be able to consist of several files. Is zip format + sufficient? Upload the manifest? Or refer to a site that has the manifest? +- Best is to fetch individual files or use a Vimball. Reduces dependency on + tools that might be missing and allows inspection of the files before + installing. +Out of scope: +- Overview of plugins, ratings, comments, etc. That's another world. +- Development work on plugins (although diff with distributed version would be + useful). + Patch to include smack support (Linux security library). (Jose Bollo, 2014 Jan 14) Update Jan 15. @@ -158,7 +175,7 @@ Patch to make test 100 work on MS-Window Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14) Patch to add sortuniq(). (Cade Forester, 2014 Mar 19) -Or add uniq() instead? +Or add uniq() instead? Patch by lcd47, but it has problems. Perl: support for Activestate perl 5.18: Issue 170. @@ -351,6 +368,7 @@ MS-Windows: Crash opening very long file Patch to have text objects defined by arbitrary single characters. (Daniel Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31) Ben Fritz: problem with 'selection' set to "exclusive". +Updated to current Vim, not quite right yet. (Ben Fritz, 2014 Mar 27) Patch to select the next or previous text object if there isn't one under the cursor. (Daniel Thau, 2013 Nov 20) diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -623,6 +623,7 @@ List manipulation: *list-functions* map() change each List item sort() sort a List reverse() reverse the order of a List + uniq() remove copies of repeated adjacent items split() split a String into a List join() join List items into a String range() return a List with a sequence of numbers diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.4. Last change: 2013 May 18 +*various.txt* For Vim version 7.4. Last change: 2014 Mar 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -418,7 +418,7 @@ N *+user_commands* User-defined command N *+viminfo* |'viminfo'| N *+vertsplit* Vertically split windows |:vsplit| N *+virtualedit* |'virtualedit'| -S *+visual* Visual mode |Visual-mode| +S *+visual* Visual mode |Visual-mode| Always enabled since 7.4.200. N *+visualextra* extra Visual mode commands |blockwise-operators| N *+vreplace* |gR| and |gr| N *+wildignore* |'wildignore'| diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 7.4. Last change: 2013 Nov 02 +*visual.txt* For Vim version 7.4. Last change: 2014 Mar 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -22,7 +22,7 @@ 8. Select mode |Select-mode| {Vi has no Visual mode, the name "visual" is used for Normal mode, to distinguish it from Ex mode} -{not available when the |+visual| feature was disabled when compiling} +{Since Vim 7.4.200 the |+visual| feature is always included} ============================================================================== 1. Using Visual mode *visual-use* diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.4. Last change: 2012 Nov 15 +*windows.txt* For Vim version 7.4. Last change: 2014 Mar 25 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/ftplugin/clojure.vim b/runtime/ftplugin/clojure.vim --- a/runtime/ftplugin/clojure.vim +++ b/runtime/ftplugin/clojure.vim @@ -5,7 +5,7 @@ " Maintainer: Sung Pae " URL: https://github.com/guns/vim-clojure-static " License: Same as Vim -" Last Change: 16 February 2014 +" Last Change: 27 March 2014 if exists("b:did_ftplugin") finish @@ -23,9 +23,8 @@ setlocal iskeyword+=?,-,*,!,+,/,=,<,>,., " of user-defined def* definitions. setlocal define=\\v[(/]def(ault)@!\\S* -" Remove 't' from 'formatoptions' to avoid auto-wrapping code. The '+=croql' -" is standard ftplugin boilerplate, although it is arguably intrusive. -setlocal formatoptions-=t formatoptions+=croql +" Remove 't' from 'formatoptions' to avoid auto-wrapping code. +setlocal formatoptions-=t " Lisp comments are routinely nested (e.g. ;;; SECTION HEADING) setlocal comments=n:; @@ -43,8 +42,9 @@ setlocal commentstring=;\ %s " Functions that accept a flat list of forms do not treat the first argument " specially and hence are not indented specially. " -" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-009/clj/src/vim_clojure_static/generate.clj -setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doall,dorun,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test +" -*- LISPWORDS -*- +" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj +setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test " Provide insert mode completions for special forms and clojure.core. As " 'omnifunc' is set by popular Clojure REPL client plugins, we also set diff --git a/runtime/indent/clojure.vim b/runtime/indent/clojure.vim --- a/runtime/indent/clojure.vim +++ b/runtime/indent/clojure.vim @@ -6,7 +6,7 @@ " Maintainer: Sung Pae " URL: https://github.com/guns/vim-clojure-static " License: Same as Vim -" Last Change: 16 February 2014 +" Last Change: 27 March 2014 " TODO: Indenting after multibyte characters is broken: " (let [Δ (if foo @@ -70,7 +70,7 @@ if exists("*searchpairpos") endfunction function! s:IsParen() - return s:CurrentChar() =~ '\v[\(\)\[\]\{\}]' && + return s:CurrentChar() =~# '\v[\(\)\[\]\{\}]' && \ s:SynIdName() !~? '\vstring|regex|comment|character' endfunction @@ -82,7 +82,7 @@ if exists("*searchpairpos") \ ? a:patterns \ : map(split(a:patterns, ','), '"^" . v:val . "$"') for pat in list - if a:string =~ pat | return 1 | endif + if a:string =~# pat | return 1 | endif endfor endfunction @@ -148,6 +148,10 @@ if exists("*searchpairpos") return val endfunction + function! s:StripNamespaceAndMacroChars(word) + return substitute(a:word, "\\v%(.*/|[#'`~@^,]*)(.*)", '\1', '') + endfunction + function! s:ClojureIsMethodSpecialCaseWorker(position) " Find the next enclosing form. call search('\S', 'Wb') @@ -167,7 +171,8 @@ if exists("*searchpairpos") call cursor(nextParen) call search('\S', 'W') - if g:clojure_special_indent_words =~ '\<' . s:CurrentWord() . '\>' + let w = s:StripNamespaceAndMacroChars(s:CurrentWord()) + if g:clojure_special_indent_words =~# '\V\<' . w . '\>' return 1 endif @@ -273,9 +278,9 @@ if exists("*searchpairpos") " metacharacters. " " e.g. clojure.core/defn and #'defn should both indent like defn. - let ww = substitute(w, "\\v%(.*/|[#'`~@^,]*)(.*)", '\1', '') + let ww = s:StripNamespaceAndMacroChars(w) - if &lispwords =~ '\V\<' . ww . '\>' + if &lispwords =~# '\V\<' . ww . '\>' return paren[1] + &shiftwidth - 1 endif diff --git a/runtime/syntax/bib.vim b/runtime/syntax/bib.vim --- a/runtime/syntax/bib.vim +++ b/runtime/syntax/bib.vim @@ -2,7 +2,7 @@ " Language: BibTeX (bibliographic database format for (La)TeX) " Maintainer: Bernd Feige " Filenames: *.bib -" Last Change: 2011 Dec 25 +" Last Change: 2014 Mar 26 " Thanks to those who pointed out problems with this file or supplied fixes! @@ -28,7 +28,7 @@ syn keyword bibType contained article bo syn keyword bibType contained incollection inproceedings manual syn keyword bibType contained mastersthesis misc phdthesis syn keyword bibType contained proceedings techreport unpublished -syn keyword bibType contained string +syn keyword bibType contained string preamble syn keyword bibEntryKw contained address annote author booktitle chapter syn keyword bibEntryKw contained crossref edition editor howpublished diff --git a/runtime/syntax/clojure.vim b/runtime/syntax/clojure.vim --- a/runtime/syntax/clojure.vim +++ b/runtime/syntax/clojure.vim @@ -9,24 +9,29 @@ " Maintainer: Sung Pae " URL: https://github.com/guns/vim-clojure-static " License: Same as Vim -" Last Change: 16 December 2013 +" Last Change: 27 March 2014 if exists("b:current_syntax") finish endif -" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-007/clj/src/vim_clojure_static/generate.clj -" Clojure version 1.5.1 +if has("folding") && exists("g:clojure_fold") && g:clojure_fold > 0 + setlocal foldmethod=syntax +endif + +" -*- KEYWORDS -*- +" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj +" Clojure version 1.6.0 syntax keyword clojureConstant nil syntax keyword clojureBoolean false true syntax keyword clojureSpecial . catch clojure.core/fn clojure.core/let clojure.core/loop def do finally fn if let loop monitor-enter monitor-exit new quote recur set! throw try var syntax keyword clojureException catch finally throw try -syntax keyword clojureCond case clojure.core/case clojure.core/cond clojure.core/cond-> clojure.core/cond->> clojure.core/condp clojure.core/if-let clojure.core/if-not clojure.core/when clojure.core/when-first clojure.core/when-let clojure.core/when-not cond cond-> cond->> condp if-let if-not when when-first when-let when-not -syntax keyword clojureRepeat clojure.core/doall clojure.core/dorun clojure.core/doseq clojure.core/dotimes clojure.core/while doall dorun doseq dotimes while +syntax keyword clojureCond case clojure.core/case clojure.core/cond clojure.core/cond-> clojure.core/cond->> clojure.core/condp clojure.core/if-let clojure.core/if-not clojure.core/if-some clojure.core/when clojure.core/when-first clojure.core/when-let clojure.core/when-not clojure.core/when-some cond cond-> cond->> condp if-let if-not if-some when when-first when-let when-not when-some +syntax keyword clojureRepeat clojure.core/doseq clojure.core/dotimes clojure.core/while doseq dotimes while syntax keyword clojureDefine clojure.core/definline clojure.core/definterface clojure.core/defmacro clojure.core/defmethod clojure.core/defmulti clojure.core/defn clojure.core/defn- clojure.core/defonce clojure.core/defprotocol clojure.core/defrecord clojure.core/defstruct clojure.core/deftype definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype syntax keyword clojureMacro -> ->> .. amap and areduce as-> assert binding bound-fn clojure.core/-> clojure.core/->> clojure.core/.. clojure.core/amap clojure.core/and clojure.core/areduce clojure.core/as-> clojure.core/assert clojure.core/binding clojure.core/bound-fn clojure.core/comment clojure.core/declare clojure.core/delay clojure.core/dosync clojure.core/doto clojure.core/extend-protocol clojure.core/extend-type clojure.core/for clojure.core/future clojure.core/gen-class clojure.core/gen-interface clojure.core/import clojure.core/io! clojure.core/lazy-cat clojure.core/lazy-seq clojure.core/letfn clojure.core/locking clojure.core/memfn clojure.core/ns clojure.core/or clojure.core/proxy clojure.core/proxy-super clojure.core/pvalues clojure.core/refer-clojure clojure.core/reify clojure.core/some-> clojure.core/some->> clojure.core/sync clojure.core/time clojure.core/with-bindings clojure.core/with-in-str clojure.core/with-loading-context clojure.core/with-local-vars clojure.core/with-open clojure.core/with-out-str clojure.core/with-precision clojure.core/with-redefs comment declare delay dosync doto extend-protocol extend-type for future gen-class gen-interface import io! lazy-cat lazy-seq letfn locking memfn ns or proxy proxy-super pvalues refer-clojure reify some-> some->> sync time with-bindings with-in-str with-loading-context with-local-vars with-open with-out-str with-precision with-redefs -syntax keyword clojureFunc * *' + +' - -' ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods / < <= = == > >= accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root ancestors apply array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger 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? butlast byte byte-array bytes cast char char-array char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version clojure.core/* clojure.core/*' clojure.core/+ clojure.core/+' clojure.core/- clojure.core/-' clojure.core/->ArrayChunk clojure.core/->Vec clojure.core/->VecNode clojure.core/->VecSeq clojure.core/-cache-protocol-fn clojure.core/-reset-methods clojure.core// clojure.core/< clojure.core/<= clojure.core/= clojure.core/== clojure.core/> clojure.core/>= clojure.core/accessor clojure.core/aclone clojure.core/add-classpath clojure.core/add-watch clojure.core/agent clojure.core/agent-error clojure.core/agent-errors clojure.core/aget clojure.core/alength clojure.core/alias clojure.core/all-ns clojure.core/alter clojure.core/alter-meta! clojure.core/alter-var-root clojure.core/ancestors clojure.core/apply clojure.core/array-map clojure.core/aset clojure.core/aset-boolean clojure.core/aset-byte clojure.core/aset-char clojure.core/aset-double clojure.core/aset-float clojure.core/aset-int clojure.core/aset-long clojure.core/aset-short clojure.core/assoc clojure.core/assoc! clojure.core/assoc-in clojure.core/associative? clojure.core/atom clojure.core/await clojure.core/await-for clojure.core/await1 clojure.core/bases clojure.core/bean clojure.core/bigdec clojure.core/bigint clojure.core/biginteger clojure.core/bit-and clojure.core/bit-and-not clojure.core/bit-clear clojure.core/bit-flip clojure.core/bit-not clojure.core/bit-or clojure.core/bit-set clojure.core/bit-shift-left clojure.core/bit-shift-right clojure.core/bit-test clojure.core/bit-xor clojure.core/boolean clojure.core/boolean-array clojure.core/booleans clojure.core/bound-fn* clojure.core/bound? clojure.core/butlast clojure.core/byte clojure.core/byte-array clojure.core/bytes clojure.core/cast clojure.core/char clojure.core/char-array clojure.core/char? clojure.core/chars clojure.core/chunk clojure.core/chunk-append clojure.core/chunk-buffer clojure.core/chunk-cons clojure.core/chunk-first clojure.core/chunk-next clojure.core/chunk-rest clojure.core/chunked-seq? clojure.core/class clojure.core/class? clojure.core/clear-agent-errors clojure.core/clojure-version clojure.core/coll? clojure.core/commute clojure.core/comp clojure.core/comparator clojure.core/compare clojure.core/compare-and-set! clojure.core/compile clojure.core/complement clojure.core/concat clojure.core/conj clojure.core/conj! clojure.core/cons clojure.core/constantly clojure.core/construct-proxy clojure.core/contains? clojure.core/count clojure.core/counted? clojure.core/create-ns clojure.core/create-struct clojure.core/cycle clojure.core/dec clojure.core/dec' clojure.core/decimal? clojure.core/delay? clojure.core/deliver clojure.core/denominator clojure.core/deref clojure.core/derive clojure.core/descendants clojure.core/destructure clojure.core/disj clojure.core/disj! clojure.core/dissoc clojure.core/dissoc! clojure.core/distinct clojure.core/distinct? clojure.core/double clojure.core/double-array clojure.core/doubles clojure.core/drop clojure.core/drop-last clojure.core/drop-while clojure.core/empty clojure.core/empty? clojure.core/ensure clojure.core/enumeration-seq clojure.core/error-handler clojure.core/error-mode clojure.core/eval clojure.core/even? clojure.core/every-pred clojure.core/every? clojure.core/ex-data clojure.core/ex-info clojure.core/extend clojure.core/extenders clojure.core/extends? clojure.core/false? clojure.core/ffirst clojure.core/file-seq clojure.core/filter clojure.core/filterv clojure.core/find clojure.core/find-keyword clojure.core/find-ns clojure.core/find-protocol-impl clojure.core/find-protocol-method clojure.core/find-var clojure.core/first clojure.core/flatten clojure.core/float clojure.core/float-array clojure.core/float? clojure.core/floats clojure.core/flush clojure.core/fn? clojure.core/fnext clojure.core/fnil clojure.core/force clojure.core/format clojure.core/frequencies clojure.core/future-call clojure.core/future-cancel clojure.core/future-cancelled? clojure.core/future-done? clojure.core/future? clojure.core/gensym clojure.core/get clojure.core/get-in clojure.core/get-method clojure.core/get-proxy-class clojure.core/get-thread-bindings clojure.core/get-validator clojure.core/group-by clojure.core/hash clojure.core/hash-combine clojure.core/hash-map clojure.core/hash-set clojure.core/identical? clojure.core/identity clojure.core/ifn? clojure.core/in-ns clojure.core/inc clojure.core/inc' clojure.core/init-proxy clojure.core/instance? clojure.core/int clojure.core/int-array clojure.core/integer? clojure.core/interleave clojure.core/intern clojure.core/interpose clojure.core/into clojure.core/into-array clojure.core/ints clojure.core/isa? clojure.core/iterate clojure.core/iterator-seq clojure.core/juxt clojure.core/keep clojure.core/keep-indexed clojure.core/key clojure.core/keys clojure.core/keyword clojure.core/keyword? clojure.core/last clojure.core/line-seq clojure.core/list clojure.core/list* clojure.core/list? clojure.core/load clojure.core/load-file clojure.core/load-reader clojure.core/load-string clojure.core/loaded-libs clojure.core/long clojure.core/long-array clojure.core/longs clojure.core/macroexpand clojure.core/macroexpand-1 clojure.core/make-array clojure.core/make-hierarchy clojure.core/map clojure.core/map-indexed clojure.core/map? clojure.core/mapcat clojure.core/mapv clojure.core/max clojure.core/max-key clojure.core/memoize clojure.core/merge clojure.core/merge-with clojure.core/meta clojure.core/method-sig clojure.core/methods clojure.core/min clojure.core/min-key clojure.core/mod clojure.core/munge clojure.core/name clojure.core/namespace clojure.core/namespace-munge clojure.core/neg? clojure.core/newline clojure.core/next clojure.core/nfirst clojure.core/nil? clojure.core/nnext clojure.core/not clojure.core/not-any? clojure.core/not-empty clojure.core/not-every? clojure.core/not= clojure.core/ns-aliases clojure.core/ns-imports clojure.core/ns-interns clojure.core/ns-map clojure.core/ns-name clojure.core/ns-publics clojure.core/ns-refers clojure.core/ns-resolve clojure.core/ns-unalias clojure.core/ns-unmap clojure.core/nth clojure.core/nthnext clojure.core/nthrest clojure.core/num clojure.core/number? clojure.core/numerator clojure.core/object-array clojure.core/odd? clojure.core/parents clojure.core/partial clojure.core/partition clojure.core/partition-all clojure.core/partition-by clojure.core/pcalls clojure.core/peek clojure.core/persistent! clojure.core/pmap clojure.core/pop clojure.core/pop! clojure.core/pop-thread-bindings clojure.core/pos? clojure.core/pr clojure.core/pr-str clojure.core/prefer-method clojure.core/prefers clojure.core/print clojure.core/print-ctor clojure.core/print-simple clojure.core/print-str clojure.core/printf clojure.core/println clojure.core/println-str clojure.core/prn clojure.core/prn-str clojure.core/promise clojure.core/proxy-call-with-super clojure.core/proxy-mappings clojure.core/proxy-name clojure.core/push-thread-bindings clojure.core/quot clojure.core/rand clojure.core/rand-int clojure.core/rand-nth clojure.core/range clojure.core/ratio? clojure.core/rational? clojure.core/rationalize clojure.core/re-find clojure.core/re-groups clojure.core/re-matcher clojure.core/re-matches clojure.core/re-pattern clojure.core/re-seq clojure.core/read clojure.core/read-line clojure.core/read-string clojure.core/realized? clojure.core/reduce clojure.core/reduce-kv clojure.core/reduced clojure.core/reduced? clojure.core/reductions clojure.core/ref clojure.core/ref-history-count clojure.core/ref-max-history clojure.core/ref-min-history clojure.core/ref-set clojure.core/refer clojure.core/release-pending-sends clojure.core/rem clojure.core/remove clojure.core/remove-all-methods clojure.core/remove-method clojure.core/remove-ns clojure.core/remove-watch clojure.core/repeat clojure.core/repeatedly clojure.core/replace clojure.core/replicate clojure.core/require clojure.core/reset! clojure.core/reset-meta! clojure.core/resolve clojure.core/rest clojure.core/restart-agent clojure.core/resultset-seq clojure.core/reverse clojure.core/reversible? clojure.core/rseq clojure.core/rsubseq clojure.core/satisfies? clojure.core/second clojure.core/select-keys clojure.core/send clojure.core/send-off clojure.core/send-via clojure.core/seq clojure.core/seq? clojure.core/seque clojure.core/sequence clojure.core/sequential? clojure.core/set clojure.core/set-agent-send-executor! clojure.core/set-agent-send-off-executor! clojure.core/set-error-handler! clojure.core/set-error-mode! clojure.core/set-validator! clojure.core/set? clojure.core/short clojure.core/short-array clojure.core/shorts clojure.core/shuffle clojure.core/shutdown-agents clojure.core/slurp clojure.core/some clojure.core/some-fn clojure.core/sort clojure.core/sort-by clojure.core/sorted-map clojure.core/sorted-map-by clojure.core/sorted-set clojure.core/sorted-set-by clojure.core/sorted? clojure.core/special-symbol? clojure.core/spit clojure.core/split-at clojure.core/split-with clojure.core/str clojure.core/string? clojure.core/struct clojure.core/struct-map clojure.core/subs clojure.core/subseq clojure.core/subvec clojure.core/supers clojure.core/swap! clojure.core/symbol clojure.core/symbol? clojure.core/take clojure.core/take-last clojure.core/take-nth clojure.core/take-while clojure.core/test clojure.core/the-ns clojure.core/thread-bound? clojure.core/to-array clojure.core/to-array-2d clojure.core/trampoline clojure.core/transient clojure.core/tree-seq clojure.core/true? clojure.core/type clojure.core/unchecked-add clojure.core/unchecked-add-int clojure.core/unchecked-byte clojure.core/unchecked-char clojure.core/unchecked-dec clojure.core/unchecked-dec-int clojure.core/unchecked-divide-int clojure.core/unchecked-double clojure.core/unchecked-float clojure.core/unchecked-inc clojure.core/unchecked-inc-int clojure.core/unchecked-int clojure.core/unchecked-long clojure.core/unchecked-multiply clojure.core/unchecked-multiply-int clojure.core/unchecked-negate clojure.core/unchecked-negate-int clojure.core/unchecked-remainder-int clojure.core/unchecked-short clojure.core/unchecked-subtract clojure.core/unchecked-subtract-int clojure.core/underive clojure.core/update-in clojure.core/update-proxy clojure.core/use clojure.core/val clojure.core/vals clojure.core/var-get clojure.core/var-set clojure.core/var? clojure.core/vary-meta clojure.core/vec clojure.core/vector clojure.core/vector-of clojure.core/vector? clojure.core/with-bindings* clojure.core/with-meta clojure.core/with-redefs-fn clojure.core/xml-seq clojure.core/zero? clojure.core/zipmap coll? commute comp comparator compare compare-and-set! compile complement concat conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? 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 extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn? fnext fnil force format frequencies future-call future-cancel future-cancelled? future-done? future? 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 ifn? in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last line-seq list list* list? load load-file load-reader load-string loaded-libs long long-array longs macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memoize merge merge-with meta method-sig methods min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= 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? parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers print print-ctor print-simple print-str printf println println-str prn prn-str promise proxy-call-with-super proxy-mappings proxy-name push-thread-bindings quot 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? reduce reduce-kv reduced reduced? reductions ref ref-history-count ref-max-history ref-min-history ref-set refer 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-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-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? take take-last take-nth take-while test the-ns thread-bound? to-array to-array-2d trampoline transient tree-seq true? 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 update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? with-bindings* with-meta with-redefs-fn xml-seq zero? zipmap -syntax keyword clojureVariable *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* EMPTY-NODE char-escape-string char-name-string clojure.core/*1 clojure.core/*2 clojure.core/*3 clojure.core/*agent* clojure.core/*allow-unresolved-vars* clojure.core/*assert* clojure.core/*clojure-version* clojure.core/*command-line-args* clojure.core/*compile-files* clojure.core/*compile-path* clojure.core/*compiler-options* clojure.core/*data-readers* clojure.core/*default-data-reader-fn* clojure.core/*e clojure.core/*err* clojure.core/*file* clojure.core/*flush-on-newline* clojure.core/*fn-loader* clojure.core/*in* clojure.core/*math-context* clojure.core/*ns* clojure.core/*out* clojure.core/*print-dup* clojure.core/*print-length* clojure.core/*print-level* clojure.core/*print-meta* clojure.core/*print-readably* clojure.core/*read-eval* clojure.core/*source-path* clojure.core/*unchecked-math* clojure.core/*use-context-classloader* clojure.core/*verbose-defrecords* clojure.core/*warn-on-reflection* clojure.core/EMPTY-NODE clojure.core/char-escape-string clojure.core/char-name-string clojure.core/default-data-readers clojure.core/primitives-classnames clojure.core/print-dup clojure.core/print-method clojure.core/unquote clojure.core/unquote-splicing default-data-readers primitives-classnames print-dup print-method unquote unquote-splicing +syntax keyword clojureFunc * *' + +' - -' ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods / < <= = == > >= accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root ancestors apply array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger 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? butlast byte byte-array bytes cast char char-array char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version clojure.core/* clojure.core/*' clojure.core/+ clojure.core/+' clojure.core/- clojure.core/-' clojure.core/->ArrayChunk clojure.core/->Vec clojure.core/->VecNode clojure.core/->VecSeq clojure.core/-cache-protocol-fn clojure.core/-reset-methods clojure.core// clojure.core/< clojure.core/<= clojure.core/= clojure.core/== clojure.core/> clojure.core/>= clojure.core/accessor clojure.core/aclone clojure.core/add-classpath clojure.core/add-watch clojure.core/agent clojure.core/agent-error clojure.core/agent-errors clojure.core/aget clojure.core/alength clojure.core/alias clojure.core/all-ns clojure.core/alter clojure.core/alter-meta! clojure.core/alter-var-root clojure.core/ancestors clojure.core/apply clojure.core/array-map clojure.core/aset clojure.core/aset-boolean clojure.core/aset-byte clojure.core/aset-char clojure.core/aset-double clojure.core/aset-float clojure.core/aset-int clojure.core/aset-long clojure.core/aset-short clojure.core/assoc clojure.core/assoc! clojure.core/assoc-in clojure.core/associative? clojure.core/atom clojure.core/await clojure.core/await-for clojure.core/await1 clojure.core/bases clojure.core/bean clojure.core/bigdec clojure.core/bigint clojure.core/biginteger clojure.core/bit-and clojure.core/bit-and-not clojure.core/bit-clear clojure.core/bit-flip clojure.core/bit-not clojure.core/bit-or clojure.core/bit-set clojure.core/bit-shift-left clojure.core/bit-shift-right clojure.core/bit-test clojure.core/bit-xor clojure.core/boolean clojure.core/boolean-array clojure.core/booleans clojure.core/bound-fn* clojure.core/bound? clojure.core/butlast clojure.core/byte clojure.core/byte-array clojure.core/bytes clojure.core/cast clojure.core/char clojure.core/char-array clojure.core/char? clojure.core/chars clojure.core/chunk clojure.core/chunk-append clojure.core/chunk-buffer clojure.core/chunk-cons clojure.core/chunk-first clojure.core/chunk-next clojure.core/chunk-rest clojure.core/chunked-seq? clojure.core/class clojure.core/class? clojure.core/clear-agent-errors clojure.core/clojure-version clojure.core/coll? clojure.core/commute clojure.core/comp clojure.core/comparator clojure.core/compare clojure.core/compare-and-set! clojure.core/compile clojure.core/complement clojure.core/concat clojure.core/conj clojure.core/conj! clojure.core/cons clojure.core/constantly clojure.core/construct-proxy clojure.core/contains? clojure.core/count clojure.core/counted? clojure.core/create-ns clojure.core/create-struct clojure.core/cycle clojure.core/dec clojure.core/dec' clojure.core/decimal? clojure.core/delay? clojure.core/deliver clojure.core/denominator clojure.core/deref clojure.core/derive clojure.core/descendants clojure.core/destructure clojure.core/disj clojure.core/disj! clojure.core/dissoc clojure.core/dissoc! clojure.core/distinct clojure.core/distinct? clojure.core/doall clojure.core/dorun clojure.core/double clojure.core/double-array clojure.core/doubles clojure.core/drop clojure.core/drop-last clojure.core/drop-while clojure.core/empty clojure.core/empty? clojure.core/ensure clojure.core/enumeration-seq clojure.core/error-handler clojure.core/error-mode clojure.core/eval clojure.core/even? clojure.core/every-pred clojure.core/every? clojure.core/ex-data clojure.core/ex-info clojure.core/extend clojure.core/extenders clojure.core/extends? clojure.core/false? clojure.core/ffirst clojure.core/file-seq clojure.core/filter clojure.core/filterv clojure.core/find clojure.core/find-keyword clojure.core/find-ns clojure.core/find-protocol-impl clojure.core/find-protocol-method clojure.core/find-var clojure.core/first clojure.core/flatten clojure.core/float clojure.core/float-array clojure.core/float? clojure.core/floats clojure.core/flush clojure.core/fn? clojure.core/fnext clojure.core/fnil clojure.core/force clojure.core/format clojure.core/frequencies clojure.core/future-call clojure.core/future-cancel clojure.core/future-cancelled? clojure.core/future-done? clojure.core/future? clojure.core/gensym clojure.core/get clojure.core/get-in clojure.core/get-method clojure.core/get-proxy-class clojure.core/get-thread-bindings clojure.core/get-validator clojure.core/group-by clojure.core/hash clojure.core/hash-combine clojure.core/hash-map clojure.core/hash-ordered-coll clojure.core/hash-set clojure.core/hash-unordered-coll clojure.core/identical? clojure.core/identity clojure.core/ifn? clojure.core/in-ns clojure.core/inc clojure.core/inc' clojure.core/init-proxy clojure.core/instance? clojure.core/int clojure.core/int-array clojure.core/integer? clojure.core/interleave clojure.core/intern clojure.core/interpose clojure.core/into clojure.core/into-array clojure.core/ints clojure.core/isa? clojure.core/iterate clojure.core/iterator-seq clojure.core/juxt clojure.core/keep clojure.core/keep-indexed clojure.core/key clojure.core/keys clojure.core/keyword clojure.core/keyword? clojure.core/last clojure.core/line-seq clojure.core/list clojure.core/list* clojure.core/list? clojure.core/load clojure.core/load-file clojure.core/load-reader clojure.core/load-string clojure.core/loaded-libs clojure.core/long clojure.core/long-array clojure.core/longs clojure.core/macroexpand clojure.core/macroexpand-1 clojure.core/make-array clojure.core/make-hierarchy clojure.core/map clojure.core/map-indexed clojure.core/map? clojure.core/mapcat clojure.core/mapv clojure.core/max clojure.core/max-key clojure.core/memoize clojure.core/merge clojure.core/merge-with clojure.core/meta clojure.core/method-sig clojure.core/methods clojure.core/min clojure.core/min-key clojure.core/mix-collection-hash clojure.core/mod clojure.core/munge clojure.core/name clojure.core/namespace clojure.core/namespace-munge clojure.core/neg? clojure.core/newline clojure.core/next clojure.core/nfirst clojure.core/nil? clojure.core/nnext clojure.core/not clojure.core/not-any? clojure.core/not-empty clojure.core/not-every? clojure.core/not= clojure.core/ns-aliases clojure.core/ns-imports clojure.core/ns-interns clojure.core/ns-map clojure.core/ns-name clojure.core/ns-publics clojure.core/ns-refers clojure.core/ns-resolve clojure.core/ns-unalias clojure.core/ns-unmap clojure.core/nth clojure.core/nthnext clojure.core/nthrest clojure.core/num clojure.core/number? clojure.core/numerator clojure.core/object-array clojure.core/odd? clojure.core/parents clojure.core/partial clojure.core/partition clojure.core/partition-all clojure.core/partition-by clojure.core/pcalls clojure.core/peek clojure.core/persistent! clojure.core/pmap clojure.core/pop clojure.core/pop! clojure.core/pop-thread-bindings clojure.core/pos? clojure.core/pr clojure.core/pr-str clojure.core/prefer-method clojure.core/prefers clojure.core/print clojure.core/print-ctor clojure.core/print-dup clojure.core/print-method clojure.core/print-simple clojure.core/print-str clojure.core/printf clojure.core/println clojure.core/println-str clojure.core/prn clojure.core/prn-str clojure.core/promise clojure.core/proxy-call-with-super clojure.core/proxy-mappings clojure.core/proxy-name clojure.core/push-thread-bindings clojure.core/quot clojure.core/rand clojure.core/rand-int clojure.core/rand-nth clojure.core/range clojure.core/ratio? clojure.core/rational? clojure.core/rationalize clojure.core/re-find clojure.core/re-groups clojure.core/re-matcher clojure.core/re-matches clojure.core/re-pattern clojure.core/re-seq clojure.core/read clojure.core/read-line clojure.core/read-string clojure.core/realized? clojure.core/record? clojure.core/reduce clojure.core/reduce-kv clojure.core/reduced clojure.core/reduced? clojure.core/reductions clojure.core/ref clojure.core/ref-history-count clojure.core/ref-max-history clojure.core/ref-min-history clojure.core/ref-set clojure.core/refer clojure.core/release-pending-sends clojure.core/rem clojure.core/remove clojure.core/remove-all-methods clojure.core/remove-method clojure.core/remove-ns clojure.core/remove-watch clojure.core/repeat clojure.core/repeatedly clojure.core/replace clojure.core/replicate clojure.core/require clojure.core/reset! clojure.core/reset-meta! clojure.core/resolve clojure.core/rest clojure.core/restart-agent clojure.core/resultset-seq clojure.core/reverse clojure.core/reversible? clojure.core/rseq clojure.core/rsubseq clojure.core/satisfies? clojure.core/second clojure.core/select-keys clojure.core/send clojure.core/send-off clojure.core/send-via clojure.core/seq clojure.core/seq? clojure.core/seque clojure.core/sequence clojure.core/sequential? clojure.core/set clojure.core/set-agent-send-executor! clojure.core/set-agent-send-off-executor! clojure.core/set-error-handler! clojure.core/set-error-mode! clojure.core/set-validator! clojure.core/set? clojure.core/short clojure.core/short-array clojure.core/shorts clojure.core/shuffle clojure.core/shutdown-agents clojure.core/slurp clojure.core/some clojure.core/some-fn clojure.core/some? clojure.core/sort clojure.core/sort-by clojure.core/sorted-map clojure.core/sorted-map-by clojure.core/sorted-set clojure.core/sorted-set-by clojure.core/sorted? clojure.core/special-symbol? clojure.core/spit clojure.core/split-at clojure.core/split-with clojure.core/str clojure.core/string? clojure.core/struct clojure.core/struct-map clojure.core/subs clojure.core/subseq clojure.core/subvec clojure.core/supers clojure.core/swap! clojure.core/symbol clojure.core/symbol? clojure.core/take clojure.core/take-last clojure.core/take-nth clojure.core/take-while clojure.core/test clojure.core/the-ns clojure.core/thread-bound? clojure.core/to-array clojure.core/to-array-2d clojure.core/trampoline clojure.core/transient clojure.core/tree-seq clojure.core/true? clojure.core/type clojure.core/unchecked-add clojure.core/unchecked-add-int clojure.core/unchecked-byte clojure.core/unchecked-char clojure.core/unchecked-dec clojure.core/unchecked-dec-int clojure.core/unchecked-divide-int clojure.core/unchecked-double clojure.core/unchecked-float clojure.core/unchecked-inc clojure.core/unchecked-inc-int clojure.core/unchecked-int clojure.core/unchecked-long clojure.core/unchecked-multiply clojure.core/unchecked-multiply-int clojure.core/unchecked-negate clojure.core/unchecked-negate-int clojure.core/unchecked-remainder-int clojure.core/unchecked-short clojure.core/unchecked-subtract clojure.core/unchecked-subtract-int clojure.core/underive clojure.core/unsigned-bit-shift-right clojure.core/update-in clojure.core/update-proxy clojure.core/use clojure.core/val clojure.core/vals clojure.core/var-get clojure.core/var-set clojure.core/var? clojure.core/vary-meta clojure.core/vec clojure.core/vector clojure.core/vector-of clojure.core/vector? clojure.core/with-bindings* clojure.core/with-meta clojure.core/with-redefs-fn clojure.core/xml-seq clojure.core/zero? clojure.core/zipmap coll? commute comp comparator compare compare-and-set! compile complement concat conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall dorun 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 extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn? fnext fnil force format frequencies future-call future-cancel future-cancelled? future-done? future? gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-ordered-coll hash-set hash-unordered-coll identical? identity ifn? in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last line-seq list list* list? load load-file load-reader load-string loaded-libs long long-array longs macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memoize merge merge-with meta method-sig methods min min-key mix-collection-hash mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= 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? parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers print print-ctor print-dup print-method print-simple print-str printf println println-str prn prn-str promise proxy-call-with-super proxy-mappings proxy-name push-thread-bindings quot 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? record? reduce reduce-kv reduced reduced? reductions ref ref-history-count ref-max-history ref-min-history ref-set refer 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-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-fn some? 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? take take-last take-nth take-while test the-ns thread-bound? to-array to-array-2d trampoline transient tree-seq true? 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 unsigned-bit-shift-right update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? with-bindings* with-meta with-redefs-fn xml-seq zero? zipmap +syntax keyword clojureVariable *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* EMPTY-NODE char-escape-string char-name-string clojure.core/*1 clojure.core/*2 clojure.core/*3 clojure.core/*agent* clojure.core/*allow-unresolved-vars* clojure.core/*assert* clojure.core/*clojure-version* clojure.core/*command-line-args* clojure.core/*compile-files* clojure.core/*compile-path* clojure.core/*compiler-options* clojure.core/*data-readers* clojure.core/*default-data-reader-fn* clojure.core/*e clojure.core/*err* clojure.core/*file* clojure.core/*flush-on-newline* clojure.core/*fn-loader* clojure.core/*in* clojure.core/*math-context* clojure.core/*ns* clojure.core/*out* clojure.core/*print-dup* clojure.core/*print-length* clojure.core/*print-level* clojure.core/*print-meta* clojure.core/*print-readably* clojure.core/*read-eval* clojure.core/*source-path* clojure.core/*unchecked-math* clojure.core/*use-context-classloader* clojure.core/*verbose-defrecords* clojure.core/*warn-on-reflection* clojure.core/EMPTY-NODE clojure.core/char-escape-string clojure.core/char-name-string clojure.core/default-data-readers clojure.core/primitives-classnames clojure.core/unquote clojure.core/unquote-splicing default-data-readers primitives-classnames unquote unquote-splicing " Keywords are symbols: " static Pattern symbolPat = Pattern.compile("[:]?([\\D&&[^/]].*/)?([\\D&&[^/]][^/]*)"); @@ -79,17 +84,17 @@ syntax match clojureRegexpEscape "\v\\% syntax region clojureRegexpQuoted start=/\\Q/ms=e+1 skip=/\\\\\|\\"/ end=/\\E/me=s-1 end=/"/me=s-1 contained syntax region clojureRegexpQuote start=/\\Q/ skip=/\\\\\|\\"/ end=/\\E/ end=/"/me=s-1 contains=clojureRegexpQuoted keepend contained -" Character property classes -" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-007/clj/src/vim_clojure_static/generate.clj -" Java version 1.7.0_40 -syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Blank|P%(unct|rint)|Digit|Graph|A%(l%(pha|num)|SCII)|XDigit|Space|Upper|Lower|Cntrl)\}" contained display -syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(U%(pperCase|nicodeIdentifier%(Start|Part))|Mirrored|Alphabetic|SpaceChar|D%(efined|igit)|Whitespace|L%(etter%(OrDigit)?|owerCase)|TitleCase|I%(de%(ographic|ntifierIgnorable)|SOControl)|JavaIdentifier%(Start|Part))\}" contained display -syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(blank|hex%(digit|_digit)|uppercase|digit|control|a%(ssigned|l%(phabetic|num))|graph|ideographic|p%(rint|unctuation)|titlecase|w%(hite%(_space|space)|ord)|l%(owercase|etter)|noncharacter%(codepoint|_code_point))\}" contained display -syntax match clojureRegexpUnicodeCharClass "\v\\[pP][MLNPSZC]" contained display -syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(C[fonsc]?|L[DmloutC]?|S[kmoc]?|P[edfiosc]?|M[enc]?|Z[lps]?|N[dlo]?)\}" contained display -syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(Is|gc\=|general_category\=)?%(C[fonsc]?|L[DmloutC]?|S[kmoc]?|P[edfiosc]?|M[enc]?|Z[lps]?|N[dlo]?)\}" contained display -syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(h%(ira%(gana)?|an%([io]|g%(ul)?|unoo)?|ebr%(ew)?)|yi%(ii)?|java%(nese)?|c%(prt|y%(r%(illic|l)|priot)|h%(er%(okee)?|am)|uneiform|o%(mmon|pt%(ic)?)|a%(n%(adian_aboriginal|s)|ri%(an)?))|i%(mperial_aramaic|tal|n%(herited|scriptional_pa%(rthian|hlavi)))|a%(r%(ab%(ic)?|m%([in]|enian))|v%(st|estan))|g%(oth%(ic)?|u%(j%(arati|r)|r%(mukhi|u))|lag%(olitic)?|eor%(gian)?|re%(k|ek))|b%(u%(gi%(nese)?|h%(d|id))|ra%(i%(lle)?|h%(mi)?)|a%(mum?|t%(k|ak)|li%(nese)?)|opo%(mofo)?|eng%(ali)?)|s%(ha%(w|vian)|und%(anese)?|y%(r%(iac|c)|lo%(ti_nagri)?)|inh%(ala)?|a%(ur%(ashtra)?|rb|m%(r|aritan)))|d%(srt|e%(va%(nagari)?|seret))|l%(a%(na|oo?|t%(n|in))|epc%(ha)?|i%(n%(ear_b|b)|mbu?|su)|y%([dc]i%(an)?))|p%(h%(oenician|nx|li|ag%(s_pa)?)|rti)|e%(gyp%(tian_hieroglyphs)?|thi%(opic)?)|r%(jng|un%(ic|r)|ejang)|u%(nknown|gar%(itic)?)|vaii?|n%(koo?|ew_tai_lue)|m%(y%(mr|anmar)|tei|a%(nd%(aic)?|layalam)|ong%(olian)?|eetei_mayek|lym)|z%(inh|yyy|zzz)|t%(glg|fng|i%(finagh|b%(t|etan))|ha%(i|a%(na)?)|elu%(gu)?|a%(i_%(viet|le|tham)|l[eu]|g%(alog|b%(anwa)?)|vt|m%(l|il)))|x%(sux|peo)|o%(r%(iya|kh|ya)|sma%(nya)?|g%(am|ham)|l%(ck|d_%(south_arabian|turkic|italic|persian)|_chiki))|k%(a%(takana|yah_li|n%(nada|a)|li|ithi)|h%(m%(r|er)|ar%(oshthi)?)|thi|nda))\}" contained display -syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(s%(a%(maritan|urashtra)|mall%(_form_variants| form variants|formvariants)|inhala|y%(loti%(nagri|[_ ]nagri)|riac)|havian|p%(ecials|acing%(modifierletters|_modifier_letters| modifier letters))|u%(p%(erscripts%(andsubscripts|_and_subscripts| and subscripts)|plementa%(ry%( private use area-[ab]|_private_use_area_[ab]|privateusearea-[ab])|l%( %(arrows-[ab]|punctuation|mathematical operators)|arrows-[ab]|_%(punctuation|mathematical_operators|arrows_[ab])|punctuation|mathematicaloperators)))|ndanese|rrogates_area))|l%(a%(o|tin%(_%(extended_%(a%(dditional)?|[dcb])|1_supplement)| extended%(-[dacb]| additional)|-1%( supplement|supplement)|extended%(additional|-[dacb])))|e%(pcha|tterlike%(symbols|[_ ]symbols))|y[cd]ian|i%(su|mbu|near%(b%(ideograms|syllabary)|_b_%(ideograms|syllabary)| b %(ideograms|syllabary)))|ow%([_ ]surrogates|surrogates))|b%(a%(sic%(latin|[_ ]latin)|tak|linese|mum%([_ ]supplement|supplement)?)|yzantine%(_musical_symbols| musical symbols|musicalsymbols)|engali|u%(ginese|hid)|lock%(elements|[_ ]elements)|ra%(hmi|ille%([ _]patterns|patterns))|o%(x%(drawing|[_ ]drawing)|pomofo%([ _]extended|extended)?))|t%(a%(g%(s|alog|banwa)|mil|i%( %(viet|xuan jing symbols|le|tham)|viet|le|_%(xuan_jing_symbols|viet|le|tham)|tham|xuanjingsymbols))|ha%(i|ana)|elugu|i%(finagh|betan)|ransport%(_and_map_symbols| and map symbols|andmapsymbols))|n%(ew%(_tai_lue| tai lue|tailue)|umber%([ _]forms|forms)|ko)|m%(iscellaneous%(_%(mathematical_symbols_[ab]|symbols%(_and_%(arrows|pictographs))?|technical)|mathematicalsymbols-[ab]|technical| %(symbols%( and %(arrows|pictographs))?|mathematical symbols-[ab]|technical)|symbols%(and%(arrows|pictographs))?)|eetei%(mayek|[_ ]mayek)|a%(ndaic|thematical%(alphanumericsymbols|operators|_%(alphanumeric_symbols|operators)| %(operators|alphanumeric symbols))|hjong%(tiles|[_ ]tiles)|layalam)|yanmar%(_extended_a|extended-a| extended-a)?|o%(difier%( tone letters|toneletters|_tone_letters)|ngolian)|usical%(symbols|[_ ]symbols))|p%(h%(a%(gs[-_]pa|istos%(disc|[_ ]disc))|o%(netic%(_extensions%(_supplement)?| extensions%( supplement)?|extensions%(supplement)?)|enician))|rivate%(usearea|_use_area| use area)|laying%(cards|[_ ]cards))|javanese|u%(garitic|nified%(_canadian_aboriginal_syllabics%(_extended)?| canadian aboriginal syllabics%( extended)?|canadianaboriginalsyllabics%(extended)?))|o%(riya|gham|l%([ _]chiki|d%(turkic|_%(south_arabian|turkic|italic|persian)|italic|persian| %(south arabian|turkic|italic|persian)|southarabian)|chiki)|smanya|ptical%(_character_recognition| character recognition|characterrecognition))|v%(e%(dic%(extensions|[_ ]extensions)|rtical%([ _]forms|forms))|a%(i|riation%(_selectors%(_supplement)?| selectors%( supplement)?|selectors%(supplement)?)))|a%(vestan|l%(phabetic%(_presentation_forms| presentation forms|presentationforms)|chemical%(symbols|[_ ]symbols))|ncient%( %(symbols|greek %(musical notation|numbers))|symbols|greek%(musicalnotation|numbers)|_%(symbols|greek_%(musical_notation|numbers)))|egean%([ _]numbers|numbers)|r%(menian|rows|abic%( %(presentation forms-[ab]|supplement)|_%(presentation_forms_[ab]|supplement)|presentationforms-[ab]|supplement)?))|i%(nscriptional%(pa%(rthian|hlavi)|%([_ ]pa%(rthian|hlavi)))|deographic%( description characters|descriptioncharacters|_description_characters)|pa%(extensions|[_ ]extensions)|mperial%(aramaic|[_ ]aramaic))|yi%(%([_ ]%(radicals|syllables))|radicals|syllables|jing%(hexagramsymbols|_hexagram_symbols| hexagram symbols))|k%(a%(yah%(li|[_ ]li)|n%(nada|bun|a%([_ ]supplement|supplement)|gxi%(radicals|[_ ]radicals))|ithi|takana%(phoneticextensions|_phonetic_extensions| phonetic extensions)?)|h%(aroshthi|mer%(symbols|[_ ]symbols)?))|d%(e%(vanagari%([ _]extended|extended)?|seret)|omino%(tiles|[_ ]tiles)|ingbats)|g%(lagolitic|othic|reek%(andcoptic| %(and coptic|extended)|extended|_extended)?|u%(rmukhi|jarati)|e%(o%(metric%([_ ]shapes|shapes)|rgian%([_ ]supplement|supplement)?)|neral%(punctuation|[_ ]punctuation)))|e%(nclosed%( %(ideographic supplement|cjk letters and months|alphanumeric%( supplement|s))|cjklettersandmonths|_%(ideographic_supplement|alphanumeric%(_supplement|s)|cjk_letters_and_months)|alphanumerics%(upplement)?|ideographicsupplement)|moticons|thiopic%(extended%(-a)?| %(extended%(-a)?|supplement)|_%(extended%(_a)?|supplement)|supplement)?|gyptian%(hieroglyphs|[_ ]hieroglyphs))|r%(ejang|u%(nic|mi%(numeralsymbols|_numeral_symbols| numeral symbols)))|c%(jk%(_%(compatibility%(_%(ideographs%(_supplement)?|forms))?|radicals_supplement|unified_ideographs%(_extension_[dacb])?|s%(trokes|ymbols_and_punctuation))|compatibility%(ideographs%(supplement)?|forms)?|unifiedideographs%(extension[dacb])?|radicalssupplement|s%(ymbolsandpunctuation|trokes)| %(unified ideographs%( extension [dacb])?|s%(trokes|ymbols and punctuation)|radicals supplement|compatibility%( %(forms|ideographs%( supplement)?))?))|h%(am|erokee)|u%(neiform%(_numbers_and_punctuation| numbers and punctuation|numbersandpunctuation)?|rrency%(symbols|[_ ]symbols))|y%(rillic%(_%(extended_[ab]|supplementary)| %(extended-[ab]|supplement%(ary)?)|extended-[ab]|supplement%(ary)?)?|priot%([_ ]syllabary|syllabary))|o%(ntrol%(pictures|[_ ]pictures)|unting%(rodnumerals|_rod_numerals| rod numerals)|m%(bining%(halfmarks|diacriticalmarks%(forsymbols|supplement)?| %(marks for symbols|half marks|diacritical marks%( %(for symbols|supplement))?)|marksforsymbols|_%(marks_for_symbols|half_marks|diacritical_marks%(_supplement)?))|mon%( indic number forms|indicnumberforms|_indic_number_forms))|ptic)|arian)|h%(i%(ragana|gh%(_%(private_use_surrogates|surrogates)| %(private use surrogates|surrogates)|surrogates|privateusesurrogates))|ebrew|a%(n%(unoo|gul%(jamo%(extended-[ab])?| %(jamo%( extended-[ab])?|syllables|compatibility jamo)|_%(syllables|jamo%(_extended_[ab])?|compatibility_jamo)|syllables|compatibilityjamo))|lfwidth%( and fullwidth forms|andfullwidthforms|_and_fullwidth_forms))))\}" contained display +" -*- CHARACTER PROPERTY CLASSES -*- +" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj +" Java version 1.7.0_51 +syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Cntrl|A%(l%(pha|num)|SCII)|Space|Graph|Upper|P%(rint|unct)|Blank|XDigit|Digit|Lower)\}" contained display +syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Whitespace|JavaIdentifier%(Part|Start)|SpaceChar|Mirrored|TitleCase|I%(SOControl|de%(ographic|ntifierIgnorable))|D%(efined|igit)|U%(pperCase|nicodeIdentifier%(Part|Start))|L%(etter%(OrDigit)?|owerCase)|Alphabetic)\}" contained display +syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(l%(owercase|etter)|hex%(digit|_digit)|w%(hite%(_space|space)|ord)|noncharacter%(_code_point|codepoint)|p%(rint|unctuation)|ideographic|graph|a%(l%(num|phabetic)|ssigned)|uppercase|titlecase|blank|digit|control)\}" contained display +syntax match clojureRegexpUnicodeCharClass "\v\\[pP][NSCMZPL]" contained display +syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(N[dlo]?|P[dcifeos]?|C[ncfos]?|M[nce]?|Z[lsp]?|S[mcko]?|L[muCDlto]?)\}" contained display +syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(Is|gc\=|general_category\=)?%(N[dlo]?|P[dcifeos]?|C[ncfos]?|M[nce]?|Z[lsp]?|S[mcko]?|L[muCDlto]?)\}" contained display +syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(l%(epc%(ha)?|y%([dc]i%(an)?)|a%(t%(n|in)|na|oo?)|i%(n%(b|ear_b)|mbu?|su))|vaii?|d%(srt|e%(seret|va%(nagari)?))|g%(lag%(olitic)?|eor%(gian)?|oth%(ic)?|re%(k|ek)|u%(j%(arati|r)|r%(u|mukhi)))|u%(gar%(itic)?|nknown)|a%(r%(ab%(ic)?|m%([ni]|enian))|v%(st|estan))|e%(thi%(opic)?|gyp%(tian_hieroglyphs)?)|z%(inh|yyy|zzz)|r%(un%(ic|r)|ejang|jng)|m%(a%(nd%(aic)?|layalam)|lym|y%(anmar|mr)|tei|ong%(olian)?|eetei_mayek)|c%(a%(n%(adian_aboriginal|s)|ri%(an)?)|y%(priot|r%(l|illic))|prt|uneiform|o%(pt%(ic)?|mmon)|h%(er%(okee)?|am))|i%(n%(scriptional_pa%(rthian|hlavi)|herited)|mperial_aramaic|tal)|b%(eng%(ali)?|a%(t%(ak|k)|li%(nese)?|mum?)|ra%(i%(lle)?|h%(mi)?)|opo%(mofo)?|u%(gi%(nese)?|h%(d|id)))|o%(g%(am|ham)|r%(iya|kh|ya)|sma%(nya)?|l%(d_%(south_arabian|persian|italic|turkic)|ck|_chiki))|p%(rti|h%(oenician|li|ag%(s_pa)?|nx))|k%(h%(m%(r|er)|ar%(oshthi)?)|nda|a%(li|n%(a|nada)|takana|yah_li|ithi)|thi)|yi%(ii)?|t%(elu%(gu)?|i%(finagh|b%(t|etan))|ha%(i|a%(na)?)|a%(i_%(le|tham|viet)|g%(alog|b%(anwa)?)|vt|l[ue]|m%(il|l))|fng|glg)|x%(peo|sux)|n%(ew_tai_lue|koo?)|h%(ira%(gana)?|an%([io]|unoo|g%(ul)?)?|ebr%(ew)?)|java%(nese)?|s%(inh%(ala)?|ha%(vian|w)|a%(ur%(ashtra)?|m%(r|aritan)|rb)|y%(r%(c|iac)|lo%(ti_nagri)?)|und%(anese)?))\}" contained display +syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(javanese|h%(a%(lfwidth%( and fullwidth forms|andfullwidthforms|_and_fullwidth_forms)|n%(unoo|gul%(compatibilityjamo|syllables|jamo%(extended\-[ab])?|_%(syllables|jamo%(_extended_[ab])?|compatibility_jamo)| %(syllables|compatibility jamo|jamo%( extended\-[ab])?))))|i%(ragana|gh%( %(private use surrogates|surrogates)|_%(private_use_surrogates|surrogates)|surrogates|privateusesurrogates))|ebrew)|i%(pa%([ _]extensions|extensions)|deographic%( description characters|_description_characters|descriptioncharacters)|nscriptional%(%([ _]pa%(rthian|hlavi))|pa%(rthian|hlavi))|mperial%(aramaic|[_ ]aramaic))|l%(e%(tterlike%([_ ]symbols|symbols)|pcha)|ow%([_ ]surrogates|surrogates)|i%(mbu|near%(_b_%(ideograms|syllabary)|b%(ideograms|syllabary)| b %(ideograms|syllabary))|su)|a%(tin%(extended%(additional|\-[dacb])| extended%( additional|\-[dacb])|\-1%(supplement| supplement)|_%(extended_%([dcb]|a%(dditional)?)|1_supplement))|o)|y[cd]ian)|b%(u%(ginese|hid)|ra%(hmi|ille%(patterns|[_ ]patterns))|o%(x%([ _]drawing|drawing)|pomofo%([ _]extended|extended)?)|lock%([ _]elements|elements)|yzantine%( musical symbols|musicalsymbols|_musical_symbols)|engali|a%(linese|mum%(supplement|[ _]supplement)?|tak|sic%([ _]latin|latin)))|e%(gyptian%([ _]hieroglyphs|hieroglyphs)|moticons|nclosed%( %(cjk letters and months|ideographic supplement|alphanumeric%( supplement|s))|cjklettersandmonths|_%(ideographic_supplement|alphanumeric%(_supplement|s)|cjk_letters_and_months)|alphanumerics%(upplement)?|ideographicsupplement)|thiopic%(supplement|_%(supplement|extended%(_a)?)| %(supplement|extended%(\-a)?)|extended%(\-a)?)?)|k%(h%(aroshthi|mer%([_ ]symbols|symbols)?)|a%(takana%(_phonetic_extensions|phoneticextensions| phonetic extensions)?|n%(gxi%([_ ]radicals|radicals)|a%(supplement|[ _]supplement)|bun|nada)|ithi|yah%([ _]li|li)))|r%(u%(nic|mi%(numeralsymbols| numeral symbols|_numeral_symbols))|ejang)|n%(umber%(forms|[ _]forms)|ko|ew%(_tai_lue|tailue| tai lue))|m%(iscellaneous%(technical|symbols%(and%(pictographs|arrows))?|mathematicalsymbols\-[ab]| %(technical|mathematical symbols\-[ab]|symbols%( and %(pictographs|arrows))?)|_%(technical|symbols%(_and_%(pictographs|arrows))?|mathematical_symbols_[ab]))|usical%([_ ]symbols|symbols)|eetei%(mayek|[_ ]mayek)|a%(ndaic|hjong%([ _]tiles|tiles)|layalam|thematical%(alphanumericsymbols| %(alphanumeric symbols|operators)|_%(alphanumeric_symbols|operators)|operators))|yanmar%(extended\-a|_extended_a| extended\-a)?|o%(difier%(_tone_letters| tone letters|toneletters)|ngolian))|d%(e%(seret|vanagari%([ _]extended|extended)?)|ingbats|omino%([ _]tiles|tiles))|yi%(syllables|%([_ ]%(syllables|radicals))|radicals|jing%(hexagramsymbols| hexagram symbols|_hexagram_symbols))|s%(havian|mall%( form variants|formvariants|_form_variants)|p%(acing%(_modifier_letters| modifier letters|modifierletters)|ecials)|a%(maritan|urashtra)|u%(p%(erscripts%(_and_subscripts|andsubscripts| and subscripts)|plementa%(ry%(_private_use_area_[ab]|privateusearea\-[ab]| private use area\-[ab])|l%(_%(arrows_[ab]|mathematical_operators|punctuation)| %(mathematical operators|punctuation|arrows\-[ab])|mathematicaloperators|punctuation|arrows\-[ab])))|rrogates_area|ndanese)|inhala|y%(riac|loti%([_ ]nagri|nagri)))|p%(h%(o%(enician|netic%( extensions%( supplement)?|extensions%(supplement)?|_extensions%(_supplement)?))|a%(istos%([ _]disc|disc)|gs[_\-]pa))|laying%(cards|[_ ]cards)|rivate%(usearea| use area|_use_area))|o%(smanya|l%([ _]chiki|d%( %(south arabian|persian|italic|turkic)|southarabian|_%(south_arabian|persian|italic|turkic)|persian|italic|turkic)|chiki)|riya|ptical%( character recognition|_character_recognition|characterrecognition)|gham)|g%(u%(jarati|rmukhi)|othic|lagolitic|e%(o%(rgian%(supplement|[ _]supplement)?|metric%(shapes|[ _]shapes))|neral%([_ ]punctuation|punctuation))|reek%( %(and coptic|extended)|andcoptic|_extended|extended)?)|c%(o%(ntrol%(pictures|[ _]pictures)|m%(bining%(diacriticalmarks%(supplement|forsymbols)?|halfmarks| %(diacritical marks%( %(supplement|for symbols))?|half marks|marks for symbols)|marksforsymbols|_%(marks_for_symbols|half_marks|diacritical_marks%(_supplement)?))|mon%(_indic_number_forms|indicnumberforms| indic number forms))|ptic|unting%( rod numerals|_rod_numerals|rodnumerals))|y%(rillic%(extended\-[ab]|_%(extended_[ab]|supplementary)|supplement%(ary)?| %(extended\-[ab]|supplement%(ary)?))?|priot%(syllabary|[ _]syllabary))|u%(rrency%([_ ]symbols|symbols)|neiform%(_numbers_and_punctuation|numbersandpunctuation| numbers and punctuation)?)|arian|h%(erokee|am)|jk%(s%(ymbolsandpunctuation|trokes)|compatibility%(forms|ideographs%(supplement)?)?|radicalssupplement| %(compatibility%( %(ideographs%( supplement)?|forms))?|radicals supplement|unified ideographs%( extension [dacb])?|s%(ymbols and punctuation|trokes))|_%(s%(trokes|ymbols_and_punctuation)|radicals_supplement|compatibility%(_%(forms|ideographs%(_supplement)?))?|unified_ideographs%(_extension_[dacb])?)|unifiedideographs%(extension[dacb])?))|t%(i%(betan|finagh)|elugu|a%(mil|i%(xuanjingsymbols|_%(le|xuan_jing_symbols|tham|viet)|le| %(xuan jing symbols|le|tham|viet)|tham|viet)|g%(alog|s|banwa))|ransport%( and map symbols|_and_map_symbols|andmapsymbols)|ha%(i|ana))|a%(l%(chemical%([_ ]symbols|symbols)|phabetic%( presentation forms|_presentation_forms|presentationforms))|ncient%(_%(greek_%(musical_notation|numbers)|symbols)|greek%(numbers|musicalnotation)| %(greek %(numbers|musical notation)|symbols)|symbols)|egean%(numbers|[ _]numbers)|vestan|r%(abic%( %(supplement|presentation forms\-[ab])|supplement|_%(presentation_forms_[ab]|supplement)|presentationforms\-[ab])?|menian|rows))|u%(garitic|nified%(canadianaboriginalsyllabics%(extended)?|_canadian_aboriginal_syllabics%(_extended)?| canadian aboriginal syllabics%( extended)?))|v%(a%(i|riation%( selectors%( supplement)?|selectors%(supplement)?|_selectors%(_supplement)?))|e%(rtical%(forms|[ _]forms)|dic%([ _]extensions|extensions))))\}" contained display syntax match clojureRegexpPredefinedCharClass "\v%(\\[dDsSwW]|\.)" contained display syntax cluster clojureRegexpCharPropertyClasses contains=clojureRegexpPosixCharClass,clojureRegexpJavaCharClass,clojureRegexpUnicodeCharClass @@ -117,9 +122,13 @@ syntax keyword clojureCommentTodo contai syntax match clojureComment ";.*$" contains=clojureCommentTodo,@Spell syntax match clojureComment "#!.*$" -syntax region clojureSexp matchgroup=clojureParen start="(" matchgroup=clojureParen end=")" contains=TOP,@Spell -syntax region clojureVector matchgroup=clojureParen start="\[" matchgroup=clojureParen end="]" contains=TOP,@Spell -syntax region clojureMap matchgroup=clojureParen start="{" matchgroup=clojureParen end="}" contains=TOP,@Spell +" -*- TOP CLUSTER -*- +" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj +syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector + +syntax region clojureSexp matchgroup=clojureParen start="(" matchgroup=clojureParen end=")" contains=@clojureTop fold +syntax region clojureVector matchgroup=clojureParen start="\[" matchgroup=clojureParen end="]" contains=@clojureTop fold +syntax region clojureMap matchgroup=clojureParen start="{" matchgroup=clojureParen end="}" contains=@clojureTop fold " Highlight superfluous closing parens, brackets and braces. syntax match clojureError "]\|}\|)" diff --git a/runtime/syntax/datascript.vim b/runtime/syntax/datascript.vim --- a/runtime/syntax/datascript.vim +++ b/runtime/syntax/datascript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Datascript " Maintainer: Dominique Pelle -" Last Change: 2012 Apr 30 +" Last Change: 2014 Feb 26 " " DataScript is a formal language for modelling binary datatypes, " bitstreams or file formats. For more information, see: @@ -16,8 +16,8 @@ let s:keepcpo= &cpo set cpo&vim syn keyword dsPackage import package -syn keyword dsType bit string -syn keyword dsType int8 int16 int32 int64 +syn keyword dsType bit bool string +syn keyword dsType int int8 int16 int32 int64 syn keyword dsType uint8 uint16 uint32 uint64 syn keyword dsType leint16 leint32 leint64 syn keyword dsType leuint16 leuint32 leuint64 @@ -25,13 +25,14 @@ syn keyword dsEndian little big syn keyword dsAlign align syn keyword dsLabel case default syn keyword dsConditional if condition -syn keyword dsCompound union choice on enum bitmask subtype +syn keyword dsBoolean true false +syn keyword dsCompound union choice on enum bitmask subtype explicit syn keyword dsKeyword function return syn keyword dsOperator sizeof bitsizeof lengthof is sum forall in syn keyword dsStorageClass const syn keyword dsTodo contained TODO FIXME XXX -syn keyword dsSql sql sql_table sql_database sql_pragma -syn keyword dsSql sql_integer sql_metadata sql_key +syn keyword dsSql sql sql_table sql_database sql_pragma sql_index +syn keyword dsSql sql_integer sql_metadata sql_key foreign_key " dsCommentGroup allows adding matches for special things in comments. syn cluster dsCommentGroup contains=dsTodo @@ -70,6 +71,7 @@ hi def link dsOffset Label hi def link dsSql PreProc hi def link dsCompound Structure hi def link dsConditional Conditional +hi def link dsBoolean Boolean hi def link dsKeyword Statement hi def link dsString String hi def link dsNumber Number diff --git a/src/po/eo.po b/src/po/eo.po --- a/src/po/eo.po +++ b/src/po/eo.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Vim(Esperanto)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-27 04:50+0200\n" -"PO-Revision-Date: 2013-05-27 04:55+0200\n" +"POT-Creation-Date: 2014-03-21 23:15+0100\n" +"PO-Revision-Date: 2014-03-21 23:16+0100\n" "Last-Translator: Dominique PELLÉ \n" "Language-Team: \n" "Language: eo\n" @@ -93,6 +93,9 @@ msgstr "1 bufro detruita" msgid "%d buffers wiped out" msgstr "%d bufroj detruitaj" +msgid "E90: Cannot unload last buffer" +msgstr "E90: Ne eblas malŝargi la lastan bufron" + msgid "E84: No modified buffer found" msgstr "E84: Neniu modifita bufro trovita" @@ -116,9 +119,6 @@ msgstr "" "E89: Neniu skribo de post la lasta ŝanĝo de la bufro %ld (aldonu ! por " "transpasi)" -msgid "E90: Cannot unload last buffer" -msgstr "E90: Ne eblas malŝargi la lastan bufron" - msgid "W14: Warning: List of file names overflow" msgstr "W14: Averto: Listo de dosiernomoj troas" @@ -153,6 +153,9 @@ msgstr "[Nova dosiero]" msgid "[Read errors]" msgstr "[Eraroj de legado]" +msgid "[RO]" +msgstr "[Nurlegebla]" + msgid "[readonly]" msgstr "[nurlegebla]" @@ -437,6 +440,9 @@ msgstr "E130: Nekonata funkcio: %s" msgid "E461: Illegal variable name: %s" msgstr "E461: Nevalida nomo de variablo: %s" +msgid "E806: using Float as a String" +msgstr "E806: uzo de Glitpunktnombro kiel Ĉeno" + msgid "E687: Less targets than List items" msgstr "E687: Malpli da celoj ol Listeroj" @@ -596,13 +602,13 @@ msgstr "E785: complete() uzeblas nur en Enmeta reĝimo" msgid "&Ok" msgstr "&Bone" -msgid "extend() argument" -msgstr "argumento de extend()" - #, c-format msgid "E737: Key already exists: %s" msgstr "E737: Ŝlosilo jam ekzistas: %s" +msgid "extend() argument" +msgstr "argumento de extend()" + msgid "map() argument" msgstr "argumento de map()" @@ -700,9 +706,6 @@ msgstr "E730: uzo de Listo kiel Ĉeno" msgid "E731: using Dictionary as a String" msgstr "E731: uzo de Vortaro kiel Ĉeno" -msgid "E806: using Float as a String" -msgstr "E806: uzo de Glitpunktnombro kiel Ĉeno" - #, c-format msgid "E706: Variable type mismatch for: %s" msgstr "E706: Nekongrua datumtipo de variablo: %s" @@ -1664,9 +1667,6 @@ msgstr "[kontaktoskatolo]" msgid "[character special]" msgstr "[speciala signo]" -msgid "[RO]" -msgstr "[Nurlegebla]" - msgid "[CR missing]" msgstr "[CR mankas]" @@ -2268,32 +2268,28 @@ msgid "Font '%s' is not fixed-width" msgstr "Tiparo '%s' ne estas egallarĝa" #, c-format -msgid "E253: Fontset name: %s\n" -msgstr "E253: Nomo de tiparo: %s\n" - -#, c-format -msgid "Font0: %s\n" -msgstr "Font0: %s\n" - -#, c-format -msgid "Font1: %s\n" -msgstr "Font1: %s\n" - -#, c-format -msgid "Font%ld width is not twice that of font0\n" -msgstr "Font%ld ne estas duoble pli larĝa ol font0\n" - -#, c-format -msgid "Font0 width: %ld\n" -msgstr "Larĝo de font0: %ld\n" - -#, c-format -msgid "" -"Font1 width: %ld\n" -"\n" -msgstr "" -"Larĝo de Font1: %ld\n" -"\n" +msgid "E253: Fontset name: %s" +msgstr "E253: Nomo de tiparo: %s" + +#, c-format +msgid "Font0: %s" +msgstr "Font0: %s" + +#, c-format +msgid "Font1: %s" +msgstr "Font1: %s" + +#, c-format +msgid "Font%ld width is not twice that of font0" +msgstr "Font%ld ne estas duoble pli larĝa ol font0" + +#, c-format +msgid "Font0 width: %ld" +msgstr "Larĝo de font0: %ld" + +#, c-format +msgid "Font1 width: %ld" +msgstr "Larĝo de Font1: %ld" msgid "Invalid font specification" msgstr "Nevalida tiparo specifita" @@ -2482,6 +2478,9 @@ msgstr "E566: Ne eblis krei duktojn de c msgid "E622: Could not fork for cscope" msgstr "E622: Ne eblis forki cscope" +msgid "cs_create_connection setpgid failed" +msgstr "plenumo de cs_create_connection-setgpid fiaskis" + msgid "cs_create_connection exec failed" msgstr "plenumo de cs_create_connection fiaskis" @@ -2649,9 +2648,6 @@ msgstr "nepermesebla en sabloludejo de V msgid "E836: This Vim cannot execute :python after using :py3" msgstr "E836: Vim ne povas plenumi :python post uzo de :py3" -msgid "only string keys are allowed" -msgstr "nur ĉenaj ŝlosiloj estas permeseblaj" - msgid "" "E263: Sorry, this command is disabled, the Python library could not be " "loaded." @@ -2665,9 +2661,6 @@ msgstr "E659: Ne eblas alvoki Pitonon re msgid "E837: This Vim cannot execute :py3 after using :python" msgstr "E837: Vim ne povas plenumi :py3 post uzo de :python" -msgid "index must be int or slice" -msgstr "indekso devas esti 'int' aŭ 'slice'" - msgid "E265: $_ must be an instance of String" msgstr "E265: $_ devas esti apero de Ĉeno" @@ -4009,13 +4002,6 @@ msgstr " (Interrompita)" msgid "Beep!" msgstr "Bip!" -msgid "Vim: preserving files...\n" -msgstr "Vim: konservo de dosieroj...\n" - -#. close all memfiles, without deleting -msgid "Vim: Finished.\n" -msgstr "Vim: Finita.\n" - msgid "ERROR: " msgstr "ERARO: " @@ -4529,17 +4515,6 @@ msgstr "E244: Nevalida nomo de signaro \ msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: Nevalida signo '%c' en nomo de tiparo \"%s\"" -msgid "Vim: Double signal, exiting\n" -msgstr "Vim: Duobla signalo, eliranta\n" - -#, c-format -msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: Kaptis mortigantan signalon %s\n" - -#, c-format -msgid "Vim: Caught deadly signal\n" -msgstr "Vim: Kaptis mortigantan signalon\n" - #, c-format msgid "Opening the X display took %ld msec" msgstr "Malfermo de vidigo X daŭris %ld msek" @@ -4769,6 +4744,21 @@ msgstr "E54: Neekvilibra %s(" msgid "E55: Unmatched %s)" msgstr "E55: Neekvilibra %s" +msgid "E66: \\z( not allowed here" +msgstr "E66: \\z( estas nepermesebla tie" + +# DP: vidu http://www.thefreedictionary.com/et+al. +msgid "E67: \\z1 et al. not allowed here" +msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie" + +#, c-format +msgid "E69: Missing ] after %s%%[" +msgstr "E69: Mankas ] post %s%%[" + +#, c-format +msgid "E70: Empty %s%%[]" +msgstr "E70: Malplena %s%%[]" + msgid "E339: Pattern too long" msgstr "E339: Ŝablono tro longa" @@ -4808,25 +4798,10 @@ msgstr "E64: %s%c sekvas nenion" msgid "E65: Illegal back reference" msgstr "E65: Nevalida retro-referenco" -msgid "E66: \\z( not allowed here" -msgstr "E66: \\z( estas permesebla tie" - -# DP: vidu http://www.thefreedictionary.com/et+al. -msgid "E67: \\z1 et al. not allowed here" -msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie" - msgid "E68: Invalid character after \\z" msgstr "E68: Nevalida signo post \\z" #, c-format -msgid "E69: Missing ] after %s%%[" -msgstr "E69: Mankas ] post %s%%[" - -#, c-format -msgid "E70: Empty %s%%[]" -msgstr "E70: Malplena %s%%[]" - -#, c-format msgid "E678: Invalid character after %s%%[dxouU]" msgstr "E678: Nevalida signo post %s%%[dxouU]" @@ -4848,17 +4823,25 @@ msgstr "" "E864: \\%#= povas nur esti sekvita de 0, 1, aŭ 2. La aŭtomata motoro de " "regulesprimo estos uzata " +msgid "E865: (NFA) Regexp end encountered prematurely" +msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue" + #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (NFA-regulesprimo) Mispoziciigita %c" -msgid "E865: (NFA) Regexp end encountered prematurely" -msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue" +#, c-format +msgid "E877: (NFA regexp) Invalid character class: %ld" +msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo: %ld" #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" msgstr "E867: (NFA) Nekonata operatoro '\\z%c'" +#, c-format +msgid "E867: (NFA) Unknown operator '\\%%%c'" +msgstr "E867: (NFA) Nekonata operatoro '\\%%%c'" + #. should never happen msgid "E868: Error building NFA with equivalence class!" msgstr "E868: Eraro dum prekomputado de NFA kun ekvivalentoklaso!" @@ -4870,14 +4853,19 @@ msgstr "E869: (NFA) Nekonata operatoro ' msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFS-regulesprimo) Eraro dum legado de limoj de ripeto" +#. Can't have a multi follow a multi. msgid "E871: (NFA regexp) Can't have a multi follow a multi !" msgstr "" "E871: (NFA-regulesprimo) Ne povas havi mult-selekton tuj post alia mult-" "selekto!" +#. Too many `(' msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA-regulesprimo) tro da '('" +msgid "E879: (NFA regexp) Too many \\z(" +msgstr "E879: (NFA-regulesprimo) tro da \\z(" + msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA-regulesprimo) propra end-eraro" @@ -4894,17 +4882,8 @@ msgstr "" msgid "E876: (NFA regexp) Not enough space to store the whole NFA " msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmomorigi la tutan NFA " -msgid "E999: (NFA regexp internal error) Should not process NOT node !" -msgstr "" -"E999: (interna eraro de NFA-regulesprimo) Ne devus procezi nodon 'NOT'!" - -#. should not be here :P -msgid "E877: (NFA regexp) Invalid character class " -msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo " - -#, c-format -msgid "(NFA) COULD NOT OPEN %s !" -msgstr "(NFA) NE POVIS MALFERMI %s!" +msgid "E878: (NFA) Could not allocate memory for branch traversal!" +msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!" msgid "" "Could not open temporary log file for writing, displaying on stderr ... " @@ -4912,8 +4891,9 @@ msgstr "" "Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur " "stderr ..." -msgid "E878: (NFA) Could not allocate memory for branch traversal!" -msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!" +#, c-format +msgid "(NFA) COULD NOT OPEN %s !" +msgstr "(NFA) NE POVIS MALFERMI %s!" msgid "Could not open temporary log file for writing " msgstr "Ne povis malfermi la provizoran protokolan dosieron por skribi " @@ -5354,12 +5334,12 @@ msgid "E765: 'spellfile' does not have % msgstr "E765: 'spellfile' ne havas %ld rikordojn" #, c-format -msgid "Word removed from %s" -msgstr "Vorto fortirita el %s" - -#, c-format -msgid "Word added to %s" -msgstr "Vorto aldonita al %s" +msgid "Word '%.*s' removed from %s" +msgstr "Vorto '%.*s' fortirita el %s" + +#, c-format +msgid "Word '%.*s' added to %s" +msgstr "Vorto '%.*s' aldonita al %s" msgid "E763: Word characters differ between spell files" msgstr "E763: Signoj de vorto malsamas tra literumaj dosieroj" @@ -5413,6 +5393,9 @@ msgstr "E782: eraro dum legado de dosier msgid "E783: duplicate char in MAP entry" msgstr "E783: ripetita signo en rikordo MAP" +msgid "No Syntax items defined for this buffer" +msgstr "Neniu sintaksa elemento difinita por tiu bufro" + #, c-format msgid "E390: Illegal argument: %s" msgstr "E390: Nevalida argumento: %s" @@ -5421,9 +5404,6 @@ msgstr "E390: Nevalida argumento: %s" msgid "E391: No such syntax cluster: %s" msgstr "E391: Nenia sintaksa fasko: %s" -msgid "No Syntax items defined for this buffer" -msgstr "Neniu sintaksa elemento difinita por tiu bufro" - msgid "syncing on C-style comments" msgstr "sinkronigo per C-stilaj komentoj" @@ -5549,6 +5529,11 @@ msgstr "E409: Nekonata nomo de grupo: %s msgid "E410: Invalid :syntax subcommand: %s" msgstr "E410: Nevalida \":syntax\" subkomando: %s" +msgid "" +" TOTAL COUNT MATCH SLOWEST AVERAGE NAME PATTERN" +msgstr "" +" TOTALO NOMBRO KONGRUO PLEJ MALRAPID MEZA NOMO ŜABLONO" + msgid "E679: recursive loop loading syncolor.vim" msgstr "E679: rekursia buklo dum ŝargo de syncolor.vim" @@ -5744,8 +5729,8 @@ msgstr "Uzis CUT_BUFFER0 anstataŭ malplenan apartigon" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -msgid "E834: Line count changed unexpectedly" -msgstr "E834: Nombro de linioj ŝanĝiĝis neatendite" +msgid "E881: Line count changed unexpectedly" +msgstr "E881: Nombro de linioj ŝanĝiĝis neatendite" #. must display the prompt msgid "No undo possible; continue anyway" @@ -6474,6 +6459,9 @@ msgstr "E485: Ne eblas legi dosieron %s" msgid "E37: No write since last change (add ! to override)" msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)" +msgid "E37: No write since last change" +msgstr "E37: Neniu skribo de post lasta ŝanĝo" + msgid "E38: Null argument" msgstr "E38: Nula argumento" @@ -6631,153 +6619,204 @@ msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO" msgid "Need encryption key for \"%s\"" msgstr "Ŝlosilo de ĉifrado bezonata por \"%s\"" -msgid "can't delete OutputObject attributes" -msgstr "ne eblas forviŝi atributojn de OutputObject" - -msgid "softspace must be an integer" -msgstr "malmolspaceto (softspace) devas esti entjero" - -msgid "invalid attribute" -msgstr "nevalida atributo" - -msgid "writelines() requires list of strings" -msgstr "writelines() bezonas liston de ĉenoj" - -msgid "E264: Python: Error initialising I/O objects" -msgstr "E264: Pitono: Eraro de pravalorizo de eneligaj objektoj" - msgid "empty keys are not allowed" msgstr "malplenaj ŝlosiloj nepermeseblaj" -msgid "Cannot delete DictionaryObject attributes" -msgstr "ne eblas forviŝi atributojn de DictionaryObject" - -msgid "Cannot modify fixed dictionary" -msgstr "Ne eblas ŝanĝi fiksan vortaron" - -msgid "Cannot set this attribute" -msgstr "Ne eblas agordi tiun atributon" - -msgid "dict is locked" +msgid "dictionary is locked" msgstr "vortaro estas ŝlosita" -msgid "failed to add key to dictionary" -msgstr "aldono de ŝlosilo al vortaro fiaskis" - -msgid "list index out of range" -msgstr "indekso de listo ekster limoj" - -msgid "internal error: failed to get vim list item" -msgstr "interna eraro: obteno de vim-a listero fiaskis" - msgid "list is locked" msgstr "listo estas ŝlosita" -msgid "Failed to add item to list" -msgstr "Aldono de listero fiaskis" - -msgid "internal error: no vim list item" -msgstr "interna eraro: neniu vim-a listero" - -msgid "can only assign lists to slice" -msgstr "nur eblas pravalorizi listojn al segmento" +#, c-format +msgid "failed to add key '%s' to dictionary" +msgstr "aldono de ŝlosilo '%s' al vortaro fiaskis" + +#, c-format +msgid "index must be int or slice, not %s" +msgstr "indekso devas esti 'int' aŭ 'slice', ne %s" + +#, c-format +msgid "expected str() or unicode() instance, but got %s" +msgstr "atendis aperon de str() aŭ unicode(), sed ricevis %s" + +#, c-format +msgid "expected bytes() or str() instance, but got %s" +msgstr "atendis aperon de bytes() aŭ str(), sed ricevis %s" + +#, c-format +msgid "" +"expected int(), long() or something supporting coercing to long(), but got %s" +msgstr "atendis int(), long() aŭ ion konverteblan al long(), sed ricevis %s" + +#, c-format +msgid "expected int() or something supporting coercing to int(), but got %s" +msgstr "atendis int() aŭ ion konverteblan al int(), sed ricevis %s" + +msgid "value is too large to fit into C int type" +msgstr "valoro estas tro grada por C-tipo 'int'" + +msgid "value is too small to fit into C int type" +msgstr "valoro estas tro malgranda por C-tipo 'int'" + +msgid "number must be greater than zero" +msgstr "nombro devas esti pli granda ol nul" + +msgid "number must be greater or equal to zero" +msgstr "nombro devas esti egala aŭ pli granda ol nul" + +msgid "can't delete OutputObject attributes" +msgstr "ne eblas forviŝi atributojn de OutputObject" + +#, c-format +msgid "invalid attribute: %s" +msgstr "nevalida atributo: %s" + +msgid "E264: Python: Error initialising I/O objects" +msgstr "E264: Pitono: Eraro de pravalorizo de eneligaj objektoj" + +msgid "failed to change directory" +msgstr "ne povis ŝanĝi dosierujon" + +#, c-format +msgid "expected 3-tuple as imp.find_module() result, but got %s" +msgstr "atendis 3-opon kiel rezulto de imp.find_module(), sed ricevis %s" + +#, c-format +msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d" +msgstr "atendis 3-opon kiel rezulto de imp.find_module(), sed ricevis %d-opon" + +msgid "internal error: imp.find_module returned tuple with NULL" +msgstr "interna eraro: imp.find_module liveris opon kun NULL" + +msgid "cannot delete vim.Dictionary attributes" +msgstr "ne eblas forviŝi atributojn de 'vim.Dictionary'" + +msgid "cannot modify fixed dictionary" +msgstr "ne eblas ŝanĝi fiksan vortaron" + +#, c-format +msgid "cannot set attribute %s" +msgstr "ne eblas agordi atributon %s" + +msgid "hashtab changed during iteration" +msgstr "hakettabelo ŝanĝiĝis dum iteracio" + +#, c-format +msgid "expected sequence element of size 2, but got sequence of size %d" +msgstr "atendis 2-longan sekvencon, sed ricevis %d-longan sekvencon" + +msgid "list constructor does not accept keyword arguments" +msgstr "konstruilo de listo ne akceptas ŝlosilvortajn argumentojn" + +msgid "list index out of range" +msgstr "indekso de listo ekster limoj" + +#. No more suitable format specifications in python-2.3 +#, c-format +msgid "internal error: failed to get vim list item %d" +msgstr "interna eraro: obteno de vim-a listero %d fiaskis" + +msgid "slice step cannot be zero" +msgstr "paŝo de sekco ne povas esti nul" + +#, c-format +msgid "attempt to assign sequence of size greater than %d to extended slice" +msgstr "provis valorizi sekvencon kun pli ol %d eroj en etendita sekco" + +#, c-format +msgid "internal error: no vim list item %d" +msgstr "interna eraro: neniu vim-a listero %d" + +msgid "internal error: not enough list items" +msgstr "interna eraro: ne sufiĉaj listeroj" msgid "internal error: failed to add item to list" msgstr "interna eraro: aldono de listero fiaskis" -msgid "can only concatenate with lists" -msgstr "eblas nur kunmeti kun listoj" - -msgid "cannot delete vim.dictionary attributes" -msgstr "ne eblas forviŝi atributojn de 'vim.dictionary'" +#, c-format +msgid "attempt to assign sequence of size %d to extended slice of size %d" +msgstr "provis valorizi sekvencon kun %d eroj al etendita sekco kun %d eroj" + +msgid "failed to add item to list" +msgstr "aldono de listero fiaskis" + +msgid "cannot delete vim.List attributes" +msgstr "ne eblas forviŝi atributojn de 'vim.List'" msgid "cannot modify fixed list" msgstr "ne eblas ŝanĝi fiksan liston" -msgid "cannot set this attribute" -msgstr "ne eblas agordi tiun atributon" - -msgid "'self' argument must be a dictionary" -msgstr "argumento 'self' devas esti vortaro" - -msgid "failed to run function" -msgstr "fiaskis ruli funkcion" +#, c-format +msgid "unnamed function %s does not exist" +msgstr "sennoma funkcio %s ne ekzistas" + +#, c-format +msgid "function %s does not exist" +msgstr "funkcio %s ne ekzistas" + +msgid "function constructor does not accept keyword arguments" +msgstr "konstruilo de funkcio ne akceptas ŝlosilvortajn argumentojn" + +#, c-format +msgid "failed to run function %s" +msgstr "fiaskis ruli funkcion %s" msgid "unable to get option value" msgstr "fiaskis akiri valoron de opcio" -msgid "unable to unset global option" -msgstr "ne povis malŝalti mallokan opcion" - -msgid "unable to unset option without global value" -msgstr "ne povis malŝalti opcion sen malloka valoro" - -msgid "object must be integer" -msgstr "objekto devas esti entjero." - -msgid "object must be string" -msgstr "objekto devas esti ĉeno" +msgid "internal error: unknown option type" +msgstr "interna eraro: nekonata tipo de opcio" + +msgid "problem while switching windows" +msgstr "problemo dum salto al vindozoj" + +#, c-format +msgid "unable to unset global option %s" +msgstr "ne povis malŝalti mallokan opcion %s" + +#, c-format +msgid "unable to unset option %s which does not have global value" +msgstr "ne povis malŝalti opcion %s, kiu ne havas mallokan valoron" msgid "attempt to refer to deleted tab page" msgstr "provo de referenco al forviŝita langeto" -#, c-format -msgid "" -msgstr "" - -#, c-format -msgid "" -msgstr "" - -#, c-format -msgid "" -msgstr "" - msgid "no such tab page" msgstr "ne estas tia langeto" msgid "attempt to refer to deleted window" msgstr "provo de referenco al forviŝita fenestro" -msgid "readonly attribute" -msgstr "nurlegebla atributo" +msgid "readonly attribute: buffer" +msgstr "nurlegebla atributo: buffer" msgid "cursor position outside buffer" msgstr "kursoro poziciita ekster bufro" -#, c-format -msgid "" -msgstr "" - -#, c-format -msgid "" -msgstr "" - -#, c-format -msgid "" -msgstr "" - msgid "no such window" msgstr "ne estas tia fenestro" msgid "attempt to refer to deleted buffer" msgstr "provo de referenco al forviŝita bufro" -#, c-format -msgid "" -msgstr "" - -msgid "key must be integer" -msgstr "ŝlosilo devas esti entjero." - -msgid "expected vim.buffer object" -msgstr "atendis objekton vim.buffer" - -msgid "failed to switch to given buffer" -msgstr "ne povis salti al la specifita bufro" - -msgid "expected vim.window object" -msgstr "atendis objekton vim.window" +msgid "failed to rename buffer" +msgstr "ne povis renomi bufron" + +msgid "mark name must be a single character" +msgstr "nomo de marko devas esti unuopa signo" + +#, c-format +msgid "expected vim.Buffer object, but got %s" +msgstr "atendis objekton vim.Buffer, sed ricevis %s" + +#, c-format +msgid "failed to switch to buffer %d" +msgstr "ne povis salti al la bufro %d" + +#, c-format +msgid "expected vim.Window object, but got %s" +msgstr "atendis objekton vim.window, sed ricevis %s" msgid "failed to find window in the current tab page" msgstr "ne povis trovi vindozon en la nuna langeto" @@ -6785,8 +6824,9 @@ msgstr "ne povis trovi vindozon en la nu msgid "did not switch to the specified window" msgstr "ne saltis al la specifita vindozo" -msgid "expected vim.tabpage object" -msgstr "atendis objekton vim.tabpage" +#, c-format +msgid "expected vim.TabPage object, but got %s" +msgstr "atendis objekton vim.TabPage, sed ricevis %s" msgid "did not switch to the specified tab page" msgstr "ne saltis al la specifita langeto" @@ -6800,26 +6840,34 @@ msgstr "E858: Eval ne revenis kun valida msgid "E859: Failed to convert returned python object to vim value" msgstr "E859: Konverto de revena python-objekto al vim-valoro fiaskis" -msgid "unable to convert to vim structure" -msgstr "ne povis konverti al vim-strukturo" - -msgid "NULL reference passed" -msgstr "NULL-referenco argumento" +#, c-format +msgid "unable to convert %s to vim dictionary" +msgstr "ne povis konverti %s al vim-vortaro" + +#, c-format +msgid "unable to convert %s to vim structure" +msgstr "ne povis konverti %s al vim-strukturo" + +msgid "internal error: NULL reference passed" +msgstr "interna eraro: NULL-referenco argumento" msgid "internal error: invalid value type" msgstr "interna eraro: nevalida tipo de valoro" -#~ msgid "E863: return value must be an instance of str" -#~ msgstr "E863: elira valoro devas esti apero de str" - -#~ msgid "E860: Eval did not return a valid python 3 object" -#~ msgstr "E860: Eval ne revenis kun valida python3-objekto" - -#~ msgid "E861: Failed to convert returned python 3 object to vim value" -#~ msgstr "E861: Konverto de revena python3-objekto al vim-valoro fiaskis" - -#~ msgid "Only boolean objects are allowed" -#~ msgstr "Nur buleaj objektoj estas permeseblaj" - -#~ msgid "no such key in dictionary" -#~ msgstr "tiu ŝlosilo ne ekzistas en vortaro" +msgid "" +"Failed to set path hook: sys.path_hooks is not a list\n" +"You should now do the following:\n" +"- append vim.path_hook to sys.path_hooks\n" +"- append vim.VIM_SPECIAL_PATH to sys.path\n" +msgstr "" +"Fiaskis valorizi sys.path_hooks: sys.path_hooks ne estas listo\n" +"Vi nun devas fari tion:\n" +"- postaldoni vim.path_hook al sys.path_hooks\n" +"- postaldoni vim.VIM_SPECIAL_PATH al sys.path\n" + +msgid "" +"Failed to set path: sys.path is not a list\n" +"You should now append vim.VIM_SPECIAL_PATH to sys.path" +msgstr "" +"Ne povis agordi serĉvojon: sys.path ne estas listo\n" +"Vi nun devas aldoni vim.VIM_SPECIAL_PATH al sys.path" diff --git a/src/po/ru.cp1251.po b/src/po/ru.cp1251.po --- a/src/po/ru.cp1251.po +++ b/src/po/ru.cp1251.po @@ -3,14 +3,14 @@ # Vim ":help uganda" # # vassily "vr" ragosin , 2004 -# Sergey Alyoshin , 2013 +# Sergey Alyoshin , 2013-2014 # msgid "" msgstr "" "Project-Id-Version: vim_7.4_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-31 16:42+0400\n" -"PO-Revision-Date: 2013-08-31 21:11+0400\n" +"POT-Creation-Date: 2014-03-24 12:18+0400\n" +"PO-Revision-Date: 2014-03-24 12:18 +0400\n" "Last-Translator: Sergey Alyoshin \n" "Language-Team: \n" "Language: Russian\n" @@ -79,6 +79,9 @@ msgstr " " msgid "%d buffers wiped out" msgstr " : %d" +msgid "E90: Cannot unload last buffer" +msgstr "E90: " + msgid "E84: No modified buffer found" msgstr "E84: " @@ -101,9 +104,6 @@ msgid "E89: No write since last change f msgstr "" "E89: %ld ( !, )" -msgid "E90: Cannot unload last buffer" -msgstr "E90: " - msgid "W14: Warning: List of file names overflow" msgstr "W14: : " @@ -568,7 +568,6 @@ msgstr "E725: dict : %s" msgid "E808: Number or Float required" msgstr "E808: " -#. " p()" E741 E742 msgid "add() argument" msgstr " add()" @@ -590,15 +589,12 @@ msgstr "&Ok" msgid "E737: Key already exists: %s" msgstr "E737: : %s" -#. " p()" E741 E742 msgid "extend() argument" msgstr " extend()" -#. " p()" E741 E742 msgid "map() argument" msgstr " map()" -#. " p()" E741 E742 msgid "filter() argument" msgstr " filter()" @@ -620,7 +616,6 @@ msgstr "" msgid "called inputrestore() more often than inputsave()" msgstr " inputrestore() , inputsave()" -#. " p()" E741 E742 msgid "insert() argument" msgstr " insert()" @@ -649,21 +644,18 @@ msgstr "E241: %s" msgid "E277: Unable to read a server reply" msgstr "E277: " -#. " p()" E741 E742 msgid "remove() argument" msgstr " remove()" msgid "E655: Too many symbolic links (cycle?)" msgstr "E655: (?)" -#. " p()" E741 E742 msgid "reverse() argument" msgstr " reverse()" msgid "E258: Unable to send to client" msgstr "E258: " -#. " p()" E741 E742 msgid "sort() argument" msgstr " sort()" @@ -715,7 +707,6 @@ msgstr "" msgid "E705: Variable name conflicts with existing function: %s" msgstr "E705: : %s" -#. %s = " p" #, c-format msgid "E741: Value is locked: %s" msgstr "E741: %s " @@ -723,7 +714,6 @@ msgstr "E741: %s " msgid "Unknown" msgstr "" -#. %s = " p()" #, c-format msgid "E742: Cannot change value of %s" msgstr "E742: %s" @@ -1550,7 +1540,7 @@ msgstr "E603: :catch :try" #. Give up for a ":catch" after ":finally" and ignore it. #. * Just parse. msgid "E604: :catch after :finally" -msgstr "E604: :catch :finally" +msgstr "E604: :catch :finally" msgid "E606: :finally without :try" msgstr "E606: :finally :try" @@ -4029,13 +4019,6 @@ msgstr " ()" msgid "Beep!" msgstr "-!" -msgid "Vim: preserving files...\n" -msgstr "Vim: ...\n" - -#. close all memfiles, without deleting -msgid "Vim: Finished.\n" -msgstr "Vim: .\n" - msgid "ERROR: " msgstr ": " @@ -4551,17 +4534,6 @@ msgstr "E244: \"%s\" \"%s\"" msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: '%c' \"%s\"" -msgid "Vim: Double signal, exiting\n" -msgstr "Vim: , \n" - -#, c-format -msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: %s\n" - -#, c-format -msgid "Vim: Caught deadly signal\n" -msgstr "Vim: \n" - #, c-format msgid "Opening the X display took %ld msec" msgstr " X %ld msec" @@ -4869,12 +4841,16 @@ msgstr "" "E864: \\%#= 0, 1 2. " " " +msgid "E865: (NFA) Regexp end encountered prematurely" +msgstr "E865: () " + #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (. ) %c" -msgid "E865: (NFA) Regexp end encountered prematurely" -msgstr "E865: () " +#, c-format +msgid "E877: (NFA regexp) Invalid character class: %ld" +msgstr "E877: (. ) : %ld" #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" @@ -5378,12 +5354,12 @@ msgid "E765: 'spellfile' does not have % msgstr "E765: 'spellfile' %ld " #, c-format -msgid "Word removed from %s" -msgstr " %s" - -#, c-format -msgid "Word added to %s" -msgstr " %s" +msgid "Word '%.*s' removed from %s" +msgstr " '%.*s' %s" + +#, c-format +msgid "Word '%.*s' added to %s" +msgstr " '%.*s' %s" msgid "E763: Word characters differ between spell files" msgstr "E763: " @@ -5773,8 +5749,8 @@ msgstr " CUT_BUFFER0" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -msgid "E834: Line count changed unexpectedly" -msgstr "E834: " +msgid "E881: Line count changed unexpectedly" +msgstr "E881: " #. must display the prompt msgid "No undo possible; continue anyway" @@ -6489,6 +6465,9 @@ msgstr "E485: %s" msgid "E37: No write since last change (add ! to override)" msgstr "E37: ( !, )" +msgid "E37: No write since last change" +msgstr "E37: " + msgid "E38: Null argument" msgstr "E38: " @@ -6688,7 +6667,7 @@ msgstr " C" msgid "value is too small to fit into C int type" msgstr " C" -msgid "number must be greater then zero" +msgid "number must be greater than zero" msgstr " " msgid "number must be greater or equal to zero" @@ -6750,16 +6729,34 @@ msgstr " " msgid "internal error: failed to get vim list item %d" msgstr " : VIM- %d" -msgid "failed to add item to list" -msgstr " " +msgid "slice step cannot be zero" +msgstr " " + +#, c-format +msgid "attempt to assign sequence of size greater than %d to extended slice" +msgstr "" +" %d " +"" #, c-format msgid "internal error: no vim list item %d" msgstr " : VIM- %d" +msgid "internal error: not enough list items" +msgstr " : " + msgid "internal error: failed to add item to list" msgstr " : " +#, c-format +msgid "attempt to assign sequence of size %d to extended slice of size %d" +msgstr "" +" %d " +" %d" + +msgid "failed to add item to list" +msgstr " " + msgid "cannot delete vim.List attributes" msgstr " vim.List" diff --git a/src/po/ru.po b/src/po/ru.po --- a/src/po/ru.po +++ b/src/po/ru.po @@ -3,14 +3,14 @@ # Об условиях использования читайте в редакторе Vim ":help uganda" # # vassily "vr" ragosin , 2004 -# Sergey Alyoshin , 2013 +# Sergey Alyoshin , 2013-2014 # msgid "" msgstr "" "Project-Id-Version: vim_7.4_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-31 16:42+0400\n" -"PO-Revision-Date: 2013-08-31 21:11+0400\n" +"POT-Creation-Date: 2014-03-24 12:18+0400\n" +"PO-Revision-Date: 2014-03-24 12:18 +0400\n" "Last-Translator: Sergey Alyoshin \n" "Language-Team: \n" "Language: Russian\n" @@ -79,6 +79,9 @@ msgstr "Один буфер очищен" msgid "%d buffers wiped out" msgstr "Всего очищено буферов: %d" +msgid "E90: Cannot unload last buffer" +msgstr "E90: Невозможно выгрузить из памяти последний буфер" + msgid "E84: No modified buffer found" msgstr "E84: Изменённых буферов не обнаружено" @@ -101,9 +104,6 @@ msgid "E89: No write since last change f msgstr "" "E89: Изменения в буфере %ld не сохранены (добавьте !, чтобы обойти проверку)" -msgid "E90: Cannot unload last buffer" -msgstr "E90: Невозможно выгрузить из памяти последний буфер" - msgid "W14: Warning: List of file names overflow" msgstr "W14: Предупреждение: переполнение списка имён файлов" @@ -568,7 +568,6 @@ msgstr "E725: Вызов функции dict без словаря: %s" msgid "E808: Number or Float required" msgstr "E808: Требуется целое число или с плавающей точкой" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "add() argument" msgstr "параметра add()" @@ -590,15 +589,12 @@ msgstr "&Ok" msgid "E737: Key already exists: %s" msgstr "E737: Ключ уже существует: %s" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "extend() argument" msgstr "параметра extend()" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "map() argument" msgstr "параметра map()" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "filter() argument" msgstr "параметра filter()" @@ -620,7 +616,6 @@ msgstr "" msgid "called inputrestore() more often than inputsave()" msgstr "Функция inputrestore() вызывается чаще, чем функция inputsave()" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "insert() argument" msgstr "параметра insert()" @@ -649,21 +644,18 @@ msgstr "E241: Не могу отправить сообщение для %s" msgid "E277: Unable to read a server reply" msgstr "E277: Сервер не отвечает" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "remove() argument" msgstr "параметра remove()" msgid "E655: Too many symbolic links (cycle?)" msgstr "E655: Слишком много символических ссылок (цикл?)" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "reverse() argument" msgstr "параметра reverse()" msgid "E258: Unable to send to client" msgstr "E258: Не могу ответить клиенту" -#. Используется для получения "значение параметра p()" в E741 и E742 msgid "sort() argument" msgstr "параметра sort()" @@ -715,7 +707,6 @@ msgstr "" msgid "E705: Variable name conflicts with existing function: %s" msgstr "E705: Имя переменной конфликтует с существующей функцией: %s" -#. Используется с %s = "параметера p" #, c-format msgid "E741: Value is locked: %s" msgstr "E741: Значение %s заблокировано" @@ -723,7 +714,6 @@ msgstr "E741: Значение %s заблокировано" msgid "Unknown" msgstr "Неизвестно" -#. Используется с %s = "параметера p()" #, c-format msgid "E742: Cannot change value of %s" msgstr "E742: Невозможно изменить значение %s" @@ -1550,7 +1540,7 @@ msgstr "E603: :catch без :try" #. Give up for a ":catch" after ":finally" and ignore it. #. * Just parse. msgid "E604: :catch after :finally" -msgstr "E604: :catch без :finally" +msgstr "E604: :catch после :finally" msgid "E606: :finally without :try" msgstr "E606: :finally без :try" @@ -4029,13 +4019,6 @@ msgstr " (Прервано)" msgid "Beep!" msgstr "Би-би!" -msgid "Vim: preserving files...\n" -msgstr "Vim: сохранение файлов...\n" - -#. close all memfiles, without deleting -msgid "Vim: Finished.\n" -msgstr "Vim: Готово.\n" - msgid "ERROR: " msgstr "ОШИБКА: " @@ -4551,17 +4534,6 @@ msgstr "E244: Недопустимое имя кодировки \"%s\" в имени шрифта \"%s\"" msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: Недопустимый символ '%c' в имени шрифта \"%s\"" -msgid "Vim: Double signal, exiting\n" -msgstr "Vim: Двойной сигнал, завершение работы\n" - -#, c-format -msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: Получен убийственный сигнал %s\n" - -#, c-format -msgid "Vim: Caught deadly signal\n" -msgstr "Vim: Получен убийственный сигнал\n" - #, c-format msgid "Opening the X display took %ld msec" msgstr "Открытие дисплея X заняло %ld msec" @@ -4869,12 +4841,16 @@ msgstr "" "E864: после \\%#= может быть только 0, 1 или 2. Будет использоваться " "автоматическая машина" +msgid "E865: (NFA) Regexp end encountered prematurely" +msgstr "E865: (НКА) неожиданный конец регулярного выражения" + #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (рег. выражение НКА) неожиданный %c" -msgid "E865: (NFA) Regexp end encountered prematurely" -msgstr "E865: (НКА) неожиданный конец регулярного выражения" +#, c-format +msgid "E877: (NFA regexp) Invalid character class: %ld" +msgstr "E877: (рег. выражение НКА) неправильный класс символов: %ld" #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" @@ -5378,12 +5354,12 @@ msgid "E765: 'spellfile' does not have % msgstr "E765: 'spellfile' не содержит %ld элементов" #, c-format -msgid "Word removed from %s" -msgstr "Слово удалено из %s" - -#, c-format -msgid "Word added to %s" -msgstr "Слово добавлено в %s" +msgid "Word '%.*s' removed from %s" +msgstr "Слово '%.*s' удалено из %s" + +#, c-format +msgid "Word '%.*s' added to %s" +msgstr "Слово '%.*s' добавлено в %s" msgid "E763: Word characters differ between spell files" msgstr "E763: Символы слов отличаются в файлах правописания" @@ -5773,8 +5749,8 @@ msgstr "Вместо пустого выделения используется CUT_BUFFER0" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -msgid "E834: Line count changed unexpectedly" -msgstr "E834: Неожиданно изменился счётчик строк" +msgid "E881: Line count changed unexpectedly" +msgstr "E881: Неожиданно изменился счётчик строк" #. must display the prompt msgid "No undo possible; continue anyway" @@ -6489,6 +6465,9 @@ msgstr "E485: Невозможно прочитать файл %s" msgid "E37: No write since last change (add ! to override)" msgstr "E37: Изменения не сохранены (добавьте !, чтобы обойти проверку)" +msgid "E37: No write since last change" +msgstr "E37: Изменения не сохранены" + msgid "E38: Null argument" msgstr "E38: Нулевой параметр" @@ -6688,7 +6667,7 @@ msgstr "Значение слишком велико для целочисленного типа C" msgid "value is too small to fit into C int type" msgstr "Значение слишком мало для целочисленного типа C" -msgid "number must be greater then zero" +msgid "number must be greater than zero" msgstr "Номер должен быть больше нуля" msgid "number must be greater or equal to zero" @@ -6750,16 +6729,34 @@ msgstr "Индекс списка за пределами диапазона" msgid "internal error: failed to get vim list item %d" msgstr "Внутренняя ошибка: не удалось получить элемент VIM-списка %d" -msgid "failed to add item to list" -msgstr "Невозможно добавить элемент в список" +msgid "slice step cannot be zero" +msgstr "Шаг выборки не может быть нулевым" + +#, c-format +msgid "attempt to assign sequence of size greater than %d to extended slice" +msgstr "" +"Попытка присвоить последовательность размером больше чем %d к расширенной " +"выборке" #, c-format msgid "internal error: no vim list item %d" msgstr "Внутренняя ошибка: нет элемента VIM-списка %d" +msgid "internal error: not enough list items" +msgstr "Внутренняя ошибка: недостаточно элемнтов списка" + msgid "internal error: failed to add item to list" msgstr "Внутренняя ошибка: не удалось добавить элемент в список" +#, c-format +msgid "attempt to assign sequence of size %d to extended slice of size %d" +msgstr "" +"Попытка присвоить последовательность размером %d к расширенной выборке " +"размером %d" + +msgid "failed to add item to list" +msgstr "Невозможно добавить элемент в список" + msgid "cannot delete vim.List attributes" msgstr "Невозможно удалить атрибуты vim.List"