From 19a09a189379659b917cf5ccff78f3e5ec061015 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 4 Mar 2005 23:39:37 +0000 Subject: updated for version 7.0055 --- Filelist | 2 +- runtime/doc/autocmd.txt | 7 +- runtime/doc/eval.txt | 28 +- runtime/doc/options.txt | 8 +- runtime/doc/tags | 7 + runtime/doc/term.txt | 16 +- runtime/doc/todo.txt | 36 +- runtime/doc/various.txt | 3 +- runtime/doc/version7.txt | 16 +- runtime/keymap/canfr-win.vim | 91 + runtime/scripts.vim | 6 +- runtime/syntax/prescribe.vim | 69 + runtime/syntax/vim.vim | 4 +- src/VisVim/Res/ToolbarL.bmp | Bin 0 -> 2678 bytes src/VisVim/Res/ToolbarM.bmp | Bin 0 -> 758 bytes src/eval.c | 47 +- src/fileio.c | 60 +- src/getchar.c | 4 + src/gui_gtk_x11.c | 89 +- src/gui_w32.c | 22 +- src/gui_x11.c | 2 + src/keymap.h | 15 +- src/misc2.c | 1 + src/normal.c | 3 +- src/option.c | 4 +- src/os_mac_conv.c | 8 +- src/os_mswin.c | 7 +- src/po/ja.po | 3778 ++++++++++++++++++++++++------------------ src/po/ja.sjis.po | 3778 ++++++++++++++++++++++++------------------ src/proto/eval.pro | 1 + src/proto/tag.pro | 1 + src/regexp.c | 28 +- src/tag.c | 125 ++ src/term.c | 198 ++- src/testdir/test24.in | Bin 890 -> 975 bytes src/testdir/test24.ok | 3 + src/undo.c | 4 + src/version.h | 4 +- src/vim.h | 4 +- 39 files changed, 5024 insertions(+), 3455 deletions(-) create mode 100644 runtime/keymap/canfr-win.vim create mode 100644 runtime/syntax/prescribe.vim create mode 100644 src/VisVim/Res/ToolbarL.bmp create mode 100644 src/VisVim/Res/ToolbarM.bmp diff --git a/Filelist b/Filelist index bdd33c1624..57edbe9819 100644 --- a/Filelist +++ b/Filelist @@ -325,7 +325,7 @@ SRC_DOS = \ # source files for DOS without CR/LF translation (also in the extra archive) SRC_DOS_BIN = \ - src/VisVim/Res \ + src/VisVim/Res/*.bmp \ src/tearoff.bmp \ src/tools.bmp \ src/tools16.bmp \ diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index e994df8867..44608a0bff 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Feb 21 +*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -286,7 +286,7 @@ FileChangedShell When Vim notices that the modification time of change. |timestamp| Mostly triggered after executing a shell command, but also with a |:checktime| command - or when Vim regains input focus. + or when Gvim regains input focus. This autocommand is triggered for each changed file. It is not used when 'autoread' is set and the buffer was not changed. If a @@ -294,6 +294,9 @@ FileChangedShell When Vim notices that the modification time of warning message and prompt is not given. This is useful for reloading related buffers which are affected by a single command. + The |v:fcs_reason| variable is set to indicate + what happened and |v:fcs_choice| can be used + to tell Vim what to do next. NOTE: When this autocommand is executed, the current buffer "%" may be different from the buffer that was changed "". diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 1838a82258..1cfa7b0fc3 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2005 Feb 26 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1183,6 +1183,32 @@ v:exception The value of the exception most recently caught and not :endtry < Output: "caught oops". + *v:fcs_reason* *fcs_reason-variable* +v:fcs_reason The reason why the |FileChangedShell| event was triggered. + Can be used in an autocommand to decide what to do and/or what + to set v:fcs_choice to. Possible values: + deleted file no longer exists + conflict file contents, mode or timestamp was + changed and buffer is modified + changed file contents has changed + mode mode of file changed + time only file timestamp changed + + *v:fcs_choice* *fcs_choice-variable* +v:fcs_choice What should happen after a |FileChangedShell| event was + triggered. Can be used in an autocommand to tell Vim what to + do with the affected buffer: + reload Reload the buffer (does not work if + the file was deleted). + ask Ask the user what to do, as if there + was no autocommand. Except that when + only the timestamp changed nothing + will happen. + Nothing, the autocommand should do + everything that needs to be done. + The default is empty. If another (invalid) value is used then + Vim behaves like it is empty, there is no warning message. + *v:fname_in* *fname_in-variable* v:fname_in The name of the input file. Only valid while evaluating: option used for ~ diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 4bf27f66df..d0b5abf745 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2005 Feb 23 +*options.txt* For Vim version 7.0aa. Last change: 2005 Mar 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -6833,9 +6833,9 @@ A jump table for the options with a short description can be found at |Q_op|. global Window height. Do not confuse this with the height of the Vim window, use 'lines' for that. - Used for |CTRL-F| and |CTRL-B| when the value is smaller than 'lines' - minus one. The screen will scroll 'window' minus two lines, with a - minimum of one. + Used for |CTRL-F| and |CTRL-B| when there is only one window and the + value is smaller than 'lines' minus one. The screen will scroll + 'window' minus two lines, with a minimum of one. When 'window' is equal to 'lines' minus one CTRL-F and CTRL-B scroll in a much smarter way, taking care of wrapping lines. When resizing the Vim window, the value is smaller than 1 or more than diff --git a/runtime/doc/tags b/runtime/doc/tags index 4f73e69b22..c4cdbbb92f 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4782,6 +4782,8 @@ faq intro.txt /*faq* farsi farsi.txt /*farsi* farsi.txt farsi.txt /*farsi.txt* fasm.vim syntax.txt /*fasm.vim* +fcs_choice-variable eval.txt /*fcs_choice-variable* +fcs_reason-variable eval.txt /*fcs_reason-variable* feature-list eval.txt /*feature-list* fetch pi_netrw.txt /*fetch* file-browser-5.2 version5.txt /*file-browser-5.2* @@ -5078,6 +5080,7 @@ hebrew hebrew.txt /*hebrew* hebrew.txt hebrew.txt /*hebrew.txt* help various.txt /*help* help-context help.txt /*help-context* +help-tags tags 1 help-translated various.txt /*help-translated* help-xterm-window various.txt /*help-xterm-window* help.txt help.txt /*help.txt* @@ -5901,6 +5904,7 @@ printing print.txt /*printing* printing-formfeed print.txt /*printing-formfeed* profile repeat.txt /*profile* profiling repeat.txt /*profiling* +profiling-variable eval.txt /*profiling-variable* progname-variable eval.txt /*progname-variable* progress-syntax syntax.txt /*progress-syntax* progress.vim syntax.txt /*progress.vim* @@ -6620,6 +6624,8 @@ v:ctype eval.txt /*v:ctype* v:dying eval.txt /*v:dying* v:errmsg eval.txt /*v:errmsg* v:exception eval.txt /*v:exception* +v:fcs_choice eval.txt /*v:fcs_choice* +v:fcs_reason eval.txt /*v:fcs_reason* v:fname_diff eval.txt /*v:fname_diff* v:fname_in eval.txt /*v:fname_in* v:fname_new eval.txt /*v:fname_new* @@ -6634,6 +6640,7 @@ v:lang eval.txt /*v:lang* v:lc_time eval.txt /*v:lc_time* v:lnum eval.txt /*v:lnum* v:prevcount eval.txt /*v:prevcount* +v:profiling eval.txt /*v:profiling* v:progname eval.txt /*v:progname* v:register eval.txt /*v:register* v:servername eval.txt /*v:servername* diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index b9252a93d6..fba493c707 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.0aa. Last change: 2004 Dec 07 +*term.txt* For Vim version 7.0aa. Last change: 2005 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -146,7 +146,7 @@ sequence of bytes. *vt100-function-keys* *xterm-function-keys* An xterm can send function keys F1 to F4 in two modes: vt100 compatible or -not. Because Vim cannot know what the xterm is sending, both types of keys +not. Because Vim may not know what the xterm is sending, both types of keys are recognized. The same happens for the and keys. normal vt100 ~ t_k1 [11~ OP *-xterm* @@ -167,6 +167,18 @@ recognizes most of them. Use ":set termcap" to check which are supported and what the codes are. Mostly these are not in a termcap, they are only supported by the builtin_xterm termcap. + *xterm-modifier-keys* +Newer versions of xterm support Alt and Ctrl for most function keys. To avoid +having to add all combinations of Alt, Ctrl and Shift for every key a special +sequence is recognized at the end of a termcap entry: ";*X". The "X" can be +any character, often '~' is used. The ";*" stands for an optional modifier +argument. ";2" is Shift, ";3" is Alt, ";5" is Ctrl and ";9" is Meta (when +it's different from Alt). They can be combined. Examples: > + :set =^[[19;*~ + :set =^[[1;*H +Another speciality about these codes is that they are not overwritten by +another code. That is to avoid that the codes obtained from xterm directly +|t_RV| overwrite them. *xterm-scroll-region* The default termcap entry for xterm on Sun and other platforms does not contain the entry for scroll regions. Add ":cs=\E[%i%d;%dr:" to the xterm diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index a1c487de2e..833b6aa715 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Feb 28 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,17 +30,25 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +- Steve Wall has a patch (2005 Mar 3) for adding function keys up to 37, + with modifiers. + Still need to recognize modifiers in "ESC O 5 F". "ESC O * F"? +":map lll" has no effect. + Mingw code to catch out-of-stack error doesn't work. See MINGW_TRY in regexp.c. Try with example from Michaelis. -Russian helpfile doesn't show up correctly when 'encoding' is koi8-r. -(Vassily Ragosin 2005 Feb 16) - Mac unicode patch (Da Woon Jung): -- typing doesn't work - selecting proportional font breaks display +- UTF-8 text causes display problems. Character width wrong? Patch for gettags(). Yegappan Lakshmanan Feb 27 +- docs: use of ^ and $ in pattern, refer to |tag-regexp| + explain what the fields mean. + use of 'tags' option + +- Patch from Steve Wall (2005 Mar 3) for xterm mouse positioning above + column 223. autoload: - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of @@ -55,6 +63,8 @@ autoload: Patch for 'balloonexpr' option. Sergey Khorev, Feb 26. Addition Feb 27. +Patch for "paranoid mode" by Kevin Collins, March 3. + Awaiting response: - Patch for mch_FullName() also in Vim 6.3? os_mswin.c - Win32: tearoff menu window should have a scrollbar when it's taller than @@ -181,10 +191,6 @@ PLANNED FOR VERSION 7.0: screen has not yet been allocated with the new size. - Running a shell command from the GUI still has limitations. Look into how the Vim shell project can help: http://vimshell.wana.at -8 When a file is change outside of Vim and unmodified in Vim there is no - simple way to automatically reload the file. Either add an option for - this or make it simple to have the FileChangedShell invoke the normal - action, telling it what to do. - Displaying size of Visual area: use 24-33 column display. When selecting multiple lines, up to about a screenfull, also count the characters. @@ -258,12 +264,6 @@ Updated Ruby interface. (Ryan Paul) Awaiting updated patches: --- awaiting updated patch --- - 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ): - 'flipcase' variable: upper/lowercase pairs. - Insert comma's between pairs and allow a range, make it look like - 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to - separate the from and to part is optional. - Resp: no time now. 8 Add GTK 2.3 file dialog support. Patch by Grahame Bowland, 2004 Mar 15, but it doesn't use "initdir" or "dflt". (will update patch) 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. @@ -323,12 +323,6 @@ Awaiting updated patches: done for filetype detection. Patch from Walter Briscoe, 2003 Jul 1. 7 Add a "-@ filelist" argument: read file names from a file. (David Kotchan has a patch for it) - 8 Add term entries for function keys on xterm with alt and ctrl (new in - pl 94). E.g., Control adds ";5" in "[20;5~". Find a generic way - to prepend a modifier in console mode, to avoid having to specify each - individual modified key. - Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37, - with modifiers. 8 Include a connection to an external program through a pipe? See patches from Felbinger for a mathematica interface. Or use emacs server kind of thing? diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 31aa8af34d..7c0e74d04c 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.0aa. Last change: 2005 Feb 21 +*various.txt* For Vim version 7.0aa. Last change: 2005 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -324,6 +324,7 @@ N *+path_extra* Up/downwards search in 'path' and 'tags' m *+perl* Perl interface |perl|, may have |/dyn| *+postscript* |:hardcopy| writes a PostScript file N *+printer* |:hardcopy| command +H *+profile* |:profile| command m *+python* Python interface |python|, may have |/dyn| N *+quickfix* |:make| and |quickfix| commands B *+rightleft* Right to left typing |'rightleft'| diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 2ac2ceac2c..5fb35644ed 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2005 Feb 27 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Mar 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -412,6 +412,9 @@ Autocommands can be defined local to a buffer. This means they will also work when the buffer does not have a name or no specific name. See |autocmd-buflocal|. (Yakov Lerner) +For xterm most combinations of modifiers with function keys are recognized. +|xterm-modifier-keys| + ============================================================================== IMPROVEMENTS *improvements-7* @@ -539,7 +542,11 @@ To count items (pattern matches) without changing the buffer the 'n' flag has been added to |:substitute|. See |count-items|. The "screen.linux" $TERM name is recognized to set the default for -'background' to "dark". (Ciaran McCreesh) +'background' to "dark". (Ciaran McCreesh) Also for "cygwin". + +The |FileChangedShell| autocommand event can now use the |v:fcs_reason| +variable that specifies what triggered the event. |v:fcs_choice| can be used +to reload the buffer or ask the user what to do. ============================================================================== COMPILE TIME CHANGES *compile-changes-7* @@ -897,4 +904,9 @@ from the terminal we actually get 3 lines for the cmdline in gvim. When setting $HOME allocated memory would leak. +Win32: bold characters may sometimes write in another character cell. Use +unicodepdy[] as for UTF-8. (Taro Muraoka) + +":w fname" didn't work for files with 'buftype' set to "nofile". + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/keymap/canfr-win.vim b/runtime/keymap/canfr-win.vim new file mode 100644 index 0000000000..7a405bf0be --- /dev/null +++ b/runtime/keymap/canfr-win.vim @@ -0,0 +1,91 @@ +" Vim Keymap file for the normalized Canadian multilingual keyboard +" CAN/CSA Z243.200-92 using the latin1 encoding. +" This mapping is limited in scope, as it assumes that the AltGr +" key works as it typically does in a Windows system with a multilingual +" English keyboard. It probably won't work with the US keyboard on US +" English versions of Windows, because those don't provide the AltGr keys. +" The mapping was tested with Win2k and WinXP. + +" Maintainer: Eric Joanis +" Last Change: 2004 Jan 13 + +" 2003 Dec 04 +" Initial Revision + +" 2004 Jan 13 +" Added the upper case accented characters, forgotten in the initial version. + +" All characters are given literally, conversion to another encoding (e.g., +" UTF-8) should work. +scriptencoding latin1 + +" Use this short name in the status line. +let b:keymap_name = "canfr" + +loadkeymap +< ' +> " +/ é +? É +' è +\" È +\\ à +| À +[a â +[e ê +[i î +[o ô +[u û +[A  +[E Ê +[I Î +[O Ô +[U Û +[[ ^ +{a ä +{e ë +{i ï +{o ö +{u ü +{y ÿ +{A Ä +{E Ë +{I Ï +{O Ö +{U Ü +] ç +} Ç +` / +~ \\ +^ ? +ú « +ø » +¬ < +® > +» ° +Ûa à +Ûe è +Ûi ì +Ûo ò +Ûu ù +ÛA À +ÛE È +ÛI Ì +ÛO Ò +ÛU Ù +ÛÛ ` +Ýa ã +Ýo õ +Ýn ñ +Ýs ß +ÝA à +ÝO Õ +ÝN Ñ +ÝS ß +ÝÝ ~ +à | +· { +¸ } +¹ [ +° ] +½ ¬ diff --git a/runtime/scripts.vim b/runtime/scripts.vim index 69bee3aaf7..e25da8717d 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types in scripts " " Maintainer: Bram Moolenaar -" Last change: 2004 Oct 02 +" Last change: 2005 Mar 04 " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by @@ -222,6 +222,10 @@ else elseif s:line2 =~ '^CVS:' || getline("$") =~ '^CVS: ' set ft=cvs + " Prescribe + elseif s:line1 =~ '^!R!' + set ft=prescribe + " Send-pr elseif s:line1 =~ '^SEND-PR:' set ft=sendpr diff --git a/runtime/syntax/prescribe.vim b/runtime/syntax/prescribe.vim new file mode 100644 index 0000000000..d89ee35253 --- /dev/null +++ b/runtime/syntax/prescribe.vim @@ -0,0 +1,69 @@ +" Vim syntax file +" Language: Kyocera PreScribe2e +" Maintainer: Klaus Muth +" URL: http://www.hampft.de/vim/syntax/prescribe.vim +" Last Change: 2005 Mar 04 + +" For version 5.x: Clear all syntax items +" For version 6.x: Quit when a syntax file was already loaded +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +syn match prescribeSpecial "!R!" + +" all prescribe commands +syn keyword prescribeStatement ALTF AMCR ARC ASFN ASTK BARC BLK BOX CALL +syn keyword prescribeStatement CASS CIR CLIP CLPR CLSP COPY CPTH CSET CSTK +syn keyword prescribeStatement CTXT DAF DAM DAP DELF DELM DPAT DRP DRPA DUPX +syn keyword prescribeStatement DXPG DXSD DZP ENDD ENDM ENDR EPL EPRM EXIT +syn keyword prescribeStatement FDIR FILL FLAT FLST FONT FPAT FRPO FSET FTMD +syn keyword prescribeStatement GPAT ICCD INTL JOG LDFC MAP MCRO MDAT MID +syn keyword prescribeStatement MLST MRP MRPA MSTK MTYP MZP NEWP PAGE PARC PAT +syn keyword prescribeStatement PCRP PCZP PDIR RDRP PDZP PELP PIE PMRA PMRP PMZP +syn keyword prescribeStatement PRBX PRRC PSRC PXPL RDMP RES RSL RGST RPCS RPF +syn keyword prescribeStatement RPG RPP RPU RTTX RTXT RVCD RVRD SBM SCAP SCCS +syn keyword prescribeStatement SCF SCG SCP SCPI SCRC SCS SCU SDP SEM SETF SFA +syn keyword prescribeStatement SFNT SIMG SIR SLJN SLM SLPI SLPP SLS SMLT SPD +syn keyword prescribeStatement SPL SPLT SPO SPSZ SPW SRM SRO SROP SSTK STAT STRK +syn keyword prescribeStatement SULP SVCP TATR TEXT TPRS UNIT UOM WIDE WRED XPAT +syn match prescribeStatement "\" +syn match prescribeStatement "\" +syn match prescribeStatement "\" +syn match prescribeStatement "\" +syn match prescribeStatement "\" +syn match prescribeStatement "\" +syn match prescribeStatement "\" + +syn match prescribeCSETArg "[0-9]\{1,3}[A-Z]" +syn match prescribeFRPOArg "[A-Z][0-9]\{1,2}" +syn match prescribeNumber "[0-9]\+" +syn region prescribeString start=+'+ end=+'+ skip=+\\'+ +syn region prescribeComment start=+CMNT+ end=+;+ + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_prescribe_syn_inits") + if version < 508 + let did_prescribe_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink prescribeSpecial PreProc + HiLink prescribeStatement Statement + HiLink prescribeNumber Number + HiLink prescribeCSETArg String + HiLink prescribeFRPOArg String + HiLink prescribeComment Comment + + delcommand HiLink +endif + +let b:current_syntax = "prescribe" + +" vim: ts=8 diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index b9af06416b..29575c7acf 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -2,7 +2,7 @@ " Language: Vim 7.0 script " Maintainer: Dr. Charles E. Campbell, Jr. " Last Change: February 22, 2005 -" Version: 7.0-07 +" Version: 7.0-08 " Automatically generated keyword lists: {{{1 " Quit when a syntax file was already loaded {{{2 @@ -245,7 +245,7 @@ syn match vimFilter contained "^!.\{-}\(|\|$\)" contains=vimSpecFile syn match vimFilter contained "\A!.\{-}\(|\|$\)"ms=s+1 contains=vimSpecFile " Complex repeats (:h complex-repeat) {{{2 -syn match vimCmplxRepeat '[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1 +"syn match vimCmplxRepeat '[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1 syn match vimCmplxRepeat '@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)' " Set command and associated set-options (vimOptions) with comment {{{2 diff --git a/src/VisVim/Res/ToolbarL.bmp b/src/VisVim/Res/ToolbarL.bmp new file mode 100644 index 0000000000..e11c66fc65 Binary files /dev/null and b/src/VisVim/Res/ToolbarL.bmp differ diff --git a/src/VisVim/Res/ToolbarM.bmp b/src/VisVim/Res/ToolbarM.bmp new file mode 100644 index 0000000000..22e15f4893 Binary files /dev/null and b/src/VisVim/Res/ToolbarM.bmp differ diff --git a/src/eval.c b/src/eval.c index bde12e56e1..c7aba51456 100644 --- a/src/eval.c +++ b/src/eval.c @@ -316,6 +316,8 @@ static struct vimvar {VV_NAME("val", VAR_UNKNOWN), VV_RO}, {VV_NAME("key", VAR_UNKNOWN), VV_RO}, {VV_NAME("profiling", VAR_NUMBER), VV_RO}, + {VV_NAME("fcs_reason", VAR_STRING), VV_RO}, + {VV_NAME("fcs_choice", VAR_STRING), 0}, }; /* shorthand */ @@ -549,6 +551,7 @@ static void f_synID __ARGS((typval_T *argvars, typval_T *rettv)); static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv)); static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv)); static void f_system __ARGS((typval_T *argvars, typval_T *rettv)); +static void f_taglist __ARGS((typval_T *argvars, typval_T *rettv)); static void f_tempname __ARGS((typval_T *argvars, typval_T *rettv)); static void f_tolower __ARGS((typval_T *argvars, typval_T *rettv)); static void f_toupper __ARGS((typval_T *argvars, typval_T *rettv)); @@ -6196,6 +6199,7 @@ static struct fst {"synIDattr", 2, 3, f_synIDattr}, {"synIDtrans", 1, 1, f_synIDtrans}, {"system", 1, 2, f_system}, + {"taglist", 1, 1, f_taglist}, {"tempname", 0, 0, f_tempname}, {"tolower", 1, 1, f_tolower}, {"toupper", 1, 1, f_toupper}, @@ -13133,6 +13137,35 @@ done: rettv->vval.v_string = res; } +/* + * "gettags()" function + */ + static void +f_taglist(argvars, rettv) + typval_T *argvars; + typval_T *rettv; +{ + char_u *tag_pattern; + list_T *l; + + tag_pattern = get_tv_string(&argvars[0]); + + rettv->vval.v_number = FALSE; + + l = list_alloc(); + if (l != NULL) + { + if (get_tags(l, tag_pattern) != FAIL) + { + rettv->vval.v_list = l; + rettv->v_type = VAR_LIST; + ++l->lv_refcount; + } + else + list_free(l); + } +} + /* * "tempname()" function */ @@ -14010,7 +14043,7 @@ set_vim_var_nr(idx, val) } /* - * Get number v: variable value; + * Get number v: variable value. */ long get_vim_var_nr(idx) @@ -14019,6 +14052,18 @@ get_vim_var_nr(idx) return vimvars[idx].vv_nr; } +#if defined(FEAT_AUTOCMD) || defined(PROTO) +/* + * Get string v: variable value. Uses a static buffer, can only be used once. + */ + char_u * +get_vim_var_str(idx) + int idx; +{ + return get_tv_string(&vimvars[idx].vv_tv); +} +#endif + /* * Set v:count, v:count1 and v:prevcount. */ diff --git a/src/fileio.c b/src/fileio.c index c3aef90a11..1edf0ae79a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1331,7 +1331,8 @@ retry: /* * If there is conversion error or not enough room try using - * another conversion. + * another conversion. Except for when there is no + * alternative (help files). */ while ((iconv(iconv_fd, (void *)&fromp, &from_size, &top, &to_size) @@ -2753,7 +2754,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit, if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD, sfname, sfname, FALSE, curbuf, eap))) { - if (bt_nofile(curbuf)) + if (overwriting && bt_nofile(curbuf)) nofile_err = TRUE; else apply_autocmds_exarg(EVENT_BUFWRITEPRE, @@ -2765,7 +2766,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit, if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD, sfname, sfname, FALSE, curbuf, eap))) { - if (bt_nofile(curbuf)) + if (overwriting && bt_nofile(curbuf)) nofile_err = TRUE; else apply_autocmds_exarg(EVENT_FILEWRITEPRE, @@ -5917,7 +5918,10 @@ buf_check_timestamp(buf, focus) #endif #ifdef FEAT_AUTOCMD static int busy = FALSE; + int n; + char_u *s; #endif + char *reason; /* If there is no file name, the buffer is not loaded, 'buftype' is * set, we are in the middle of a save or being called recursively: ignore @@ -5975,15 +5979,26 @@ buf_check_timestamp(buf, focus) reload = TRUE; else { -#ifdef FEAT_AUTOCMD - int n; + if (stat_res < 0) + reason = "deleted"; + else if (bufIsChanged(buf)) + reason = "conflict"; + else if (orig_size != buf->b_orig_size || buf_contents_changed(buf)) + reason = "changed"; + else if (orig_mode != buf->b_orig_mode) + reason = "mode"; + else + reason = "time"; +#ifdef FEAT_AUTOCMD /* * Only give the warning if there are no FileChangedShell * autocommands. * Avoid being called recursively by setting "busy". */ busy = TRUE; + set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1); + set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1); n = apply_autocmds(EVENT_FILECHANGEDSHELL, buf->b_fname, buf->b_fname, FALSE, buf); busy = FALSE; @@ -5991,13 +6006,19 @@ buf_check_timestamp(buf, focus) { if (!buf_valid(buf)) EMSG(_("E246: FileChangedShell autocommand deleted buffer")); - return 2; + s = get_vim_var_str(VV_FCS_CHOICE); + if (STRCMP(s, "reload") == 0 && *reason != 'd') + reload = TRUE; + else if (STRCMP(s, "ask") == 0) + n = FALSE; + else + return 2; } - else + if (!n) #endif { - if (stat_res < 0) - mesg = _("E211: Warning: File \"%s\" no longer available"); + if (*reason == 'd') + mesg = _("E211: File \"%s\" no longer available"); else { helpmesg = TRUE; @@ -6010,13 +6031,22 @@ buf_check_timestamp(buf, focus) * checked out of CVS). Always warn when the buffer was * changed. */ - if (bufIsChanged(buf)) + if (reason[2] == 'n') + { mesg = _("W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well"); - else if (orig_size != buf->b_orig_size - || buf_contents_changed(buf)) + mesg2 = _("See \":help W12\" for more info."); + } + else if (reason[1] == 'h') + { mesg = _("W11: Warning: File \"%s\" has changed since editing started"); - else if (orig_mode != buf->b_orig_mode) + mesg2 = _("See \":help W11\" for more info."); + } + else if (*reason == 'm') + { mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started"); + mesg2 = _("See \":help W16\" for more info."); + } + /* Else: only timestamp changed, ignored */ } } } @@ -6038,9 +6068,7 @@ buf_check_timestamp(buf, focus) path = home_replace_save(buf, buf->b_fname); if (path != NULL) { - if (helpmesg) - mesg2 = _("See \":help W11\" for more info."); - else + if (!helpmesg) mesg2 = ""; tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg) + STRLEN(mesg2) + 2)); diff --git a/src/getchar.c b/src/getchar.c index 8328e19a1d..e93ce05290 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1483,10 +1483,14 @@ vgetc() #endif ) { + int save_allow_keys = allow_keys; + ++no_mapping; + allow_keys = 0; /* make sure BS is not found */ c2 = vgetorpeek(TRUE); /* no mapping for these chars */ c = vgetorpeek(TRUE); --no_mapping; + allow_keys = save_allow_keys; if (c2 == KS_MODIFIER) { mod_mask = c; diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 8abdf86136..debc11bc45 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -896,6 +896,38 @@ keyval_to_string(unsigned int keyval, unsigned int state, char_u *string) } #endif /* HAVE_GTK2 */ + static int +modifiers_gdk2vim(guint state) +{ + int modifiers = 0; + + if (state & GDK_SHIFT_MASK) + modifiers |= MOD_MASK_SHIFT; + if (state & GDK_CONTROL_MASK) + modifiers |= MOD_MASK_CTRL; + if (state & GDK_MOD1_MASK) + modifiers |= MOD_MASK_ALT; + if (state & GDK_MOD4_MASK) + modifiers |= MOD_MASK_META; + + return modifiers; +} + + static int +modifiers_gdk2mouse(guint state) +{ + int modifiers = 0; + + if (state & GDK_SHIFT_MASK) + modifiers |= MOUSE_SHIFT; + if (state & GDK_CONTROL_MASK) + modifiers |= MOUSE_CTRL; + if (state & GDK_MOD1_MASK) + modifiers |= MOUSE_ALT; + + return modifiers; +} + /* * Main keyboard handler: */ @@ -1112,13 +1144,7 @@ key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) #endif ) { - modifiers = 0; - if (state & GDK_SHIFT_MASK) - modifiers |= MOD_MASK_SHIFT; - if (state & GDK_CONTROL_MASK) - modifiers |= MOD_MASK_CTRL; - if (state & GDK_MOD1_MASK) - modifiers |= MOD_MASK_ALT; + modifiers = modifiers_gdk2vim(state); /* * For some keys a shift modifier is translated into another key @@ -1598,13 +1624,7 @@ process_motion_notify(int x, int y, GdkModifierType state) } /* translate modifier coding between the main engine and GTK */ - vim_modifiers = 0x0; - if (state & GDK_SHIFT_MASK) - vim_modifiers |= MOUSE_SHIFT; - if (state & GDK_CONTROL_MASK) - vim_modifiers |= MOUSE_CTRL; - if (state & GDK_MOD1_MASK) - vim_modifiers |= MOUSE_ALT; + vim_modifiers = modifiers_gdk2mouse(state); /* inform the editor engine about the occurence of this event */ gui_send_mouse_event(button, x, y, FALSE, vim_modifiers); @@ -1796,13 +1816,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) xim_reset(); #endif - vim_modifiers = 0x0; - if (event->state & GDK_SHIFT_MASK) - vim_modifiers |= MOUSE_SHIFT; - if (event->state & GDK_CONTROL_MASK) - vim_modifiers |= MOUSE_CTRL; - if (event->state & GDK_MOD1_MASK) - vim_modifiers |= MOUSE_ALT; + vim_modifiers = modifiers_gdk2mouse(event->state); gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers); if (gtk_main_level() > 0) @@ -1821,7 +1835,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data) { int button; - int_u vim_modifiers = 0; + int_u vim_modifiers; if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget)) gtk_widget_grab_focus(widget); @@ -1844,12 +1858,7 @@ scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data) xim_reset(); # endif - if (event->state & GDK_SHIFT_MASK) - vim_modifiers |= MOUSE_SHIFT; - if (event->state & GDK_CONTROL_MASK) - vim_modifiers |= MOUSE_CTRL; - if (event->state & GDK_MOD1_MASK) - vim_modifiers |= MOUSE_ALT; + vim_modifiers = modifiers_gdk2mouse(event->state); gui_send_mouse_event(button, (int)event->x, (int)event->y, FALSE, vim_modifiers); @@ -1881,13 +1890,7 @@ button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data) x = event->x; y = event->y; - vim_modifiers = 0x0; - if (event->state & GDK_SHIFT_MASK) - vim_modifiers |= MOUSE_SHIFT; - if (event->state & GDK_CONTROL_MASK) - vim_modifiers |= MOUSE_CTRL; - if (event->state & GDK_MOD1_MASK) - vim_modifiers |= MOUSE_ALT; + vim_modifiers = modifiers_gdk2mouse(event->state); gui_send_mouse_event(MOUSE_RELEASE, x, y, FALSE, vim_modifiers); if (gtk_main_level() > 0) @@ -2001,16 +2004,11 @@ drag_handle_uri_list(GdkDragContext *context, if (fnames != NULL && nfiles > 0) { - int_u modifiers = 0; + int_u modifiers; gtk_drag_finish(context, TRUE, FALSE, time_); /* accept */ - if (state & GDK_SHIFT_MASK) - modifiers |= MOUSE_SHIFT; - if (state & GDK_CONTROL_MASK) - modifiers |= MOUSE_CTRL; - if (state & GDK_MOD1_MASK) - modifiers |= MOUSE_ALT; + modifiers = modifiers_gdk2mouse(state); gui_handle_drop(x, y, modifiers, fnames, nfiles); } @@ -2061,12 +2059,7 @@ drag_handle_text(GdkDragContext *context, vim_free(tmpbuf); # endif - if (state & GDK_SHIFT_MASK) - dropkey[2] |= MOD_MASK_SHIFT; - if (state & GDK_CONTROL_MASK) - dropkey[2] |= MOD_MASK_CTRL; - if (state & GDK_MOD1_MASK) - dropkey[2] |= MOD_MASK_ALT; + dropkey[2] = modifiers_gdk2vim(state); if (dropkey[2] != 0) add_to_input_buf(dropkey, (int)sizeof(dropkey)); diff --git a/src/gui_w32.c b/src/gui_w32.c index d6d37c4d16..2308362476 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -1958,7 +1958,7 @@ gui_mch_draw_string( ++clen; } ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row), - foptions, pcliprect, unicodebuf, clen, unicodepdy); + foptions, pcliprect, unicodebuf, clen, unicodepdy); len = cells; /* used for underlining */ } else if ((enc_codepage > 0 && (int)GetACP() != enc_codepage) || enc_latin9) @@ -1975,8 +1975,26 @@ gui_mch_draw_string( (char *)text, len, (LPWSTR)unicodebuf, unibuflen); if (len != 0) + { + /* Use unicodepdy to make characters fit as we expect, even + * when the font uses different widths (e.g., bold character + * is wider). */ + if (unicodepdy != NULL) + { + int i; + int cw; + + for (i = 0; i < len; ++i) + { + cw = utf_char2cells(unicodebuf[i]); + if (cw > 2) + cw = 1; + unicodepdy[i] = cw * gui.char_width; + } + } ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row), - foptions, pcliprect, unicodebuf, len, NULL); + foptions, pcliprect, unicodebuf, len, unicodepdy); + } } } else diff --git a/src/gui_x11.c b/src/gui_x11.c index 6d990c5d1b..809054f0f7 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -998,6 +998,8 @@ gui_x11_key_hit_cb(w, dud, event, dum) modifiers |= MOD_MASK_CTRL; if (ev_press->state & Mod1Mask) modifiers |= MOD_MASK_ALT; + if (ev_press->state & Mod4Mask) + modifiers |= MOD_MASK_META; /* * For some keys a shift modifier is translated into another key diff --git a/src/keymap.h b/src/keymap.h index cb79ad1e18..5babdf4af8 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -458,23 +458,24 @@ enum key_extra #define MOD_MASK_SHIFT 0x02 #define MOD_MASK_CTRL 0x04 #define MOD_MASK_ALT 0x08 /* aka META */ -#define MOD_MASK_2CLICK 0x10 /* use MOD_MASK_MULTI_CLICK */ -#define MOD_MASK_3CLICK 0x20 /* use MOD_MASK_MULTI_CLICK */ -#define MOD_MASK_4CLICK 0x30 /* use MOD_MASK_MULTI_CLICK */ +#define MOD_MASK_META 0x10 /* META when it's different from ALT */ +#define MOD_MASK_2CLICK 0x20 /* use MOD_MASK_MULTI_CLICK */ +#define MOD_MASK_3CLICK 0x40 /* use MOD_MASK_MULTI_CLICK */ +#define MOD_MASK_4CLICK 0x60 /* use MOD_MASK_MULTI_CLICK */ #ifdef MACOS -# define MOD_MASK_CMD 0x80 +# define MOD_MASK_CMD 0x80 #endif #define MOD_MASK_MULTI_CLICK (MOD_MASK_2CLICK|MOD_MASK_3CLICK|MOD_MASK_4CLICK) /* * The length of the longest special key name, including modifiers. - * Current longest is (length includes '<' and '>'). + * Current longest is (length includes '<' and '>'). */ -#define MAX_KEY_NAME_LEN 23 +#define MAX_KEY_NAME_LEN 25 /* Maximum length of a special key event as tokens. This includes modifiers. - * The longest event is something like which would be the + * The longest event is something like which would be the * following string of tokens: * * bitmask . diff --git a/src/misc2.c b/src/misc2.c index d5a80929be..9b21168d84 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -1644,6 +1644,7 @@ static struct modmasktable } mod_mask_table[] = { {MOD_MASK_ALT, MOD_MASK_ALT, (char_u)'M'}, + {MOD_MASK_META, MOD_MASK_META, (char_u)'T'}, {MOD_MASK_CTRL, MOD_MASK_CTRL, (char_u)'C'}, {MOD_MASK_SHIFT, MOD_MASK_SHIFT, (char_u)'S'}, {MOD_MASK_MULTI_CLICK, MOD_MASK_2CLICK, (char_u)'2'}, diff --git a/src/normal.c b/src/normal.c index 2d2efc2f31..9bf2e66b7c 100644 --- a/src/normal.c +++ b/src/normal.c @@ -2257,7 +2257,8 @@ do_mouse(oap, c, dir, count, fixindent) * multiple clicks and the middle mouse button. * Accept shift-leftmouse drags when 'mousemodel' is "popup.*". */ - if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT)) + if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT + | MOD_MASK_META)) && (!is_click || (mod_mask & MOD_MASK_MULTI_CLICK) || which_button == MOUSE_MIDDLE) diff --git a/src/option.c b/src/option.c index 5cf1b46209..e7210b3f96 100644 --- a/src/option.c +++ b/src/option.c @@ -3149,11 +3149,13 @@ set_init_2() * with a dark background, that can handle color. Recognized are: * "linux" Linux console * "screen.linux" Linux console with screen + * "cygwin" Cygwin shell */ idx = findoption((char_u *)"bg"); if (!(options[idx].flags & P_WAS_SET) && (STRCMP(T_NAME, "linux") == 0 - || STRCMP(T_NAME, "screen.linux") == 0)) + || STRCMP(T_NAME, "screen.linux") == 0 + || STRCMP(T_NAME, "cygwin") == 0)) { set_string_option_direct(NULL, idx, (char_u *)"dark", OPT_FREE); /* don't mark it as set, when starting the GUI it may be changed diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c index 68d46c0f2b..eed0ebbe96 100644 --- a/src/os_mac_conv.c +++ b/src/os_mac_conv.c @@ -292,7 +292,13 @@ mac_conv_init() if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding, utf8_canon_encoding) != noErr) - gUTF16ToUTF8Converter = NULL; + { + /* On pre-10.3, Unicode normalization is not available so + * fall back to non-normalizing converter */ + if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding, + utf8_encoding) != noErr) + gUTF16ToUTF8Converter = NULL; + } } /* diff --git a/src/os_mswin.c b/src/os_mswin.c index 4f3a49bef2..5e96da8afe 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -385,6 +385,7 @@ mch_FullName( else #endif { +#ifdef FEAT_MBYTE if (enc_codepage >= 0 && (int)GetACP() != enc_codepage # ifdef __BORLANDC__ /* Wide functions of Borland C 5.5 do not work on Windows 98. */ @@ -415,7 +416,6 @@ mch_FullName( vim_free(wname); vim_free(cname); } -#ifdef FEAT_MBYTE if (nResult == FAIL) /* fall back to non-wide function */ #endif { @@ -2487,8 +2487,13 @@ serverSendEnc(HWND target) COPYDATASTRUCT data; data.dwData = COPYDATA_ENCODING; +#ifdef FEAT_MBYTE data.cbData = STRLEN(p_enc) + 1; data.lpData = p_enc; +#else + data.cbData = STRLEN("latin1") + 1; + data.lpData = "latin1"; +#endif (void)SendMessage(target, WM_COPYDATA, (WPARAM)message_window, (LPARAM)(&data)); } diff --git a/src/po/ja.po b/src/po/ja.po index 17d94d5160..8b8559efcb 100644 --- a/src/po/ja.po +++ b/src/po/ja.po @@ -3,188 +3,188 @@ # Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help credits" in Vim to see a list of people who contributed. # -# MURAOKA Taro , 2001-4. -# Last Change: 29-Apr-2004. +# MURAOKA Taro , 2001-5. +# Last Change: 05-Mar-2005. # msgid "" msgstr "" -"Project-Id-Version: Vim 6.2\n" -"POT-Creation-Date: 2004-04-29 13:16+0900\n" -"PO-Revision-Date: 2004-04-29 13:00+0900\n" +"Project-Id-Version: Vim 7.0\n" +"POT-Creation-Date: 2005-03-04 13:11+0900\n" +"PO-Revision-Date: 2004-03-05 00:50+0900\n" "Last-Translator: MURAOKA Taro \n" "Language-Team: MURAOKA Taro \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=euc-jp\n" "Content-Transfer-Encoding: 8-bit\n" -#: buffer.c:102 +#: ../buffer.c:102 msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: ¥Ð¥Ã¥Õ¥¡¤ò1¤Ä¤âºîÀ®¤Ç¤­¤Ê¤¤¤Î¤Ç, ½ªÎ»¤·¤Þ¤¹..." -#: buffer.c:105 +#: ../buffer.c:105 msgid "E83: Cannot allocate buffer, using other one..." msgstr "E83: ¥Ð¥Ã¥Õ¥¡¤òºîÀ®¤Ç¤­¤Ê¤¤¤Î¤Ç, ¾¤Î¤ò»ÈÍѤ·¤Þ¤¹..." -#: buffer.c:805 +#: ../buffer.c:857 msgid "E515: No buffers were unloaded" msgstr "E515: ²òÊü¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó" -#: buffer.c:807 +#: ../buffer.c:859 msgid "E516: No buffers were deleted" msgstr "E516: ºï½ü¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó" -#: buffer.c:809 +#: ../buffer.c:861 msgid "E517: No buffers were wiped out" msgstr "E517: ÇË´þ¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó" -#: buffer.c:817 +#: ../buffer.c:869 msgid "1 buffer unloaded" msgstr "1 ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬²òÊü¤µ¤ì¤Þ¤·¤¿" -#: buffer.c:819 +#: ../buffer.c:871 #, c-format msgid "%d buffers unloaded" msgstr "%d ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬²òÊü¤µ¤ì¤Þ¤·¤¿" -#: buffer.c:824 +#: ../buffer.c:876 msgid "1 buffer deleted" msgstr "1 ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿" -#: buffer.c:826 +#: ../buffer.c:878 #, c-format msgid "%d buffers deleted" msgstr "%d ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿" -#: buffer.c:831 +#: ../buffer.c:883 msgid "1 buffer wiped out" msgstr "1 ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ÇË´þ¤µ¤ì¤Þ¤·¤¿" -#: buffer.c:833 +#: ../buffer.c:885 #, c-format msgid "%d buffers wiped out" msgstr "%d ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ÇË´þ¤µ¤ì¤Þ¤·¤¿" -#: buffer.c:894 +#: ../buffer.c:946 msgid "E84: No modified buffer found" msgstr "E84: Êѹ¹¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó" #. back where we started, didn't find anything. -#: buffer.c:933 +#: ../buffer.c:985 msgid "E85: There is no listed buffer" msgstr "E85: ¥ê¥¹¥Èɽ¼¨¤µ¤ì¤ë¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó" -#: buffer.c:945 +#: ../buffer.c:997 #, c-format msgid "E86: Buffer %ld does not exist" msgstr "E86: ¥Ð¥Ã¥Õ¥¡ %ld ¤Ï¤¢¤ê¤Þ¤»¤ó" -#: buffer.c:948 +#: ../buffer.c:1000 msgid "E87: Cannot go beyond last buffer" msgstr "E87: ºÇ¸å¤Î¥Ð¥Ã¥Õ¥¡¤ò±Û¤¨¤Æ°ÜÆ°¤Ï¤Ç¤­¤Þ¤»¤ó" -#: buffer.c:950 +#: ../buffer.c:1002 msgid "E88: Cannot go before first buffer" msgstr "E88: ºÇ½é¤Î¥Ð¥Ã¥Õ¥¡¤è¤êÁ°¤Ø¤Ï°ÜÆ°¤Ç¤­¤Þ¤»¤ó" -#: buffer.c:988 +#: ../buffer.c:1044 #, c-format msgid "E89: No write since last change for buffer %ld (add ! to override)" msgstr "E89: ¥Ð¥Ã¥Õ¥¡ %ld ¤ÎÊѹ¹¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤ÇÊѹ¹¤òÇË´þ)" -#: buffer.c:1005 +#: ../buffer.c:1061 msgid "E90: Cannot unload last buffer" msgstr "E90: ºÇ¸å¤Î¥Ð¥Ã¥Õ¥¡¤Ï²òÊü¤Ç¤­¤Þ¤»¤ó" -#: buffer.c:1538 +#: ../buffer.c:1611 msgid "W14: Warning: List of file names overflow" -msgstr "W14: ·Ù¹ð: ¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È¤¬Ä¹¤¹¤®¤Þ¤¹" +msgstr "W14: ·Ù¹ð: ¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹" -#: buffer.c:1709 +#: ../buffer.c:1795 #, c-format msgid "E92: Buffer %ld not found" msgstr "E92: ¥Ð¥Ã¥Õ¥¡ %ld ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" -#: buffer.c:1940 +#: ../buffer.c:2058 #, c-format msgid "E93: More than one match for %s" msgstr "E93: %s ¤ËÊ£¿ô¤Î³ºÅö¤¬¤¢¤ê¤Þ¤·¤¿" -#: buffer.c:1942 +#: ../buffer.c:2060 #, c-format msgid "E94: No matching buffer for %s" msgstr "E94: %s ¤Ë³ºÅö¤¹¤ë¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿" -#: buffer.c:2337 +#: ../buffer.c:2473 #, c-format msgid "line %ld" msgstr "¹Ô %ld" -#: buffer.c:2420 +#: ../buffer.c:2561 msgid "E95: Buffer with this name already exists" msgstr "E95: ¤³¤Î̾Á°¤Î¥Ð¥Ã¥Õ¥¡¤Ï´û¤Ë¤¢¤ê¤Þ¤¹" -#: buffer.c:2713 +#: ../buffer.c:2878 msgid " [Modified]" msgstr " [Êѹ¹¤¢¤ê]" -#: buffer.c:2718 +#: ../buffer.c:2883 msgid "[Not edited]" msgstr "[̤ÊÔ½¸]" -#: buffer.c:2723 +#: ../buffer.c:2888 msgid "[New file]" msgstr "[¿·¥Õ¥¡¥¤¥ë]" -#: buffer.c:2724 +#: ../buffer.c:2889 msgid "[Read errors]" msgstr "[Æɹþ¥¨¥é¡¼]" -#: buffer.c:2726 fileio.c:2049 +#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418 msgid "[readonly]" msgstr "[ÆɹþÀìÍÑ]" -#: buffer.c:2747 +#: ../buffer.c:2912 msgid "1 line --%d%%--" msgstr "1 ¹Ô --%d%%--" -#: buffer.c:2749 +#: ../buffer.c:2914 msgid "%ld lines --%d%%--" msgstr "%ld ¹Ô --%d%%--" -#: buffer.c:2756 +#: ../buffer.c:2921 msgid "line %ld of %ld --%d%%-- col " msgstr "¹Ô %ld (Á´ÂÎ %ld) --%d%%-- col " -#: buffer.c:2864 -msgid "[No file]" -msgstr "[̵Âê]" +#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657 +msgid "[No Name]" +msgstr "[̵̾]" #. must be a help buffer -#: buffer.c:2904 +#: ../buffer.c:3068 msgid "help" msgstr "¥Ø¥ë¥×" -#: buffer.c:3463 screen.c:5038 +#: ../buffer.c:3619 ../screen.c:5071 msgid "[help]" msgstr "[¥Ø¥ë¥×]" -#: buffer.c:3495 screen.c:5044 +#: ../buffer.c:3651 ../screen.c:5077 msgid "[Preview]" msgstr "[¥×¥ì¥Ó¥å¡¼]" -#: buffer.c:3775 +#: ../buffer.c:3931 msgid "All" msgstr "Á´¤Æ" -#: buffer.c:3775 +#: ../buffer.c:3931 msgid "Bot" msgstr "ËöÈø" -#: buffer.c:3777 +#: ../buffer.c:3933 msgid "Top" msgstr "ÀèƬ" -#: buffer.c:4523 +#: ../buffer.c:4702 msgid "" "\n" "# Buffer list:\n" @@ -192,15 +192,11 @@ msgstr "" "\n" "# ¥Ð¥Ã¥Õ¥¡¥ê¥¹¥È:\n" -#: buffer.c:4556 +#: ../buffer.c:4737 msgid "[Error List]" msgstr "[¥¨¥é¡¼¥ê¥¹¥È]" -#: buffer.c:4569 memline.c:1520 -msgid "[No File]" -msgstr "[̵Âê]" - -#: buffer.c:4882 +#: ../buffer.c:5063 msgid "" "\n" "--- Signs ---" @@ -208,150 +204,154 @@ msgstr "" "\n" "--- ¥µ¥¤¥ó ---" -#: buffer.c:4901 +#: ../buffer.c:5082 #, c-format msgid "Signs for %s:" msgstr "%s ¤Î¥µ¥¤¥ó:" -#: buffer.c:4907 +#: ../buffer.c:5088 #, c-format msgid " line=%ld id=%d name=%s" msgstr " ¹Ô=%ld ¼±ÊÌ»Ò=%d ̾Á°=%s" -#: diff.c:139 +#: ../diff.c:163 #, c-format msgid "E96: Can not diff more than %ld buffers" msgstr "E96: %ld °Ê¾å¤Î¥Ð¥Ã¥Õ¥¡¤Ïdiff¤Ç¤­¤Þ¤»¤ó" -#: diff.c:709 +#: ../diff.c:737 msgid "E97: Cannot create diffs" msgstr "E97: º¹Ê¬¤òºîÀ®¤Ç¤­¤Þ¤»¤ó " -#: diff.c:814 +#: ../diff.c:843 msgid "Patch file" msgstr "¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë" -#: diff.c:1065 +#: ../diff.c:1146 msgid "E98: Cannot read diff output" msgstr "E98: diff¤Î½ÐÎϤòÆɹþ¤á¤Þ¤»¤ó" -#: diff.c:1815 +#: ../diff.c:1896 msgid "E99: Current buffer is not in diff mode" msgstr "E99: ¸½ºß¤Î¥Ð¥Ã¥Õ¥¡¤Ïº¹Ê¬¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: diff.c:1827 +#: ../diff.c:1908 msgid "E100: No other buffer in diff mode" msgstr "E100: º¹Ê¬¥â¡¼¥É¤Ç¤¢¤ë¾¤Î¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó" -#: diff.c:1835 +#: ../diff.c:1916 msgid "E101: More than two buffers in diff mode, don't know which one to use" msgstr "" "E101: º¹Ê¬¥â¡¼¥É¤Î¥Ð¥Ã¥Õ¥¡¤¬2¸Ä°Ê¾å¤¢¤ë¤Î¤Ç¡¢¤É¤ì¤ò»È¤¦¤«ÆÃÄê¤Ç¤­¤Þ¤»¤ó" -#: diff.c:1858 +#: ../diff.c:1939 #, c-format msgid "E102: Can't find buffer \"%s\"" msgstr "E102: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" -#: diff.c:1864 +#: ../diff.c:1945 #, c-format msgid "E103: Buffer \"%s\" is not in diff mode" msgstr "E103: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤Ïº¹Ê¬¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: digraph.c:2199 +#: ../digraph.c:2200 msgid "E104: Escape not allowed in digraph" msgstr "E104: ¹ç»ú¤ËEscape¤Ï»ÈÍѤǤ­¤Þ¤»¤ó" -#: digraph.c:2384 +#: ../digraph.c:2384 msgid "E544: Keymap file not found" msgstr "E544: ¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" -#: digraph.c:2411 +#: ../digraph.c:2411 msgid "E105: Using :loadkeymap not in a sourced file" msgstr "E105: :source ¤Ç¼è¹þ¤à¥Õ¥¡¥¤¥ë°Ê³°¤Ç¤Ï :loadkeymap ¤ò»È¤¨¤Þ¤»¤ó" -#: edit.c:40 +#: ../edit.c:41 msgid " Keyword completion (^N^P)" msgstr " ¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)" #. ctrl_x_mode == 0, ^P/^N compl. -#: edit.c:41 -msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)" -msgstr " ^X ¥â¡¼¥É (^E^Y^L^]^F^I^K^D^V^N^P)" +#: ../edit.c:42 +msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)" +msgstr " ^X ¥â¡¼¥É (^E^Y^L^]^F^I^K^D^U^V^N^P)" #. Scroll has it's own msgs, in it's place there is the msg for local #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo -#: edit.c:44 +#: ../edit.c:45 msgid " Keyword Local completion (^N^P)" msgstr " ¶É½ê¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)" -#: edit.c:45 +#: ../edit.c:46 msgid " Whole line completion (^L^N^P)" msgstr " ¹Ô(Á´ÂÎ)Êä´° (^L^N^P)" -#: edit.c:46 +#: ../edit.c:47 msgid " File name completion (^F^N^P)" msgstr "¥Õ¥¡¥¤¥ë̾Êä´° (^F^N^P)" -#: edit.c:47 +#: ../edit.c:48 msgid " Tag completion (^]^N^P)" msgstr " ¥¿¥°Êä´° (^]^N^P)" -#: edit.c:48 +#: ../edit.c:49 msgid " Path pattern completion (^N^P)" msgstr " ¥Ñ¥¹¥Ñ¥¿¡¼¥óÊä´° (^N^P)" -#: edit.c:49 +#: ../edit.c:50 msgid " Definition completion (^D^N^P)" msgstr " ÄêµÁÊä´° (^D^N^P)" -#: edit.c:51 +#: ../edit.c:52 msgid " Dictionary completion (^K^N^P)" msgstr " ¼­½ñÊä´° (^K^N^P)" -#: edit.c:52 +#: ../edit.c:53 msgid " Thesaurus completion (^T^N^P)" msgstr " ¥·¥½¡¼¥é¥¹Êä´° (^T^N^P)" -#: edit.c:53 +#: ../edit.c:54 msgid " Command-line completion (^V^N^P)" msgstr " ¥³¥Þ¥ó¥É¥é¥¤¥óÊä´° (^V^N^P)" -#: edit.c:56 +#: ../edit.c:55 +msgid " User defined completion (^U^N^P)" +msgstr " ¥æ¡¼¥¶ÄêµÁÊä´° (^U^N^P)" + +#: ../edit.c:58 msgid "Hit end of paragraph" msgstr "ÃÊÍî¤ÎºÇ¸å¤Ë¥Ò¥Ã¥È" -#: edit.c:962 +#: ../edit.c:994 msgid "'thesaurus' option is empty" msgstr "'thesaurus' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹" -#: edit.c:1166 +#: ../edit.c:1204 msgid "'dictionary' option is empty" msgstr "'dictionary' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹" -#: edit.c:2162 +#: ../edit.c:2204 #, c-format msgid "Scanning dictionary: %s" msgstr "¼­½ñ¤ò¥¹¥­¥ã¥óÃæ: %s" -#: edit.c:2368 +#: ../edit.c:2410 msgid " (insert) Scroll (^E/^Y)" msgstr " (ÁÞÆþ) ¥¹¥¯¥í¡¼¥ë(^E/^Y)" -#: edit.c:2370 +#: ../edit.c:2412 msgid " (replace) Scroll (^E/^Y)" msgstr " (ÃÖ´¹) ¥¹¥¯¥í¡¼¥ë (^E/^Y)" -#: edit.c:2684 +#: ../edit.c:2813 #, c-format msgid "Scanning: %s" msgstr "¥¹¥­¥ã¥óÃæ: %s" -#: edit.c:2719 +#: ../edit.c:2848 msgid "Scanning tags." msgstr "¥¿¥°¤ò¥¹¥­¥ã¥óÃæ." -#: edit.c:3381 +#: ../edit.c:3549 msgid " Adding" msgstr " ÄɲÃÃæ" @@ -359,121 +359,283 @@ msgstr " #. * be called before line = ml_get(), or when this address is no #. * longer needed. -- Acevedo. #. -#: edit.c:3430 +#: ../edit.c:3598 msgid "-- Searching..." msgstr "-- ¸¡º÷Ãæ..." -#: edit.c:3486 +#: ../edit.c:3654 msgid "Back at original" msgstr "»Ï¤á¤ËÌá¤ë" -#: edit.c:3491 +#: ../edit.c:3659 msgid "Word from other line" msgstr "¾¤Î¹Ô¤Îñ¸ì" -#: edit.c:3496 +#: ../edit.c:3664 msgid "The only match" msgstr "Í£°ì¤Î³ºÅö" -#: edit.c:3555 +#: ../edit.c:3723 #, c-format msgid "match %d of %d" msgstr "%d ÈÖÌܤγºÅö (Á´³ºÅö %d ¸ÄÃæ)" -#: edit.c:3558 +#: ../edit.c:3726 #, c-format msgid "match %d" msgstr "%d ÈÖÌܤγºÅö" -#. Skip further arguments but do continue to -#. * search for a trailing command. -#: eval.c:1024 +#: ../eval.c:93 +msgid "E18: Unexpected characters in :let" +msgstr "E18: ͽ´ü¤»¤Ìʸ»ú¤¬ :let ¤Ë¤¢¤ê¤Þ¤·¤¿" + +#: ../eval.c:94 +#, c-format +msgid "E684: list index out of range: %ld" +msgstr "E684: ¥ê¥¹¥È¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬Èϰϳ°¤Ç¤¹: %ld" + +#: ../eval.c:95 +#, c-format +msgid "E121: Undefined variable: %s" +msgstr "E121: ̤ÄêµÁ¤ÎÊÑ¿ô¤Ç¤¹: %s" + +#: ../eval.c:96 +msgid "E111: Missing ']'" +msgstr "E111: ']' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" + +#: ../eval.c:97 #, c-format -msgid "E106: Unknown variable: \"%s\"" -msgstr "E106: ̤ÃΤÎÊÑ¿ô: \"%s\"" +msgid "E686: Argument of %s must be a List" +msgstr "E686: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" + +#: ../eval.c:98 +#, c-format +msgid "E712: Argument of %s must be a List or Dictionaary" +msgstr "E712: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Þ¤¿¤Ï¼­½ñ·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" + +#: ../eval.c:99 +msgid "E713: Cannot use empty key for Dictionary" +msgstr "E713: ¼­½ñ·¿¤Ë¶õ¤Î¥­¡¼¤ò»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:100 +msgid "E714: List required" +msgstr "E471: ¥ê¥¹¥È·¿¤¬É¬ÍפǤ¹" + +#: ../eval.c:101 +msgid "E715: Dictionary required" +msgstr "E715: ¼­½ñ·¿¤¬É¬ÍפǤ¹" + +#: ../eval.c:102 +#, c-format +msgid "E118: Too many arguments for function: %s" +msgstr "E118: ´Ø¿ô¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹: %s" + +#: ../eval.c:103 +#, c-format +msgid "E716: Key not present in Dictionary: %s" +msgstr "E716: ¼­½ñ·¿¤Ë¥­¡¼¤¬Â¸ºß¤·¤Þ¤»¤ó: %s" + +#: ../eval.c:104 +#, c-format +msgid "E122: Function %s already exists, add ! to replace it" +msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹, ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤" + +#: ../eval.c:105 +msgid "E717: Dictionary entry already exists" +msgstr "E717: ¼­½ñ·¿Æâ¤Ë¥¨¥ó¥È¥ê¤¬´û¤Ë¸ºß¤·¤Þ¤¹" + +#: ../eval.c:106 +msgid "E718: Funcref required" +msgstr "E718: ´Ø¿ô»²¾È·¿¤¬Í׵ᤵ¤ì¤Þ¤¹" + +#: ../eval.c:107 +msgid "E719: Cannot use [:] with a Dictionary" +msgstr "E719: [:] ¤ò¼­½ñ·¿¤ÈÁȤ߹ç¤ï¤»¤Æ¤Ï»È¤¨¤Þ¤»¤ó" + +#: ../eval.c:108 +#, c-format +msgid "E734: Wrong variable type for %s=" +msgstr "E734: °Û¤Ê¤Ã¤¿·¿¤ÎÊÑ¿ô¤Ç¤¹ %s=" + +#: ../eval.c:109 +#, c-format +msgid "E130: Unknown function: %s" +msgstr "E130: ̤ÃΤδؿô¤Ç¤¹: %s" + +#: ../eval.c:1428 +msgid "E687: Less targets than List items" +msgstr "E687: ¥¿¡¼¥²¥Ã¥È¤¬¥ê¥¹¥È·¿Æâ¤ÎÍ×ÁǤè¤ê¤â¾¯¤Ê¤¤¤Ç¤¹" + +#: ../eval.c:1433 +msgid "E688: More targets than List items" +msgstr "E688: ¥¿¡¼¥²¥Ã¥È¤¬¥ê¥¹¥È·¿Æâ¤ÎÍ×ÁǤè¤ê¤â¿¤¤¤Ç¤¹" + +#: ../eval.c:1519 +msgid "Double ; in list of variables" +msgstr "¥ê¥¹¥È·¿¤ÎÃͤË2¤Ä°Ê¾å¤Î ; ¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿" + +#: ../eval.c:1685 +#, c-format +msgid "E738: Can't list variables for %s" +msgstr "E738: %s ¤ÎÃͤò°ìÍ÷ɽ¼¨¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:2020 +msgid "E689: Can only index a List or Dictionary" +msgstr "E689: ¥ê¥¹¥È·¿¤È¼­½ñ·¿°Ê³°¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹»ØÄê¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:2026 +msgid "E708: [:] must come last" +msgstr "E708: [:] ¤ÏºÇ¸å¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" + +#: ../eval.c:2072 +msgid "E709: [:] requires a List value" +msgstr "E709: [:] ¤Ë¤Ï¥ê¥¹¥È·¿¤ÎÃͤ¬É¬ÍפǤ¹" + +#: ../eval.c:2308 +msgid "E710: List value has more items than target" +msgstr "E710: ¥ê¥¹¥È·¿ÊÑ¿ô¤Ë¥¿¡¼¥²¥Ã¥È¤è¤ê¤â¿¤¤Í×ÁǤ¬¤¢¤ê¤Þ¤¹" + +#: ../eval.c:2312 +msgid "E711: List value has not enough items" +msgstr "E711: ¥ê¥¹¥È·¿ÊÑ¿ô¤Ë½½Ê¬¤Ê¿ô¤ÎÍ×ÁǤ¬¤¢¤ê¤Þ¤»¤ó" + +# +#: ../eval.c:2506 +msgid "E690: Missing \"in\" after :for" +msgstr "E690: :for ¤Î¸å¤Ë \"in\" ¤¬¤¢¤ê¤Þ¤»¤ó" -#: eval.c:1320 +#: ../eval.c:2721 #, c-format msgid "E107: Missing braces: %s" msgstr "E107: ¥«¥Ã¥³ '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:1435 eval.c:1449 +#: ../eval.c:2947 #, c-format msgid "E108: No such variable: \"%s\"" msgstr "E108: ¤½¤ÎÊÑ¿ô¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\"" -#: eval.c:1705 +#: ../eval.c:3034 +msgid "E743: variable nested too deep for (un)lock" +msgstr "E743: (¥¢¥ó¥Á)¥í¥Ã¥¯¤¹¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹" + +#: ../eval.c:3336 msgid "E109: Missing ':' after '?'" msgstr "E109: '?' ¤Î¸å¤Ë ':' ¤¬¤¢¤ê¤Þ¤»¤ó" -#: eval.c:2327 +#: ../eval.c:3628 +msgid "E691: Can only compare List with List" +msgstr "E691: ¥ê¥¹¥È·¿¤Ï¥ê¥¹¥È·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:3630 +msgid "E692: Invalid operation for Lists" +msgstr "E692: ¥ê¥¹¥È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹" + +#: ../eval.c:3657 +msgid "E735: Can only compare Dictionary with Dictionary" +msgstr "E735: ¼­½ñ·¿¤Ï¼­½ñ·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:3659 +msgid "E736: Invalid operation for Dictionary" +msgstr "E736: ¼­½ñ·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹" + +#: ../eval.c:3679 +msgid "E693: Can only compare Funcref with Funcref" +msgstr "E693: ´Ø¿ô»²¾È·¿¤Ï´Ø¿ô»²¾È·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:3681 +msgid "E694: Invalid operation for Funcrefs" +msgstr "E694: ´Ø¿ô»²¾È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹" + +#: ../eval.c:4086 msgid "E110: Missing ')'" msgstr "E110: ')' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" -#: eval.c:2389 -msgid "E111: Missing ']'" -msgstr "E111: ']' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" +#: ../eval.c:4193 +msgid "E695: Cannot index a Funcref" +msgstr "E695: ´Ø¿ô»²¾È·¿¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤­¤Þ¤»¤ó" -#: eval.c:2466 +#: ../eval.c:4432 #, c-format msgid "E112: Option name missing: %s" msgstr "E112: ¥ª¥×¥·¥ç¥ó̾¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:2484 +#: ../eval.c:4450 #, c-format msgid "E113: Unknown option: %s" msgstr "E113: ̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹: %s" -#: eval.c:2555 +#: ../eval.c:4516 #, c-format msgid "E114: Missing quote: %s" msgstr "E114: °úÍÑÉä (\") ¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:2698 +#: ../eval.c:4652 #, c-format msgid "E115: Missing quote: %s" msgstr "E115: °úÍÑÉä (') ¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:3054 +#: ../eval.c:4731 #, c-format -msgid "E116: Invalid arguments for function %s" -msgstr "E116: ´Ø¿ô %s ¤Ë¤Ï̵¸ú¤Ê°ú¿ô¤Ç¤¹" +msgid "E696: Missing comma in List: %s" +msgstr "E696: ¥ê¥¹¥È·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:3083 +#: ../eval.c:4739 #, c-format -msgid "E117: Unknown function: %s" -msgstr "E117: ̤ÃΤδؿô¤Ç¤¹: %s" +msgid "E697: Missing end of List ']': %s" +msgstr "E697: ¥ê¥¹¥È·¿¤ÎºÇ¸å¤Ë ']' ¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:3084 +#: ../eval.c:5768 #, c-format -msgid "E118: Too many arguments for function: %s" -msgstr "E118: ´Ø¿ô¤Î°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹: %s" +msgid "E720: Missing colon in Dictionary: %s" +msgstr "E720: ¼­½ñ·¿¤Ë¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó: %s" + +#: ../eval.c:5791 +msgid "E721: Duplicate key in Dictionary" +msgstr "E721: ¼­½ñ·¿¤Ë½ÅÊ£¥­¡¼¤¬¤½¤ó¤¶¤¤¤·¤Þ¤¹" -#: eval.c:3085 +#: ../eval.c:5811 #, c-format -msgid "E119: Not enough arguments for function: %s" -msgstr "E119: ´Ø¿ô¤Î°ú¿ô¤¬Â­¤ê¤Þ¤»¤ó: %s" +msgid "E722: Missing comma in Dictionary: %s" +msgstr "E722: ¼­½ñ·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:3086 +#: ../eval.c:5819 #, c-format -msgid "E120: Using not in a script context: %s" -msgstr "E120: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç¤¬»È¤ï¤ì¤Þ¤·¤¿: %s" +msgid "E723: Missing end of Dictionary '}': %s" +msgstr "E723: ¼­½ñ·¿¤ÎºÇ¸å¤Ë '}' ¤¬¤¢¤ê¤Þ¤»¤ó: %s" + +#: ../eval.c:5855 +msgid "E724: variable nested too deep for displaying" +msgstr "E724: ɽ¼¨¤¹¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹" + +#: ../eval.c:7098 +msgid "E699: Too many arguments" +msgstr "E699: ¤¬Â¿²á¤®¤Þ¤¹" #. #. * Yes this is ugly, I don't particularly like it either. But doing it #. * this way has the compelling advantage that translations need not to #. * be touched at all. See below what 'ok' and 'ync' are used for. #. -#: eval.c:3687 gui.c:4376 gui_gtk.c:2059 +#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602 msgid "&Ok" msgstr "&Ok" -#: eval.c:4226 +#: ../eval.c:7859 +#, c-format +msgid "E737: Key already exists: %s" +msgstr "E737: %s ¤È¤¤¤¦¥­¡¼¤Ï´û¤Ë¸ºß¤·¤Þ¤¹" + +#: ../eval.c:8339 #, c-format msgid "+-%s%3ld lines: " msgstr "+-%s%3ld ¹Ô:" -#: eval.c:5477 +#: ../eval.c:8428 +#, c-format +msgid "E700: Unknown function: %s" +msgstr "E700: ̤ÃΤδؿô¤Ç¤¹: %s" + +#: ../eval.c:9966 msgid "" "&OK\n" "&Cancel" @@ -481,130 +643,195 @@ msgstr "" "·èÄê(&O)\n" "¥­¥ã¥ó¥»¥ë(&C)" -#: eval.c:5517 +#: ../eval.c:10005 msgid "called inputrestore() more often than inputsave()" msgstr "inputrestore() ¤¬ inputsave() ¤è¤ê¤â¿¤¯¸Æ¤Ð¤ì¤Þ¤·¤¿" -# Added at 10-Mar-2004. -#: eval.c:5977 -msgid "E655: Too many symbolic links (cycle?)" -msgstr "E655: ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬Â¿²á¤®¤Þ¤¹ (½Û´Ä¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)" +#: ../eval.c:10155 +msgid "E745: Range not allowed" +msgstr "E745: ÈÏ°Ï»ØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" + +#: ../eval.c:10358 +msgid "E701: Invalid type for len()" +msgstr "E701: len() ¤Ë¤Ï̵¸ú¤Ê·¿¤Ç¤¹" + +#: ../eval.c:11090 +msgid "E726: Stride is zero" +msgstr "E726: ¥¹¥È¥é¥¤¥É(Á°¿ÊÎÌ)¤¬ 0 ¤Ç¤¹" + +#: ../eval.c:11092 +msgid "E727: Start past end" +msgstr "E727: ³«»Ï°ÌÃÖ¤¬½ªÎ»°ÌÃÖ¤ò±Û¤¨¤Þ¤·¤¿" -#: eval.c:6609 +#: ../eval.c:11163 ../eval.c:13672 +msgid "" +msgstr "<¶õ>" + +#: ../eval.c:11287 msgid "E240: No connection to Vim server" msgstr "E240: Vim ¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤¬¤¢¤ê¤Þ¤»¤ó" -#: eval.c:6706 +#: ../eval.c:11333 +#, c-format +msgid "E241: Unable to send to %s" +msgstr "E241: %s ¤ØÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:11465 msgid "E277: Unable to read a server reply" msgstr "E277: ¥µ¡¼¥Ð¤Î±þÅú¤¬¤¢¤ê¤Þ¤»¤ó" -#: eval.c:6734 +# Added at 10-Mar-2004. +#: ../eval.c:11720 +msgid "E655: Too many symbolic links (cycle?)" +msgstr "E655: ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬Â¿²á¤®¤Þ¤¹ (½Û´Ä¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)" + +#: ../eval.c:12144 msgid "E258: Unable to send to client" msgstr "E258: ¥¯¥é¥¤¥¢¥ó¥È¤ØÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: eval.c:6782 -#, c-format -msgid "E241: Unable to send to %s" -msgstr "E241: %s ¤ØÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" +#: ../eval.c:12551 +msgid "E702: Sort compare function failed" +msgstr "E702: ¥½¡¼¥È¤ÎÈæ³Ó´Ø¿ô¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: eval.c:6882 +#: ../eval.c:12670 msgid "(Invalid)" msgstr "(̵¸ú)" -#: eval.c:8060 +#: ../eval.c:13088 +msgid "E677: Error writing temp file" +msgstr "E677: °ì»þ¥Õ¥¡¥¤¥ë½ñ¹þÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" + +#: ../eval.c:14421 +msgid "E703: Using a Funcref as a number" +msgstr "E703: ´Ø¿ô»²¾È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£" + +#: ../eval.c:14429 +msgid "E745: Using a List as a number" +msgstr "E745: ¥ê¥¹¥È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹" + +#: ../eval.c:14432 +msgid "E728: Using a Dictionary as a number" +msgstr "E728: ¼­½ñ·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹" + +#: ../eval.c:14490 +msgid "E729: using Funcref as a String" +msgstr "E729: ´Ø¿ô»²¾È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹" + +#: ../eval.c:14493 +msgid "E730: using List as a String" +msgstr "E730: ¥ê¥¹¥È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹" + +#: ../eval.c:14496 +msgid "E731: using Dictionary as a String" +msgstr "E731: ÊÑ¿ô·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹" + +#: ../eval.c:14826 #, c-format -msgid "E121: Undefined variable: %s" -msgstr "E121: ̤ÄêµÁ¤ÎÊÑ¿ô¤Ç¤¹: %s" +msgid "E704: Funcref variable name must start with a capital: %s" +msgstr "E704: ´Ø¿ô»²¾È·¿ÊÑ¿ô̾¤ÏÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s" + +#: ../eval.c:14831 +#, c-format +msgid "705: Variable name conflicts with existing function: %s" +msgstr "705: ÊÑ¿ô̾¤¬´û¸¤Î´Ø¿ô̾¤È¾×Æͤ·¤Þ¤¹: %s" -#: eval.c:8492 +#: ../eval.c:14840 #, c-format msgid "E461: Illegal variable name: %s" msgstr "E461: ÉÔÀµ¤ÊÊÑ¿ô̾¤Ç¤¹: %s" -#: eval.c:8784 +#: ../eval.c:14857 #, c-format -msgid "E122: Function %s already exists, add ! to replace it" -msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹, ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤" +msgid "E706: Variable type mismatch for: %s" +msgstr "E706: ÊÑ¿ô¤Î·¿¤¬°ìÃפ·¤Þ¤»¤ó: %s" + +#: ../eval.c:14946 +#, c-format +msgid "E741: Value is locked: %s" +msgstr "E741: Ãͤ¬¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" + +#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206 +msgid "Unknown" +msgstr "ÉÔÌÀ" -#: eval.c:8857 +#: ../eval.c:14952 #, c-format -msgid "E123: Undefined function: %s" -msgstr "E123: ̤ÄêµÁ¤Î´Ø¿ô¤Ç¤¹: %s" +msgid "E742: Cannot change value of %s" +msgstr "E742: %s ¤ÎÃͤòÊѹ¹¤Ç¤­¤Þ¤»¤ó" + +#: ../eval.c:15030 +msgid "E698: variable nested too deep for making a copy" +msgstr "E698: ¥³¥Ô¡¼¤ò¼è¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹" -#: eval.c:8870 +#: ../eval.c:15458 #, c-format msgid "E124: Missing '(': %s" msgstr "E124: '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: eval.c:8903 +#: ../eval.c:15491 #, c-format msgid "E125: Illegal argument: %s" msgstr "E125: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s" -#: eval.c:8982 +#: ../eval.c:15579 msgid "E126: Missing :endfunction" msgstr "E126: :endfunction ¤¬¤¢¤ê¤Þ¤»¤ó" -#: eval.c:9089 +#: ../eval.c:15765 #, c-format -msgid "E127: Cannot redefine function %s: It is in use" -msgstr "E127: ´Ø¿ô %s ¤òºÆÄêµÁ¤Ç¤­¤Þ¤»¤ó: »ÈÍÑÃæ¤Ç¤¹" +msgid "E746: Function name does not match script file name: %s" +msgstr "E746: ´Ø¿ô̾¤¬¥¹¥¯¥ê¥×¥È¤Î¥Õ¥¡¥¤¥ë̾¤È°ìÃפ·¤Þ¤»¤ó: %s" -#: eval.c:9159 +#: ../eval.c:15878 msgid "E129: Function name required" msgstr "E129: ´Ø¿ô̾¤¬Í׵ᤵ¤ì¤Þ¤¹" -#: eval.c:9210 +#: ../eval.c:15963 #, c-format -msgid "E128: Function name must start with a capital: %s" -msgstr