Mirror of the Vim source from https://github.com/vim/vim
修订版 | 4102fb4ea78127b1a95b2df3274a55d9bfba68c2 (tree) |
---|---|
时间 | 2004-06-20 21:51:53 |
作者 | vimboss |
Commiter | vimboss |
updated for version 7.0002
@@ -1,4 +1,4 @@ | ||
1 | -*change.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 | |
1 | +*change.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -1048,7 +1048,7 @@ | ||
1048 | 1048 | filled in and the <Drop> pseudo key is sent for notification. You can remap |
1049 | 1049 | this key if you want; the default action (for all modes) is to insert the |
1050 | 1050 | contents of the "~ register at the cursor position. {not in Vi} |
1051 | -{only available when compiled with the |+dnd| feature, curently only with the | |
1051 | +{only available when compiled with the |+dnd| feature, currently only with the | |
1052 | 1052 | GTK GUI} |
1053 | 1053 | |
1054 | 1054 | Note: The "~ register is only used when dropping plain text onto Vim. |
@@ -1138,6 +1138,13 @@ | ||
1138 | 1138 | the text. However, 'formatprg' is not used. |
1139 | 1139 | {not in Vi} |
1140 | 1140 | |
1141 | +gwgw *gwgw* *gww* | |
1142 | +gww Format the current line as with "gw". {not in Vi} | |
1143 | + | |
1144 | + *v_gw* | |
1145 | +{Visual}gw Format the highlighted text as with "gw". (for | |
1146 | + {Visual} see |Visual-mode|). {not in Vi} | |
1147 | + | |
1141 | 1148 | Example: To format the current paragraph use: *gqap* > |
1142 | 1149 | gqap |
1143 | 1150 |
@@ -1,4 +1,4 @@ | ||
1 | -*editing.txt* For Vim version 7.0aa. Last change: 2004 Jun 14 | |
1 | +*editing.txt* For Vim version 7.0aa. Last change: 2004 Jun 17 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -340,10 +340,11 @@ | ||
340 | 340 | |
341 | 341 | *`=* |
342 | 342 | You can have the backticks expanded as a Vim expression, instead of |
343 | -an external command, by using the syntax `={expr}` e.g. > | |
343 | +an external command, by using the syntax `={expr}` e.g.: > | |
344 | 344 | :let foo='bar' |
345 | 345 | :e `=foo . ".c" ` |
346 | -edits "bar.c". Note that the expression cannot contain a backtick. | |
346 | +This will edit "bar.c". The expression can contain just about anything, thus | |
347 | +this can also be used to avoid the special meaning of '"', '|', '%' and '#'. | |
347 | 348 | |
348 | 349 | *++opt* *[++opt]* |
349 | 350 | The [++opt] argument can be used to force the value of 'fileformat' or |
@@ -1,4 +1,4 @@ | ||
1 | -*eval.txt* For Vim version 7.0aa. Last change: 2004 May 18 | |
1 | +*eval.txt* For Vim version 7.0aa. Last change: 2004 Jun 20 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -515,7 +515,7 @@ | ||
515 | 515 | command Tick let s:counter = s:counter + 1 | echo s:counter |
516 | 516 | |
517 | 517 | When calling a function and invoking a user-defined command, the context for |
518 | -script varialbes is set to the script where the function or command was | |
518 | +script variables is set to the script where the function or command was | |
519 | 519 | defined. |
520 | 520 | |
521 | 521 | The script variables are also available when a function is defined inside a |
@@ -972,9 +972,13 @@ | ||
972 | 972 | bufexists({expr}) *bufexists()* |
973 | 973 | The result is a Number, which is non-zero if a buffer called |
974 | 974 | {expr} exists. |
975 | + If the {expr} argument is a number, buffer numbers are used. | |
975 | 976 | If the {expr} argument is a string it must match a buffer name |
976 | - exactly. | |
977 | - If the {expr} argument is a number buffer numbers are used. | |
977 | + exactly. The name can be: | |
978 | + - Relative to the current directory. | |
979 | + - A full path. | |
980 | + - The name of a buffer with 'filetype' set to "nofile". | |
981 | + - A URL name. | |
978 | 982 | Unlisted buffers will be found. |
979 | 983 | Note that help files are listed by their short name in the |
980 | 984 | output of |:buffers|, but bufexists() requires using their |
@@ -987,12 +991,12 @@ | ||
987 | 991 | buflisted({expr}) *buflisted()* |
988 | 992 | The result is a Number, which is non-zero if a buffer called |
989 | 993 | {expr} exists and is listed (has the 'buflisted' option set). |
990 | - The {expr} argument is used like with bufexists(). | |
994 | + The {expr} argument is used like with |bufexists()|. | |
991 | 995 | |
992 | 996 | bufloaded({expr}) *bufloaded()* |
993 | 997 | The result is a Number, which is non-zero if a buffer called |
994 | 998 | {expr} exists and is loaded (shown in a window or hidden). |
995 | - The {expr} argument is used like with bufexists(). | |
999 | + The {expr} argument is used like with |bufexists()|. | |
996 | 1000 | |
997 | 1001 | bufname({expr}) *bufname()* |
998 | 1002 | The result is the name of a buffer, as it is displayed by the |
@@ -1233,6 +1237,9 @@ | ||
1233 | 1237 | This function checks if an executable with the name {expr} |
1234 | 1238 | exists. {expr} must be the name of the program without any |
1235 | 1239 | arguments. executable() uses the normal $PATH. |
1240 | + On MS-DOS and MS-Windows the ".exe", ".bat", etc. must be | |
1241 | + included. It only checks if the file exists and is not a | |
1242 | + directory, not if it's really executable. | |
1236 | 1243 | The result is a Number: |
1237 | 1244 | 1 exists |
1238 | 1245 | 0 does not exist |
@@ -1910,7 +1917,7 @@ | ||
1910 | 1917 | This autocommand jumps to the last known position in a file |
1911 | 1918 | just after opening it, if the '" mark is set: > |
1912 | 1919 | :au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"" | endif |
1913 | -< | |
1920 | + | |
1914 | 1921 | line2byte({lnum}) *line2byte()* |
1915 | 1922 | Return the byte count from the start of the buffer for line |
1916 | 1923 | {lnum}. This includes the end-of-line character, depending on |
@@ -2746,7 +2753,7 @@ | ||
2746 | 2753 | gettext Compiled with message translation |multi-lang| |
2747 | 2754 | gui Compiled with GUI enabled. |
2748 | 2755 | gui_athena Compiled with Athena GUI. |
2749 | -gui_beos Compiled with BeOs GUI. | |
2756 | +gui_beos Compiled with BeOS GUI. | |
2750 | 2757 | gui_gtk Compiled with GTK+ GUI (any version). |
2751 | 2758 | gui_gtk2 Compiled with GTK+ 2 GUI (gui_gtk is also defined). |
2752 | 2759 | gui_mac Compiled with Macintosh GUI. |
@@ -2801,7 +2808,7 @@ | ||
2801 | 2808 | showcmd Compiled with 'showcmd' support. |
2802 | 2809 | signs Compiled with |:sign| support. |
2803 | 2810 | smartindent Compiled with 'smartindent' support. |
2804 | -sniff Compiled with SniFF interface support. | |
2811 | +sniff Compiled with SNiFF interface support. | |
2805 | 2812 | statusline Compiled with support for 'statusline', 'rulerformat' |
2806 | 2813 | and special formats of 'titlestring' and 'iconstring'. |
2807 | 2814 | sun_workshop Compiled with support for Sun |workshop|. |
@@ -1,4 +1,4 @@ | ||
1 | -*farsi.txt* For Vim version 7.0aa. Last change: 2002 Oct 29 | |
1 | +*farsi.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Mortaza Ghassab Shiran |
@@ -66,7 +66,7 @@ | ||
66 | 66 | subdirectories of the '$VIM/farsi' directory: |
67 | 67 | |
68 | 68 | + far-a01.pcf X Windows fonts for Unix including Linux systems |
69 | - + far-a01.bf X Windows fonts for SunOs | |
69 | + + far-a01.bf X Windows fonts for SunOS | |
70 | 70 | + far-a01.f16 a screen fonts for Unix including Linux systems |
71 | 71 | + far-a01.fon a monospaced fonts for Windows NT/95/98 |
72 | 72 | + far-a01.com a screen fonts for DOS |
@@ -92,7 +92,7 @@ | ||
92 | 92 | > mkfontdir |
93 | 93 | > xset +fp path_name_of_farsi_fonts_directory |
94 | 94 | |
95 | -o Installation of fonts for X Window systems (SunOs) | |
95 | +o Installation of fonts for X Window systems (SunOS) | |
96 | 96 | |
97 | 97 | Copy far-a01.bf font into a directory of your choice. |
98 | 98 | Change to the directory containing the far-a01.fb fonts and |
@@ -1,4 +1,4 @@ | ||
1 | -*index.txt* For Vim version 7.0aa. Last change: 2004 May 24 | |
1 | +*index.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -130,8 +130,8 @@ | ||
130 | 130 | |i_<C-Home>| <C-Home> cursor to start of file |
131 | 131 | |i_<End>| <End> cursor past end of line |
132 | 132 | |i_<C-End>| <C-End> cursor past end of file |
133 | -|i_<PageUp>| <PageUp> one screenfull backward | |
134 | -|i_<PageDown>| <PageDown> one screenfull forward | |
133 | +|i_<PageUp>| <PageUp> one screenful backward | |
134 | +|i_<PageDown>| <PageDown> one screenful forward | |
135 | 135 | |i_<F1>| <F1> same as <Help> |
136 | 136 | |i_<Help>| <Help> stop insert mode and display help window |
137 | 137 | |i_<Insert>| <Insert> toggle Insert/Replace mode |
@@ -1,4 +1,4 @@ | ||
1 | -*insert.txt* For Vim version 7.0aa. Last change: 2004 Apr 09 | |
1 | +*insert.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -908,7 +908,7 @@ | ||
908 | 908 | The position is corrected for inserted/deleted lines, |
909 | 909 | but NOT for inserted/deleted characters. |
910 | 910 | When the |:keepjumps| command modifier is used the |'^| |
911 | - mark wont be changed. | |
911 | + mark won't be changed. | |
912 | 912 | {not in Vi} |
913 | 913 | |
914 | 914 | *o* |
@@ -1,4 +1,4 @@ | ||
1 | -*mbyte.txt* For Vim version 7.0aa. Last change: 2004 Jun 07 | |
1 | +*mbyte.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar et al. |
@@ -141,7 +141,7 @@ | ||
141 | 141 | - For all systems keymaps can be used. See |mbyte-keymap|. |
142 | 142 | |
143 | 143 | The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose |
144 | -the different input medhods or disable them temporarily. | |
144 | +the different input methods or disable them temporarily. | |
145 | 145 | |
146 | 146 | ============================================================================== |
147 | 147 | 2. Locale *mbyte-locale* |
@@ -906,7 +906,7 @@ | ||
906 | 906 | This works on not only insert-normal mode, but also search-command input and |
907 | 907 | replace mode. |
908 | 908 | The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose |
909 | -the different input medhods or disable them temporarily. | |
909 | +the different input methods or disable them temporarily. | |
910 | 910 | |
911 | 911 | WHAT IS IME |
912 | 912 | IME is a part of East asian version Windows. That helps you to input |
@@ -1,4 +1,4 @@ | ||
1 | -*motion.txt* For Vim version 7.0aa. Last change: 2004 May 13 | |
1 | +*motion.txt* For Vim version 7.0aa. Last change: 2004 Jun 17 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -672,11 +672,12 @@ | ||
672 | 672 | the cursor, this is not a motion command). |
673 | 673 | |
674 | 674 | *:ma* *:mark* *E191* |
675 | -:[range]ma[rk] {a-zA-Z} Set mark {a-zA-Z} at last line number in [range], | |
675 | +:[range]ma[rk] {a-zA-Z'} | |
676 | + Set mark {a-zA-Z'} at last line number in [range], | |
676 | 677 | column 0. Default is cursor line. |
677 | 678 | |
678 | 679 | *:k* |
679 | -:[range]k{a-zA-Z} Same as :mark, but the space before the mark name can | |
680 | +:[range]k{a-zA-Z'} Same as :mark, but the space before the mark name can | |
680 | 681 | be omitted. |
681 | 682 | |
682 | 683 | *'* *'a* *`* *`a* |
@@ -692,7 +693,9 @@ | ||
692 | 693 | jumping within the current buffer. Example: > |
693 | 694 | g`" |
694 | 695 | < jumps to the last known position in a file. See |
695 | - $VIMRUNTIME/vimrc_example.vim. {not in Vi} | |
696 | + $VIMRUNTIME/vimrc_example.vim. | |
697 | + Also see |:keepjumps|. | |
698 | + {not in Vi} | |
696 | 699 | |
697 | 700 | *:marks* |
698 | 701 | :marks List all the current marks (not a motion command). |
@@ -868,7 +871,7 @@ | ||
868 | 871 | or larger than before, all marks are kept at the |
869 | 872 | same line number. |
870 | 873 | - When the number of lines decreases, the marks in the |
871 | - ilnes that disappeared are deleted. | |
874 | + lines that disappeared are deleted. | |
872 | 875 | In any case the marks below the filtered text have |
873 | 876 | their line numbers adjusted, thus stick to the text, |
874 | 877 | as usual. |
@@ -877,12 +880,22 @@ | ||
877 | 880 | |
878 | 881 | *:keepj* *:keepjumps* |
879 | 882 | :keepj[umps] {command} |
880 | - Do not change the |''|, |'.| and |'^| marks, the | |
881 | - |jumplist| or the |changelist|. Useful when making a | |
882 | - change or inserting text automatically and the user | |
883 | - doesn't want to go to this position. E.g., when | |
884 | - updating a "Last change" timestamp: > | |
885 | - autocmd BufWritePre,FileWritePre *.abc keepjumps call SetLastChange() | |
883 | + Moving around in {command} does not change the |''|, | |
884 | + |'.| and |'^| marks, the |jumplist| or the | |
885 | + |changelist|. | |
886 | + Useful when making a change or inserting text | |
887 | + automatically and the user doesn't want to go to this | |
888 | + position. E.g., when updating a "Last change" | |
889 | + timestamp in the first line: > | |
890 | + | |
891 | + :let lnum = getline(".") | |
892 | + :keepjumps normal gg | |
893 | + :call SetLastChange() | |
894 | + :keepjumps exe "normal " . lnum . "G" | |
895 | +< | |
896 | + Note that ":keepjumps" must be used for every command. | |
897 | + When invoking a function the commands in that function | |
898 | + can still change the jumplist. | |
886 | 899 | |
887 | 900 | ============================================================================== |
888 | 901 | 8. Jumps *jump-motions* |
@@ -1,4 +1,4 @@ | ||
1 | -*netbeans.txt* For Vim version 7.0aa. Last change: 2004 May 01 | |
1 | +*netbeans.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Gordon Prieur |
@@ -180,7 +180,7 @@ | ||
180 | 180 | change. |
181 | 181 | |
182 | 182 | *E656* |
183 | -NetBeans dissallows writes of unmodified buffers | |
183 | +NetBeans disallows writes of unmodified buffers | |
184 | 184 | NetBeans does not support writes of unmodified buffers that |
185 | 185 | were opened from NetBeans. |
186 | 186 |
@@ -245,7 +245,7 @@ | ||
245 | 245 | command. In protocol version 2.1 and earlier this was incorrectly interpreted |
246 | 246 | as a notification that a write had taken place. In reality, it told NetBeans |
247 | 247 | to save the file so multiple writes were being done. This caused various |
248 | -problems and has been fixed in 2.2. To decrease the likelyhood of this | |
248 | +problems and has been fixed in 2.2. To decrease the likelihood of this | |
249 | 249 | confusion happening again, netbeans_saved() has been renamed to |
250 | 250 | netbeans_save_buffer(). |
251 | 251 |
@@ -1,4 +1,4 @@ | ||
1 | -*os_mac.txt* For Vim version 7.0aa. Last change: 2004 Apr 27 | |
1 | +*os_mac.txt* For Vim version 7.0aa. Last change: 2004 Jun 19 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar et al. |
@@ -74,11 +74,16 @@ | ||
74 | 74 | ============================================================================== |
75 | 75 | 4. Mac Lack *mac-lack* |
76 | 76 | |
77 | --The filenames containing both ":" and "/" are sometimes misinterpreted. | |
78 | - (just re-execute the command) | |
79 | --Scrollbar are not scrolling live, and when only the arrow or scroll area, | |
80 | - a limit of 32 line or page is scrolled. | |
81 | --Syntax highlighting works on 68k Macs but is _really_ slow. | |
77 | +The filenames containing both ":" and "/" are sometimes misinterpreted. (just | |
78 | +re-execute the command) | |
79 | + | |
80 | +Scrollbar are not scrolling live, and when only the arrow or scroll area, a | |
81 | +limit of 32 line or page is scrolled. | |
82 | + | |
83 | +Syntax highlighting works on 68k Macs but is _really_ slow. | |
84 | + | |
85 | +In a terminal CTRL-^ needs to be entered as Shift-Control-6. CTRL-@ as | |
86 | +Shift-Control-2. | |
82 | 87 | |
83 | 88 | ============================================================================== |
84 | 89 | 5. Mac Bug Report *mac-bug* |
@@ -1,4 +1,4 @@ | ||
1 | -*os_vms.txt* For Vim version 7.0aa. Last change: 2004 May 16 | |
1 | +*os_vms.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL |
@@ -280,7 +280,7 @@ | ||
280 | 280 | You need to set up one X server and run Vim as in point 2. |
281 | 281 | For MS Windows there are available free X servers as MIX , Omni X etc. |
282 | 282 | as well as excellent commercial products as eXcursion or ReflectionX with |
283 | - buit in DEC support. | |
283 | + built in DEC support. | |
284 | 284 | |
285 | 285 | Please note, that executables without GUI are slightly faster during startup |
286 | 286 | then with enabled GUI in character mode. Therefore, if you do not use GUI |
@@ -1,11 +1,11 @@ | ||
1 | -*pi_netrw.txt* For Vim version 7.0aa. Last change: Apr 21, 2004 | |
1 | +*pi_netrw.txt* For Vim version 6.2. Last change: Jun 15, 2004 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Charles E. Campbell, Jr. |
5 | 5 | |
6 | -*dav* *http* *network* *rcp* *scp* | |
7 | -*fetch* *netrw* *Nread* *rsync* *sftp* | |
8 | -*ftp* *netrw.vim* *Nwrite* *netrw-file* | |
6 | +*dav* *http* *network* *rcp* *scp* | |
7 | +*fetch* *netrw* *Nread* *rsync* *sftp* | |
8 | +*ftp* *netrw.vim* *Nwrite* *netrw-file* | |
9 | 9 | |
10 | 10 | ============================================================================== |
11 | 11 | 0. Contents *netrw-contents* |
@@ -16,15 +16,16 @@ | ||
16 | 16 | 4. Transparent File Transfer...........................|netrw-transparent| |
17 | 17 | 5. Ex Commands.........................................|netrw-ex| |
18 | 18 | 6. Variables and Options...............................|netrw-var| |
19 | -7. Debugging...........................................|netrw-debug| | |
20 | -8. New Stuff...........................................|netrw-new| | |
21 | -9. Credits.............................................|netrw-credits| | |
19 | +7. Remote Directory Listing............................|netrw-dir| | |
20 | +8. Debugging...........................................|netrw-debug| | |
21 | +9. History.............................................|netrw-history| | |
22 | +10. Credits.............................................|netrw-credits| | |
22 | 23 | |
23 | 24 | The functionality mentioned here is done via using |standard-plugin| |
24 | 25 | techniques. This plugin is only available if |
25 | 26 | |
26 | - set nocp " 'compatible' is not set | |
27 | - filetype plugin on " plugins are enabled | |
27 | + set nocp " 'compatible' is not set | |
28 | + filetype plugin on " plugins are enabled | |
28 | 29 | |
29 | 30 | You can avoid loading this plugin by setting the "loaded_netrw" variable |
30 | 31 | in your <.vimrc> file: > |
@@ -49,16 +50,16 @@ | ||
49 | 50 | |
50 | 51 | Controlling External Applications |
51 | 52 | |
52 | - Protocol Variable Default Value | |
53 | - -------- ---------------- ------------- | |
54 | - dav: g:netrw_dav_cmd = "cadaver" | |
55 | - fetch: g:netrw_fetch_cmd = "fetch -o" | |
56 | - ftp: g:netrw_ftp_cmd = "ftp" | |
57 | - http: g:netrw_http_cmd = "fetch -o" else if fetch is available | |
58 | - http: g:netrw_http_cmd = "wget -q -O" If wget is available | |
59 | - rcp: g:netrw_rcp_cmd = "rcp" | |
60 | - rsync: g:netrw_rsync_cmd = "rsync -a" | |
61 | - scp: g:netrw_scp_cmd = "scp -q" | |
53 | + Protocol Variable Default Value | |
54 | + -------- ---------------- ------------- | |
55 | + dav: g:netrw_dav_cmd = "cadaver" | |
56 | + fetch: g:netrw_fetch_cmd = "fetch -o" | |
57 | + ftp: g:netrw_ftp_cmd = "ftp" | |
58 | + http: g:netrw_http_cmd = "fetch -o" if fetch is available | |
59 | + http: g:netrw_http_cmd = "wget -q -O" If wget is available | |
60 | + rcp: g:netrw_rcp_cmd = "rcp" | |
61 | + rsync: g:netrw_rsync_cmd = "rsync -a" | |
62 | + scp: g:netrw_scp_cmd = "scp -q" | |
62 | 63 | sftp: g:netrw_sftp_cmd = "sftp" |
63 | 64 | |
64 | 65 | READING |
@@ -76,7 +77,7 @@ | ||
76 | 77 | :Nread "sftp://[user@]machine/file" uses sftp |
77 | 78 | |
78 | 79 | WRITING |
79 | - :Nwrite ? give help | |
80 | + :Nwrite ? give help | |
80 | 81 | :Nwrite "machine:file" uses rcp |
81 | 82 | :Nwrite "machine file" uses ftp with <.netrc> |
82 | 83 | :Nwrite "machine id password file" uses ftp |
@@ -88,6 +89,9 @@ | ||
88 | 89 | :Nwrite "sftp://[user@]machine/file" uses sftp |
89 | 90 | http: not supported! |
90 | 91 | |
92 | + DIRECTORY LISTING | |
93 | + :Nread [protocol]://[user]@hostname/path/ | |
94 | + | |
91 | 95 | USER AND PASSWORD CHANGING |
92 | 96 | Attempts to use ftp will prompt you for a user-id and a password. |
93 | 97 | These will be saved in g:netrw_uid and g:netrw_passwd Subsequent uses |
@@ -148,7 +152,7 @@ | ||
148 | 152 | clean up. |
149 | 153 | |
150 | 154 | One may modify any protocol's implementing external application |
151 | -by setting a variable (ex. scp uses the variable g:netrw_scp_cmd, | |
155 | +by settinbg a variable (ex. scp uses the variable g:netrw_scp_cmd, | |
152 | 156 | which is defaulted to "scp -q"). |
153 | 157 | |
154 | 158 | Ftp, an old protocol, seems to be blessed by numerous implementations. |
@@ -181,57 +185,57 @@ | ||
181 | 185 | |
182 | 186 | *netrw-urls* |
183 | 187 | +=================================+============================+============+ |
184 | - | Reading | Writing | Uses | | |
188 | + | Reading | Writing | Uses | | |
185 | 189 | +=================================+============================+============+ |
186 | - | DAV: | | | | |
187 | - | dav://host/path | | cadaver | | |
188 | - | :Nread dav://host/path | :Nwrite dav://host/path | cadaver | | |
189 | - +---------------------------------+----------------------------+------------+ | |
190 | - | FETCH: | | | | |
191 | - | fetch://[user@]host/path | | | | |
192 | - | fetch://[user@]host:http/path | Not Available | fetch | | |
193 | - | :Nread fetch://[user@]host/path| | | | |
194 | - +---------------------------------+----------------------------+------------+ | |
195 | - | FILE: | | | | |
196 | - | file:///* | file:///* | | | |
197 | - | file://localhost/* | file://localhost/* | | | |
198 | - +---------------------------------+----------------------------+------------+ | |
199 | - | FTP: (*3) | (*3) | | | |
200 | - | ftp://[user@]host/path | ftp://[user@]host/path | ftp (*2) | | |
201 | - | :Nread ftp://host/path | :Nwrite ftp://host/path | ftp+.netrc | | |
202 | - | :Nread host path | :Nwrite host path | ftp+.netrc | | |
203 | - | :Nread host uid pass path | :Nwrite host uid pass path | ftp | | |
190 | + | DAV: | | | | |
191 | + | dav://host/path | | cadaver | | |
192 | + | :Nread dav://host/path | :Nwrite dav://host/path | cadaver | | |
204 | 193 | +---------------------------------+----------------------------+------------+ |
205 | - | HTTP: wget is executable: (*4) | | | | |
206 | - | http://[user@]host/path | Not Available | wget | | |
207 | - +---------------------------------+----------------------------+------------+ | |
208 | - | HTTP: fetch is executable (*4) | | | | |
209 | - | http://[user@]host/path | Not Available | fetch | | |
210 | - +---------------------------------+----------------------------+------------+ | |
211 | - | RCP: | | | | |
212 | - | rcp://[user@]host/path | rcp://[user@]host/path | rcp | | |
194 | + | FETCH: | | | | |
195 | + | fetch://[user@]host/path | | | | |
196 | + | fetch://[user@]host:http/path | Not Available | fetch | | |
197 | + | :Nread fetch://[user@]host/path| | | | |
213 | 198 | +---------------------------------+----------------------------+------------+ |
214 | - | RSYNC: | | | | |
215 | - | rsync://[user@]host/path | rsync://[user@]host/path | rsync | | |
216 | - | :Nread rsync://host/path | :Nwrite rsync://host/path | rsync | | |
217 | - | :Nread rcp://host/path | :Nwrite rcp://host/path | rcp | | |
199 | + | FILE: | | | | |
200 | + | file:///* | file:///* | | | |
201 | + | file://localhost/* | file://localhost/* | | | |
218 | 202 | +---------------------------------+----------------------------+------------+ |
219 | - | SCP: | | | | |
220 | - | scp://[user@]host/path | scp://[user@]host/path | scp | | |
221 | - | :Nread scp://host/path | :Nwrite scp://host/path | scp (*1) | | |
203 | + | FTP: (*3) | (*3) | | | |
204 | + | ftp://[user@]host/path | ftp://[user@]host/path | ftp (*2) | | |
205 | + | :Nread ftp://host/path | :Nwrite ftp://host/path | ftp+.netrc | | |
206 | + | :Nread host path | :Nwrite host path | ftp+.netrc | | |
207 | + | :Nread host uid pass path | :Nwrite host uid pass path | ftp | | |
222 | 208 | +---------------------------------+----------------------------+------------+ |
223 | - | SFTP: | | | | |
224 | - | sftp://[user@]host/path | sftp://[user@]host/path | sftp | | |
225 | - | :Nread sftp://host/path | :Nwrite sftp://host/path | sftp (*1) | | |
209 | + | HTTP: wget is executable: (*4) | | | | |
210 | + | http://[user@]host/path | Not Available | wget | | |
211 | + +---------------------------------+----------------------------+------------+ | |
212 | + | HTTP: fetch is executable (*4) | | | | |
213 | + | http://[user@]host/path | Not Available | fetch | | |
214 | + +---------------------------------+----------------------------+------------+ | |
215 | + | RCP: | | | | |
216 | + | rcp://[user@]host/path | rcp://[user@]host/path | rcp | | |
217 | + +---------------------------------+----------------------------+------------+ | |
218 | + | RSYNC: | | | | |
219 | + | rsync://[user@]host/path | rsync://[user@]host/path | rsync | | |
220 | + | :Nread rsync://host/path | :Nwrite rsync://host/path | rsync | | |
221 | + | :Nread rcp://host/path | :Nwrite rcp://host/path | rcp | | |
222 | + +---------------------------------+----------------------------+------------+ | |
223 | + | SCP: | | | | |
224 | + | scp://[user@]host/path | scp://[user@]host/path | scp | | |
225 | + | :Nread scp://host/path | :Nwrite scp://host/path | scp (*1) | | |
226 | + +---------------------------------+----------------------------+------------+ | |
227 | + | SFTP: | | | | |
228 | + | sftp://[user@]host/path | sftp://[user@]host/path | sftp | | |
229 | + | :Nread sftp://host/path | :Nwrite sftp://host/path | sftp (*1) | | |
226 | 230 | +=================================+============================+============+ |
227 | 231 | |
228 | 232 | (*1) For an absolute path use scp://machine//path. |
229 | 233 | |
230 | 234 | (*2) if <.netrc> is present, it is assumed that it will |
231 | 235 | work with your ftp client. Otherwise the script will |
232 | - prompt for user-id and password. | |
236 | + prompt for user-id and pasword. | |
233 | 237 | |
234 | - (*3) for ftp, "machine" may be machine#port or machine:port | |
238 | + (*3) for ftp, "machine" may be machine#port or machine:port | |
235 | 239 | if a different port is needed than the standard ftp port |
236 | 240 | |
237 | 241 | (*4) for http:..., if wget is available it will be used. Otherwise, |
@@ -327,67 +331,88 @@ | ||
327 | 331 | |
328 | 332 | |
329 | 333 | ============================================================================== |
330 | -6. Variables and Options *netrw-options* *netrw-var* | |
334 | +6. Variables and Options *netrw-options* *netrw-var* | |
331 | 335 | |
332 | 336 | The script <netrw.vim> uses several variables which can affect <netrw.vim>'s |
333 | 337 | behavior. These variables typically may be set in the user's <.vimrc> file: |
334 | - | |
335 | - g:netrw_uid Holds current user-id for ftp. | |
336 | - g:netrw_passwd Holds current password for ftp. | |
337 | - b:netrw_lastfile Holds latest method/machine/path. | |
338 | - b:netrw_line Holds current line number (during NetWrite) | |
339 | - b:netrw_col Holds current cursor position (during NetWrite) | |
340 | - g:netrw_ftp =0 use default ftp (uid password) | |
341 | - =1 use alternate ftp (user uid password) | |
342 | - (see |netrw-options|) | |
343 | - g:netrw_ftpmode ="binary" (default) | |
344 | - ="ascii" (your choice) | |
345 | - g:netrw_ignorenetrc =1 (default) | |
346 | - if you have a <.netrc> file but you don't | |
338 | +> | |
339 | + ------------- | |
340 | + Netrw Options | |
341 | + ------------- | |
342 | + Option Meaning | |
343 | + -------------- ----------------------------------------------- | |
344 | +< | |
345 | + b:netrw_col Holds current cursor position (during NetWrite) | |
346 | + g:netrw_cygwin =1 assume scp under windows is from cygwin | |
347 | + (default/windows) | |
348 | + =0 assume scp under windows accepts windows | |
349 | + style paths (default/else) | |
350 | + g:netrw_ftp =0 use default ftp (uid password) | |
351 | + g:netrw_ftpmode ="binary" (default) | |
352 | + ="ascii" (your choice) | |
353 | + g:netrw_ignorenetrc =1 (default) | |
354 | + if you have a <.netrc> file but you don't | |
347 | 355 | want it used, then set this variable. Its |
348 | 356 | mere existence is enough to cause <.netrc> |
349 | 357 | to be ignored. |
350 | - g:netrw_win95ftp =0 use unix-style ftp even if win95/98/ME/etc | |
351 | - =1 use default method to do ftp | |
352 | - g:netrw_cygwin =1 assume scp under windows is from cygwin | |
353 | - (default/windows) | |
354 | - =0 assume scp under windows accepts windows | |
355 | - style paths (default/else) | |
356 | - g:netrw_use_nt_rcp =0 don't use WinNT/2K/XP's rcp (default) | |
357 | - =1 use WinNT/2K/XP's rcp, binary mode | |
358 | - | |
359 | - | |
358 | + b:netrw_lastfile Holds latest method/machine/path. | |
359 | + b:netrw_line Holds current line number (during NetWrite) | |
360 | + g:netrw_passwd Holds current password for ftp. | |
361 | + g:netrw_silent =0 transfers done normally | |
362 | + =1 transfers done silently | |
363 | + g:netrw_uid Holds current user-id for ftp. | |
364 | + =1 use alternate ftp (user uid password) | |
365 | + (see |netrw-options|) | |
366 | + g:netrw_use_nt_rcp =0 don't use WinNT/2K/XP's rcp (default) | |
367 | + =1 use WinNT/2K/XP's rcp, binary mode | |
368 | + g:netrw_win95ftp =0 use unix-style ftp even if win95/98/ME/etc | |
369 | + =1 use default method to do ftp > | |
370 | + ----------------------------------------------------------------------- | |
371 | +< | |
360 | 372 | The script will also make use of the following variables internally, albeit |
361 | 373 | temporarily. |
362 | - | |
374 | +> | |
375 | + ------------------- | |
376 | + Temporary Variables | |
377 | + ------------------- | |
378 | + Variable Meaning | |
379 | + -------- ------------------------------------ | |
380 | +< | |
363 | 381 | g:netrw_method Index indicating rcp/ftp+.netrc/ftp |
364 | 382 | g:netrw_machine Holds machine name parsed from input |
365 | - g:netrw_fname Holds filename being accessed | |
383 | + g:netrw_fname Holds filename being accessed > | |
384 | + ------------------------------------------------------------ | |
385 | +< | |
386 | + *netrw-protocol* | |
366 | 387 | |
367 | - *netrw-protocol* | |
388 | +Netrw supports a number of protocols. These protocols are invoked using the | |
389 | +variables listed below, and may be modified by the user. | |
368 | 390 | > |
369 | 391 | ------------------------ |
370 | - Protocol Control Options | |
392 | + Protocol Control Options | |
371 | 393 | ------------------------ |
372 | - Option Type Setting Meaning ~ | |
373 | - --------- -------- -------------- --------------------------- > | |
374 | - netrw_ftp variable =doesn't exist userid set by "user userid" | |
375 | - =0 userid set by "user userid" | |
376 | - =1 userid set by "userid" | |
377 | - NetReadFixup function =doesn't exist no change | |
378 | - =exists Allows user to have files | |
379 | - read via ftp automatically | |
380 | - transformed however they wish | |
381 | - by NetReadFixup() | |
394 | + Option Type Setting Meaning | |
395 | + --------- -------- -------------- --------------------------- | |
396 | +< | |
397 | + netrw_ftp variable =doesn't exist userid set by "user userid" | |
398 | + =0 userid set by "user userid" | |
399 | + =1 userid set by "userid" | |
400 | + NetReadFixup function =doesn't exist no change | |
401 | + =exists Allows user to have files | |
402 | + read via ftp automatically | |
403 | + transformed however they wish | |
404 | + by NetReadFixup() | |
382 | 405 | g:netrw_dav_cmd variable ="cadaver" |
383 | 406 | g:netrw_fetch_cmd variable ="fetch -o" |
384 | 407 | g:netrw_ftp_cmd variable ="ftp" |
385 | 408 | g:netrw_http_cmd variable ="fetch -o" else if fetch is executable |
386 | 409 | g:netrw_http_cmd variable ="wget -O" if wget is executable |
410 | + g:netrw_list_cmd variable ="ssh HOSTNAME ls -Fa" | |
387 | 411 | g:netrw_rcp_cmd variable ="rcp" |
388 | 412 | g:netrw_rsync_cmd variable ="rsync -a" |
389 | 413 | g:netrw_scp_cmd variable ="scp -q" |
390 | - g:netrw_sftp_cmd variable ="sftp" | |
414 | + g:netrw_sftp_cmd variable ="sftp" > | |
415 | + ------------------------------------------------------------------------- | |
391 | 416 | < |
392 | 417 | The first two options both help with certain ftp's that give trouble otherwise. |
393 | 418 | In order to best understand how to use these options if ftp is giving you |
@@ -396,16 +421,21 @@ | ||
396 | 421 | The g:netrw_..._cmd variables specify the external program to use handle |
397 | 422 | the associated protocol (rcp, ftp, etc), plus any options. |
398 | 423 | |
399 | -Netrw typically builds up lines of one of the following formats in a | |
424 | +The g:netrw_list_cmd's HOSTNAME entry will be changed via substitution with | |
425 | +whatever the current request is for a hostname. | |
426 | + | |
427 | +For ftp, netrw typically builds up lines of one of the following formats in a | |
400 | 428 | temporary file: |
401 | 429 | > |
402 | 430 | IF g:netrw_ftp !exists or is not 1 IF g:netrw_ftp exists and is 1 |
403 | 431 | ---------------------------------- ------------------------------ |
404 | - open machine [port] open machine [port] | |
405 | - user userid password userid password | |
406 | - [g:netrw_ftpmode] password | |
407 | - get filename tempfile [g:netrw_ftpmode] | |
408 | - get filename tempfile | |
432 | +< | |
433 | + open machine [port] open machine [port] | |
434 | + user userid password userid password | |
435 | + [g:netrw_ftpmode] password | |
436 | + get filename tempfile [g:netrw_ftpmode] | |
437 | + get filename tempfile > | |
438 | + --------------------------------------------------------------------- | |
409 | 439 | < |
410 | 440 | Netrw then executes the lines above by use of a filter: |
411 | 441 | > |
@@ -418,14 +448,14 @@ | ||
418 | 448 | -n means don't use netrc and is used for Method #3 (ftp w/o <.netrc>) |
419 | 449 | |
420 | 450 | If <.netrc> exists it will be used to avoid having to query the user for |
421 | -userid and password). The transferred file is put into a temporary file. | |
451 | +userid and password. The transferred file is put into a temporary file. | |
422 | 452 | The temporary file is then read into the main editing session window that |
423 | 453 | requested it and the temporary file deleted. |
424 | 454 | |
425 | 455 | If your ftp doesn't accept the "user" command and immediately just demands |
426 | 456 | a userid, then try putting "let netrw_ftp=1" in your <.vimrc>. |
427 | 457 | |
428 | - *netrw-fixup* | |
458 | + *netrw-fixup* | |
429 | 459 | If your ftp for whatever reason generates unwanted lines (such as AUTH |
430 | 460 | messages) you may write a NetReadFixup(tmpfile) function: |
431 | 461 | > |
@@ -441,7 +471,7 @@ | ||
441 | 471 | elseif a:method == 7 "rsync |
442 | 472 | elseif a:method == 8 "fetch |
443 | 473 | elseif a:method == 9 "sftp |
444 | - else " complain | |
474 | + else " complain | |
445 | 475 | endif |
446 | 476 | endfunction |
447 | 477 | > |
@@ -453,17 +483,42 @@ | ||
453 | 483 | from <netrw.vim> itself: |
454 | 484 | > |
455 | 485 | if has("win95") && g:netrw_win95ftp |
456 | - fu! NetReadFixup(method, line1, line2) | |
486 | + fun! NetReadFixup(method, line1, line2) | |
457 | 487 | if method == 3 " ftp (no <.netrc>) |
458 | - let fourblanklines= line2 - 3 | |
459 | - silent fourblanklines.",".line2."g/^\s*/d" | |
488 | + let fourblanklines= line2 - 3 | |
489 | + silent fourblanklines.",".line2."g/^\s*/d" | |
460 | 490 | endif |
461 | 491 | endfunction |
462 | 492 | endif |
463 | 493 | > |
464 | 494 | |
465 | 495 | ============================================================================== |
466 | -7. Debugging *netrw-debug* | |
496 | +7. Remote Directory Listing *netrw-dir* *netrw-list* | |
497 | + | |
498 | +Netrw supports listing (browsing) directories on remote hosts; simply attempt | |
499 | +to read a "file" with a trailing slash and it will be interpreted as a | |
500 | +request to browse a directory: | |
501 | + | |
502 | + vim [protocol]://[user@]hostname/path/ | |
503 | + | |
504 | +Netrw will modify the command in g:netrw_list to perform the directory listing | |
505 | +operation. By default the command is: | |
506 | + | |
507 | + ssh HOSTNAME ls -Fa | |
508 | + | |
509 | +where the HOSTNAME becomes the hostname as requested by the attempted | |
510 | +read. Naturally, the user may override this command with whatever is | |
511 | +preferred. The NetList function which implements remote directory | |
512 | +browsing expects that directories will be flagged by a trailing slash. | |
513 | + | |
514 | +Browsing is simple: move the cursor onto a file or directory of interest. | |
515 | +Hitting the <cr> (the return key) will select the file or directory. Directories | |
516 | +will themselves be listed, and files will be opened using the protocol given | |
517 | +in the original read request. | |
518 | + | |
519 | + | |
520 | +============================================================================== | |
521 | +8. Debugging *netrw-debug* | |
467 | 522 | |
468 | 523 | The <netrw.vim> script is typically available as: |
469 | 524 |
@@ -494,31 +549,40 @@ | ||
494 | 549 | drchipNOSPAM at campbellfamily.biz - NOSPAM |
495 | 550 | |
496 | 551 | ============================================================================== |
497 | -8. New Stuff *netrw-new* *netrw-newstuff* | |
552 | +9. History *netrw-history* | |
498 | 553 | |
499 | - v43: * moved "Explanation" comments to <pi_netrw.txt> help file | |
500 | - as "Network Reference" (|netrw-ref|) | |
501 | - * <netrw.vim> now uses Dfunc() Decho() and Dret() for debugging | |
502 | - * removed superfluous NetRestorePosn() calls | |
503 | - v42: * now does BufReadPre and BufReadPost events on file:///* | |
504 | - and file://localhost/* | |
505 | - v41: * installed file:///* and file://localhost/* handling | |
506 | - v40: * prevents redraw when a protocol error occurs so that the | |
507 | - user may see it | |
508 | - v39: * sftp support | |
509 | - v38: * Now uses NetRestorePosn() calls with Nread/Nwrite commands | |
510 | - * Temporary files now removed via bwipe! instead of bwipe | |
511 | - (thanks to Dave Roberts) | |
512 | - v37: * Claar's modifications which test if ftp is successful, otherwise | |
513 | - give an error message | |
514 | - * After a read, the alternate file was pointing to the temp file. | |
515 | - The temp file buffer is now wiped out. | |
516 | - * removed silent from transfer methods so user can see what's | |
517 | - happening | |
554 | + v46: * now handles remote directory browsing | |
555 | + * g:netrw_silent (if 1) will cause all transfers to be silent'd | |
556 | + v45: * made the [user@]hostname:path form a bit more restrictive | |
557 | + to better handle errors in using protocols | |
558 | + (e.g. scp:usr@host:file was being recognized as an rcp request) | |
559 | + v44: * changed from "rsync -a" to just "rsync" | |
560 | + * somehow an editing error messed up the test to recognize | |
561 | + use of the fetch method for NetRead. | |
562 | + * more debugging statements included | |
563 | + v43: * moved "Explanation" comments to <pi_netrw.txt> help file | |
564 | + as "Network Reference" (|netrw-ref|) | |
565 | + * <netrw.vim> now uses Dfunc() Decho() and Dret() for debugging | |
566 | + * removed superfluous NetRestorePosn() calls | |
567 | + v42: * now does BufReadPre and BufReadPost events on file:///* | |
568 | + and file://localhost/* | |
569 | + v41: * installed file:///* and file://localhost/* handling | |
570 | + v40: * prevents redraw when a protocol error occurs so that the | |
571 | + user may see it | |
572 | + v39: * sftp support | |
573 | + v38: * Now uses NetRestorePosn() calls with Nread/Nwrite commands | |
574 | + * Temporary files now removed via bwipe! instead of bwipe | |
575 | + (thanks to Dave Roberts) | |
576 | + v37: * Claar's modifications which test if ftp is successful, otherwise | |
577 | + give an error message | |
578 | + * After a read, the alternate file was pointing to the temp file. | |
579 | + The temp file buffer is now wiped out. | |
580 | + * removed silent from transfer methods so user can see what's | |
581 | + happening | |
518 | 582 | |
519 | 583 | |
520 | 584 | ============================================================================== |
521 | -9. Credits *netrw-credits* | |
585 | +10. Credits *netrw-credits* | |
522 | 586 | |
523 | 587 | Vim editor by Bram Moolenaar (Thanks, Bram!) |
524 | 588 | dav support by C Campbell |
@@ -1,4 +1,4 @@ | ||
1 | -*quickfix.txt* For Vim version 7.0aa. Last change: 2004 May 20 | |
1 | +*quickfix.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -795,7 +795,7 @@ | ||
795 | 795 | |
796 | 796 | Maintaining the correct directory is more complicated if you don't use |
797 | 797 | GNU-make. AIX-make for example doesn't print any information about its working |
798 | -directory. Then you need to enhance the makefile. In the makefile of lesstiff | |
798 | +directory. Then you need to enhance the makefile. In the makefile of LessTif | |
799 | 799 | there is a command which echoes "Making {target} in {dir}". The special |
800 | 800 | problem here is that it doesn't print informations on leaving the directory |
801 | 801 | and that it doesn't print the absolute path. |
@@ -1,4 +1,4 @@ | ||
1 | -*recover.txt* For Vim version 7.0aa. Last change: 2004 Apr 16 | |
1 | +*recover.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -61,7 +61,7 @@ | ||
61 | 61 | directories (although Vim tries to avoid that by comparing the path name). |
62 | 62 | This will result in bogus ATTENTION warning messages. |
63 | 63 | - When you use your home directory, and somebody else tries to edit the same |
64 | - file, he will not see your swap file and will not get the ATTENTION waring | |
64 | + file, he will not see your swap file and will not get the ATTENTION warning | |
65 | 65 | message. |
66 | 66 | On the Amiga you can also use a recoverable ram disk, but there is no 100% |
67 | 67 | guarantee that this works. Putting swap files in a normal ram disk (like RAM: |
@@ -1,4 +1,4 @@ | ||
1 | -*sponsor.txt* For Vim version 7.0aa. Last change: 2004 Apr 23 | |
1 | +*sponsor.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -83,9 +83,10 @@ | ||
83 | 83 | show others you are a registered Vim user or sponsor. |
84 | 84 | |
85 | 85 | Cash Small amounts can be send with ordinary mail. Put something |
86 | - around the money, so that it's not noticable from the outside. | |
87 | - Mention your e-mail address if you want to vote for features | |
88 | - and show others you are a registered Vim user or sponsor. | |
86 | + around the money, so that it's not noticeable from the | |
87 | + outside. Mention your e-mail address if you want to vote for | |
88 | + features and show others you are a registered Vim user or | |
89 | + sponsor. | |
89 | 90 | |
90 | 91 | This is Bram's address: Bram Moolenaar |
91 | 92 | Clematisstraat 30 |
@@ -1,4 +1,4 @@ | ||
1 | -*starting.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 | |
1 | +*starting.txt* For Vim version 7.0aa. Last change: 2004 Jun 18 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -1222,7 +1222,7 @@ | ||
1222 | 1222 | - They don't restore everything. For example, defined functions, autocommands |
1223 | 1223 | and ":syntax on" are not included. Things like register contents and |
1224 | 1224 | command line history are in viminfo, not in Sessions or Views. |
1225 | -- Global option values are only set when the differ from the default value. | |
1225 | +- Global option values are only set when they differ from the default value. | |
1226 | 1226 | When the current value is not the default value, loading a Session will not |
1227 | 1227 | set it back to the default value. Local options will be set back to the |
1228 | 1228 | default value though. |
@@ -1,4 +1,4 @@ | ||
1 | -*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 | |
1 | +*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -739,7 +739,7 @@ | ||
739 | 739 | CYNLIB *cynlib.vim* *cynlib-syntax* |
740 | 740 | |
741 | 741 | Cynlib files are C++ files that use the Cynlib class library to enable |
742 | -hardware modeling and simulation using C++. Typically Cynlib files have a .cc | |
742 | +hardware modelling and simulation using C++. Typically Cynlib files have a .cc | |
743 | 743 | or a .cpp extension, which makes it very difficult to distinguish them from a |
744 | 744 | normal C++ file. Thus, to enable Cynlib highlighting for .cc files, add this |
745 | 745 | line to your .vimrc file: > |
@@ -1664,7 +1664,7 @@ | ||
1664 | 1664 | |
1665 | 1665 | let b:preprocs_as_sections = 1 |
1666 | 1666 | |
1667 | -As well, the syntax file adds an extra paragraph marker for the exdented | |
1667 | +As well, the syntax file adds an extra paragraph marker for the extended | |
1668 | 1668 | paragraph macro (.XP) in the ms package. |
1669 | 1669 | |
1670 | 1670 | Finally, there is a |groff.vim| syntax file that can be used for enabling |
@@ -1,4 +1,4 @@ | ||
1 | -*todo.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
1 | +*todo.txt* For Vim version 7.0aa. Last change: 2004 Jun 20 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -30,19 +30,10 @@ | ||
30 | 30 | *known-bugs* |
31 | 31 | -------------------- Known bugs and current work ----------------------- |
32 | 32 | |
33 | -This example doesn't work: | |
34 | - :e `=foo . ".c" ` | |
35 | -Inside `` don't use " as the start of a comment. | |
36 | -Also don't expand % or #. | |
37 | - | |
38 | -Corrections for docs from A3. Skip ones already done. | |
39 | - | |
40 | - | |
41 | 33 | For version 7.0: |
42 | 34 | - Include many PATCHES: |
43 | - 9 Win32 GuI: The print dialog uses a font which doesn't display multi-byte | |
44 | - messages. Include patch from Vipin Aravind? Update from Yasuhiro | |
45 | - Matsumoto. | |
35 | + 9 Merge in ideas from tutor.txt (Gabriel Zachmann) | |
36 | + New version 2004 June 16. | |
46 | 37 | 8 ":winpos" doesn't work. Patch from Vipin Aravind. |
47 | 38 | 8 Add GTK 2.3 file dialog support. Patch by Grahame Bowland, 2004 Mar 15, |
48 | 39 | but it doesn't use "initdir" or "dflt". (will update patch) |
@@ -51,7 +42,7 @@ | ||
51 | 42 | 8 Add file locking. Lock a file when starting to edit it with flock() or |
52 | 43 | fcntl(). This patch has advisory file locking while reading/writing |
53 | 44 | the file: ~/vim/patches/kahn_file_locking . |
54 | - Do we still want this/ | |
45 | + Do we still want this? Andy doesn't have time to work on it. | |
55 | 46 | 8 Add buffer-local autocommands? Reduces overhead for autocommands that |
56 | 47 | trigger often (inserting a character, switching mode). |
57 | 48 | :au Event <buffer> do-something |
@@ -64,10 +55,79 @@ | ||
64 | 55 | VimResized - When the Vim window has been resized (SIGWINCH) |
65 | 56 | patch from Yakov Lerner, 2003 July 24. |
66 | 57 | He'll write documentation and send updated patch. |
58 | + InsmodEnter | |
59 | + InsmodLeave Taro Muraoka, 2004 Jun 16 | |
67 | 60 | - Include the kvim patch. http://freenux.org/vim/ (Mickael Marchand) |
68 | 61 | Do not add Qtopia yet, it doesn't work very well. |
69 | 62 | Mickael will update the patch before 21st. |
70 | - --- responses above | |
63 | + 8 Unix: When libcall() fails there is no clear error message. Johannes | |
64 | + Zellner has a patch for this. | |
65 | + updated patch 2004 June 16. | |
66 | + 7 Add the MzScheme interface. Patch on http://iamphet.nm.ru/scheme/ | |
67 | + (Sergey Khorev) | |
68 | + Alt URL: http://cyber.miem.edu.ru/~iamphet/scheme/mzvim-0.560.tar.gz | |
69 | + 8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac? | |
70 | + New patch 2004 Jun 16 | |
71 | + 8 Add expression-expansion, so that the user can define his own kind of | |
72 | + completion. Patch from Taro Muraoka, 2003 Aug 26. | |
73 | + New patch 2004 Jun 16 | |
74 | + 8 Text objects: Add "a'" and 'a"': a single or double quoted string. | |
75 | + (Tim Chase) Patch from Taro Muraoka (2003 Dec 16). | |
76 | + New patch 2004 Jun 16 | |
77 | + 7 Add "nbsp" in 'listchars'? Patch from David Blanchet, 2003 Jul 28. | |
78 | + again 2004 Jun 16 | |
79 | + 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. | |
80 | + Aric Blumer has a patch for this. | |
81 | + He will update the patch for 6.3. | |
82 | + 9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option, | |
83 | + set highlighting with "CursorColumn" group. Useful for aligning text. | |
84 | + Also cursor-row highlighting. Patch from Yasuhiro Matsumoto for | |
85 | + underlining the cursor line, 2004 Mar 24. Update 2004 Jun 17 | |
86 | + Alternatie: when 'number' is set highlight the number of the current | |
87 | + line. | |
88 | + 7 Completion of network shares, patch by Yasuhiro Matsumoto. | |
89 | + Update 2004 Jun 17. | |
90 | + 8 Patches from Peter "Rain Dog" Cucka: | |
91 | + - guifont selector (2002 Dec 15) will send update | |
92 | + 7 Add an option to set the width of the 'number' column. Eight | |
93 | + positions is often more than needed. Or adjust the width to the | |
94 | + length of the file? | |
95 | + Add patch that adds 'numberlen' option. (James Harvey) | |
96 | + Other patch with min and max from Emmanuel Renieris (2002 Jul 24) | |
97 | + Other patch without an option by Gilles Roy (2002 Jul 25) | |
98 | + New patch from Emmanuel Renieris, 2004 Jun 17 | |
99 | + Needs more work: use one option with one or two numbers | |
100 | + 7 Be able to call a function while passing on a variable number of | |
101 | + arguments: | |
102 | + :function Foo(abc, ...) | |
103 | + : call Bar(a:abc, a:*) | |
104 | + Charles Campbell has a patch for this | |
105 | + He lost the patch himself. | |
106 | + 7 Make ":startinsert" command work directly for functions and scripts? | |
107 | + Also make it possible to append (it's difficult at end of line). | |
108 | + And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9, | |
109 | + http://www.erols.com/astronaut/vim/index.html#Patch) | |
110 | + Update 2004 June 18 | |
111 | + 8 Add patch from Charles Campbell to have ":0file!" remove the name of | |
112 | + the current buffer. (2003 June 17) | |
113 | + Lost the patch himself. | |
114 | + 8 Make it possible to delete marks. Charles Campbell has a patch that | |
115 | + does this with the markclear() function (2004 Jan 9). And the | |
116 | + ":delmark" command (2004 Feb 9) | |
117 | + Update 2004 June 18 | |
118 | + 8 ":hardcopy": | |
119 | + - Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun | |
120 | + 14) | |
121 | + - support printing multi-byte characters. Patch from Motonobu | |
122 | + Ichimura. New (better) patch from Mike Williams (2004 Jan 20) | |
123 | + Updated patch: http://www.eandem.co.uk/mrw/vim/special/index.html | |
124 | + 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ): | |
125 | + 'flipcase' variable: upper/lowercase pairs. | |
126 | + Insert comma's between pairs and allow a range, make it look like | |
127 | + 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to | |
128 | + separate the from and to part is optional. | |
129 | + Resp: no time now. | |
130 | + --- responses above -- | |
71 | 131 | 7 Make "5dd" on last-but-one-line not delete anything (Vi compatible). |
72 | 132 | Add flag in 'cpoptions' for this. When not present, "2dd" in the last |
73 | 133 | line should delete the last line. Patch from greenx 2002 Apr 11. |
@@ -77,30 +137,10 @@ | ||
77 | 137 | Martin Dalecki 2002 Jan 11. |
78 | 138 | 8 Add a few more command names to the menus. Patch from Jiri Brezina |
79 | 139 | (28 feb 2002). |
80 | - 8 Patch to add 'transparency' option. Disadvantage: it's slow. (Eckehard | |
81 | - Berns, 2004 May 9) http://ecki.to/vim-icns/TransBack.diff | |
82 | - 8 Patches from "Rain Dog" Cucka: | |
83 | - - guifont selector (2002 Dec 15) | |
84 | - - scrollbar (2002 Dec 8) | |
85 | - - Quartz fonts (2002 Dec 8) | |
86 | 140 | 7 ATTENTION dialog choices are more logical when "Delete it' appears |
87 | 141 | before "Quit". Patch by Robert Webb, 2004 May 3. |
88 | - 8 Unix: When libcall() fails there is no clear error message. Johannes | |
89 | - Zellner has a patch for this. | |
90 | - 8 ":hardcopy": | |
91 | - - Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun | |
92 | - 14) | |
93 | - - support printing multi-byte characters. Patch from Motonobu | |
94 | - Ichimura. New (better) patch from Mike Williams (2004 Jan 20) | |
95 | - 9 Merge in ideas from ~/vim/patches/tutor.txt (Gabriel Zachmann) | |
96 | - 8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac? | |
97 | 142 | - Include flipcase patch: ~/vim/patches/wall.flipcase2 ? Make it work |
98 | 143 | for multi-byte characters. |
99 | - 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ): | |
100 | - 'flipcase' variable: upper/lowercase pairs. | |
101 | - Insert comma's between pairs and allow a range, make it look like | |
102 | - 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to | |
103 | - separate the from and to part is optional. | |
104 | 144 | - Win32: add options to print dialog. Patch from Vipin Aravind. |
105 | 145 | - Patch to add highlighting for whitespace. (Tom Schumm, 2003 Jul 5) |
106 | 146 | use the patch that keeps using HLF_8 if HLF_WS has not |
@@ -113,19 +153,6 @@ | ||
113 | 153 | - Add possibility to highlight specific columns (for Fortran). Or put a |
114 | 154 | line in between columns (e.g. for 'textwidth'). |
115 | 155 | Patch to add 'hlcolumn' from Vit Stradal, 2004 May 20. |
116 | - 9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option, | |
117 | - set highlighting with "CursorColumn" group. Useful for aligning text. | |
118 | - Also cursor-row highlighting. Patch from Yasuhiro Matsumoto for | |
119 | - underlining the cursor line, 2004 Mar 24. | |
120 | - Alternatie: when 'number' is set highlight the number of the current | |
121 | - line. | |
122 | - 7 Be able to call a function while passing on a variable number of | |
123 | - arguments: | |
124 | - :function Foo(abc, ...) | |
125 | - : call Bar(a:abc, a:*) | |
126 | - Charles Campbell has a patch for this | |
127 | - 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. | |
128 | - Aric Blumer has a patch for this. | |
129 | 156 | 8 Add functions: |
130 | 157 | tr(expr, from, to) translate chars (Patch from Ron Aaron, Apr 8 |
131 | 158 | 2004) |
@@ -136,9 +163,9 @@ | ||
136 | 163 | Presser) |
137 | 164 | He will send a new patch. |
138 | 165 | Is this really useful? |
139 | - --- | |
140 | 166 | multibyteidx(string, idx) Byte index in multi-byte character. |
141 | 167 | Patch by Ilya Sher, 2004 Feb 25 |
168 | + Update June 18 (third one). | |
142 | 169 | menuprop({name}, {idx}, {what}) |
143 | 170 | Get menu property of menu {name} item {idx}. |
144 | 171 | menuprop("", 1, "name") returns "File". |
@@ -148,9 +175,15 @@ | ||
148 | 175 | mapname({idx}, mode) return the name of the idx'th mapping. |
149 | 176 | Patch by Ilya Sher, 2004 Mar 4. |
150 | 177 | match({pat}, {string} [,start] [,count]) get index of count'th match |
151 | - Patch by Ilya Sher, 2004 Mar 31 | |
178 | + Patch by Ilya Sher, 2004 Jun 19 | |
152 | 179 | find() find file in 'path' (patch from Johannes |
153 | 180 | Zellner 2001 Dec 20) |
181 | + Update 2004 Jun 16. | |
182 | + gettext() Translate a message. (Patch from Yasuhiro | |
183 | + Matsumoto) How to get the messages into the | |
184 | + .po files? | |
185 | + Update 2004 Jun 17 | |
186 | + --- | |
154 | 187 | realname() Get user name (first, last, full) |
155 | 188 | user_fullname() patch by Nikolai Weibull, Nov |
156 | 189 | 3 2002) |
@@ -175,10 +208,6 @@ | ||
175 | 208 | (Patch from Yegappan Lakshmanan) |
176 | 209 | raisewin() raise gvim window (see HierAssist patch for |
177 | 210 | Tcl implementation ~/vim/HierAssist/ ) |
178 | - gettext() Translate a message. (Patch from Yasuhiro | |
179 | - Matsumoto) How to get the messages into the | |
180 | - .po files? | |
181 | - 7 Add "nbsp" in 'listchars'? Patch from David Blanchet, 2003 Jul 28. | |
182 | 211 | 7 Add patch from Benoit Cerrina to integrate Vim and Perl functions |
183 | 212 | better. Now also works for Ruby (2001 Nov 10) |
184 | 213 | 7 Add 'taglistfiles' option, show file name and type when listing matching |
@@ -186,37 +215,20 @@ | ||
186 | 215 | 7 Motif: use the menu font consistently. Patch from Martin Dalecki 2002 |
187 | 216 | Jan 11. |
188 | 217 | - Motif: add 3D shading for the menu entries? Patch from Martin Dalecki. |
189 | - 8 Add expression-expansion, so that the user can define his own kind of | |
190 | - completion. Patch from Taro Muraoka, 2003 Aug 26. | |
191 | - 7 Completion of network shares, patch by Yasuhiro Matsumoto. | |
192 | 218 | 9 When 'autoindent' is set, hitting <CR> twice, while there is text after |
193 | 219 | the cursor, doesn't delete the autoindent in the resulting blank line. |
194 | 220 | (Rich Wales) This is Vi compatible, but it looks like a bug. Rich has |
195 | 221 | a suggestion for a patch to fix this. |
196 | 222 | e-mail to Rich bounced. |
197 | - 7 Make ":startinsert" command work directly for functions and scripts? | |
198 | - Also make it possible to append (it's difficult at end of line). | |
199 | - And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9, | |
200 | - http://www.erols.com/astronaut/vim/index.html#Patch) | |
201 | - 8 Text objects: Add "a'" and 'a"': a single or double quoted string. | |
202 | - (Tim Chase) Patch from Taro Muraoka (2003 Dec 16). | |
203 | 223 | 7 For Visual mode: Command to do a search for the string in the marked |
204 | 224 | area. Only when fewer than two lines. Use "g/" and "gb". Patch from |
205 | 225 | Yegappan Lakshmanan. |
206 | 226 | 7 When 'rightleft' is set, the search pattern should be displayed right |
207 | 227 | to left as well? See patch of Dec 26. (Nadim Shaikli) |
208 | - 8 Add patch from Charles Campbell to have ":0file!" remove the name of | |
209 | - the current buffer. (2003 June 17) | |
210 | - 8 Make it possible to delete marks. Charles Campbell has a patch that | |
211 | - does this with the markclear() function (2004 Jan 9). And the | |
212 | - ":delmark" command (2004 Feb 9) | |
213 | - 7 Win32: Add patch for 5-button mouse. (Michael Geddes 2001 Nov 26) | |
214 | 228 | 8 Lock all used memory so that it doesn't get swapped to disk (uncrypted). |
215 | 229 | Patch by Jason Holt, 2003 May 23. |
216 | 230 | 7 Support a stronger encryption. Jason Holt implemented AES (May 6 2003). |
217 | 231 | 7 Add ! register, for shell commands. (patch from Grenie) |
218 | - 7 Add the MzScheme interface. Patch on http://iamphet.nm.ru/scheme/ | |
219 | - (Sergey Khorev) | |
220 | 232 | 8 Make 'statusline' local, so that each window can have a different |
221 | 233 | value. But should it also be local to a buffer? (Yegappan Lakshmanan |
222 | 234 | has a patch, 2002 feb 15) |
@@ -233,21 +245,10 @@ | ||
233 | 245 | 8 Include a connection to an external program through a pipe? See |
234 | 246 | patches from Felbinger for a mathematica interface. |
235 | 247 | Or use emacs server kind of thing? |
236 | - 7 Add an option to set the width of the 'number' column. Eight | |
237 | - positions is often more than needed. Or adjust the width to the | |
238 | - length of the file? | |
239 | - Add patch that adds 'numberlen' option. (James Harvey) | |
240 | - Other patch with min and max from Emmanuel Renieris (2002 Jul 24) | |
241 | - Other patch without an option by Gilles Roy (2002 Jul 25) | |
242 | 248 | 7 Add ":justify" command. Patch from Vit Stradal 2002 Nov 25. |
243 | 249 | - findmatch() should be adjusted for Lisp. See remark at |
244 | 250 | get_lisp_indent(). Esp. \( and \) should be skipped. (Dorai Sitaram, |
245 | 251 | incomplete patch Mar 18) |
246 | - 8 Sorting of filenames for completion is wrong on systems that ignore | |
247 | - case of filenames. Add 'ignorefncase' option. When set, case in | |
248 | - filenames is ignored for sorting them. Patch by Mike Williams: | |
249 | - ~/vim/patches/ignorefncase. Also change what matches? Or use another | |
250 | - option name. | |
251 | 252 | - Change ga_room into ga_maxlen, so that it doesn't need to be |
252 | 253 | incremented/decremented each time. |
253 | 254 | - new DATA TYPES: lists, dictionaries and function references. |
@@ -716,8 +717,9 @@ | ||
716 | 717 | |
717 | 718 | |
718 | 719 | Macintosh: |
719 | -9 Mac: The motion type is not stored on the clipboard. Using ":set | |
720 | - clipboard=unnamed" makes "yyp" work characterwise. (Michael DeMoney) | |
720 | +7 Patch to add 'transparency' option. Disadvantage: it's slow. (Eckehard | |
721 | + Berns, 2004 May 9) http://ecki.to/vim/TransBack-2004-05-09.diff | |
722 | + Needs more work. Add when someone really wants it. | |
721 | 723 | 7 Loading the Perl library only works on OS/X 10.2 or 10.3, never on both. |
722 | 724 | Load the Perl library dynamically see Python sources file dynload_mac |
723 | 725 | (Jack) |
@@ -1745,7 +1747,7 @@ | ||
1745 | 1747 | bound windows. |
1746 | 1748 | - Add 'search' option to 'scrollopt' to allow 'scrollbind' windows to |
1747 | 1749 | be bound by regexp searches |
1748 | -- Add "z>" and "z<": scroll sideways one screenfull. (Campbell) | |
1750 | +- Add "z>" and "z<": scroll sideways one screenful. (Campbell) | |
1749 | 1751 | - Add option to set the number of lines when not to scroll, instead of the |
1750 | 1752 | fixed number used now (for terminals that scroll slow with a large number |
1751 | 1753 | of lines but not with a single line). |
@@ -2971,7 +2973,7 @@ | ||
2971 | 2973 | Debug mode: |
2972 | 2974 | 7 Add something to enable debugging when a remote message is received. |
2973 | 2975 | 8 Add breakpoints for setting an option |
2974 | -8 Add breakpoits for assigning to a variable. | |
2976 | +8 Add breakpoints for assigning to a variable. | |
2975 | 2977 | 7 Add a watchpoint in the debug mode: An expression that breaks execution |
2976 | 2978 | when evaluating to non-zero. |
2977 | 2979 | 7 Store the history from debug mode in viminfo. |
@@ -3361,6 +3363,11 @@ | ||
3361 | 3363 | - Support mapping for replace mode and "r" command (Vi doesn't do this)? |
3362 | 3364 | 5 Add 'ignorefilecase' option: Ignore case when expanding file names. |
3363 | 3365 | ":e ma<Tab>" would also find "Makefile" on Unix. |
3366 | +8 Sorting of filenames for completion is wrong on systems that ignore | |
3367 | + case of filenames. Add 'ignorefncase' option. When set, case in | |
3368 | + filenames is ignored for sorting them. Patch by Mike Williams: | |
3369 | + ~/vim/patches/ignorefncase. Also change what matches? Or use another | |
3370 | + option name. | |
3364 | 3371 | 8 Should be able to compile Vim in another directory, with $(srcdir) set to |
3365 | 3372 | where the sources are. Add $(srcdir) in the Makefile in a lot of places. |
3366 | 3373 | (Netherton) |
@@ -1,4 +1,4 @@ | ||
1 | -*usr_21.txt* For Vim version 7.0aa. Last change: 2004 Mar 29 | |
1 | +*usr_21.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | VIM USER MANUAL - by Bram Moolenaar |
4 | 4 |
@@ -65,7 +65,7 @@ | ||
65 | 65 | :w !{program} execute {program} and send text to its input |
66 | 66 | :[range]!{program} filter text through {program} |
67 | 67 | |
68 | -Notice that the precense of a range before "!{program}" makes a big | |
68 | +Notice that the presense of a range before "!{program}" makes a big | |
69 | 69 | difference. Without it executes the program normally, with the range a number |
70 | 70 | of text lines is filtered through the program. |
71 | 71 |
@@ -1,4 +1,4 @@ | ||
1 | -*usr_22.txt* For Vim version 7.0aa. Last change: 2003 Mar 17 | |
1 | +*usr_22.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | VIM USER MANUAL - by Bram Moolenaar |
4 | 4 |
@@ -95,7 +95,7 @@ | ||
95 | 95 | s Use the field the cursor is in to sort on. First |
96 | 96 | display the size and date with i. Then Move the |
97 | 97 | cursor to the size of any file and press s. The files |
98 | - will now be sorted on size. Press s wile the cursor | |
98 | + will now be sorted on size. Press s while the cursor | |
99 | 99 | is on a date and the items will be sorted on date. |
100 | 100 | r reverse the sorting order (either size or date) |
101 | 101 |
@@ -1,4 +1,4 @@ | ||
1 | -*various.txt* For Vim version 7.0aa. Last change: 2004 Jun 14 | |
1 | +*various.txt* For Vim version 7.0aa. Last change: 2004 Jun 18 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -571,9 +571,11 @@ | ||
571 | 571 | current file. See |help-translated|. |
572 | 572 | |
573 | 573 | *:helpg* *:helpgrep* |
574 | -:helpg[rep] {pattern} | |
574 | +:helpg[rep] {pattern}[@xx] | |
575 | 575 | Search all help text files and make a list of lines |
576 | 576 | in which {pattern} matches. Jumps to the first match. |
577 | + The optional [@xx] specifies that only matches in the | |
578 | + "xx" language are to be found. | |
577 | 579 | You can navigate through the matches with the |
578 | 580 | |quickfix| commands, e.g., |:cnext| to jump to the |
579 | 581 | next one. Or use |:cwindow| to get the list of |
@@ -584,6 +586,8 @@ | ||
584 | 586 | :helpgrep Uganda |
585 | 587 | < Example for case ignoring search: > |
586 | 588 | :helpgrep uganda\c |
589 | +< Example for searching in French help: > | |
590 | + :helpgrep backspace@fr | |
587 | 591 | < Cannot be followed by another command, everything is |
588 | 592 | used as part of the pattern. But you can use |
589 | 593 | |:execute| when needed. |
@@ -1,4 +1,4 @@ | ||
1 | -*version5.txt* For Vim version 7.0aa. Last change: 2004 Jan 17 | |
1 | +*version5.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -1517,7 +1517,7 @@ | ||
1517 | 1517 | |
1518 | 1518 | Crash when pasting with the mouse in insert mode. |
1519 | 1519 | |
1520 | -Crash whith ":unmenu *" in .gvimrc for Athena. | |
1520 | +Crash with ":unmenu *" in .gvimrc for Athena. | |
1521 | 1521 | |
1522 | 1522 | "5>>" shifted 5 lines 5 times, instead of 1 time. |
1523 | 1523 |
@@ -2026,7 +2026,7 @@ | ||
2026 | 2026 | either begin in the current directory, or that of the current buffer. (Negri |
2027 | 2027 | and Kahn) |
2028 | 2028 | Added the 'browsedir' option, with value "current", "last" or "buffer". Tells |
2029 | -wether a browse dialog starts in last used dir, dir of current buffer, or | |
2029 | +whether a browse dialog starts in last used dir, dir of current buffer, or | |
2030 | 2030 | current dir. ":browse w" is unaffected. |
2031 | 2031 | The default menus have been changed to use the ":browse" command. |
2032 | 2032 |
@@ -3667,8 +3667,8 @@ | ||
3667 | 3667 | In the output of ":clist" the current entry is highlighted, with the 'i' |
3668 | 3668 | highlighting (same as used for 'incsearch'). |
3669 | 3669 | |
3670 | -For the ":clist" command, you can scroll backwards with "b" (one screenfull), | |
3671 | -"u" (half a screenfull) and "k" (one line). | |
3670 | +For the ":clist" command, you can scroll backwards with "b" (one screenful), | |
3671 | +"u" (half a screenful) and "k" (one line). | |
3672 | 3672 | |
3673 | 3673 | Multi-byte support: |
3674 | 3674 | - X-input method for multi-byte characters. And various fixes for multi-byte |
@@ -4582,7 +4582,7 @@ | ||
4582 | 4582 | Dos and Win32 console: Setting t_me didn't work to get another color. Made |
4583 | 4583 | this works backwards compatible. |
4584 | 4584 | |
4585 | -For turkish (LANG = "tr") uppercase 'i' is not an 'I'. Use ASCII uppercase | |
4585 | +For Turkish (LANG = "tr") uppercase 'i' is not an 'I'. Use ASCII uppercase | |
4586 | 4586 | translation in vim_strup() to avoid language problems. (Komur) |
4587 | 4587 | |
4588 | 4588 | Unix: Use usleep() or nanosleep() for mch_delay() when available. Hopefully |
@@ -7578,7 +7578,7 @@ | ||
7578 | 7578 | |
7579 | 7579 | optwin.vim gave an error when used in Vi compatible mode ('cpo' contains 'C'). |
7580 | 7580 | |
7581 | -Tcl interpreter: "buffer" command didn't check for precense of an argument. | |
7581 | +Tcl interpreter: "buffer" command didn't check for presense of an argument. | |
7582 | 7582 | (Dave Bodenstab) |
7583 | 7583 | |
7584 | 7584 | dosinst.c: Added checks for too long file name. |
@@ -1,4 +1,4 @@ | ||
1 | -*version6.txt* For Vim version 7.0aa. Last change: 2004 Jun 07 | |
1 | +*version6.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -1764,7 +1764,7 @@ | ||
1764 | 1764 | - Use XPM bitmaps for the icon when possible. Use the Solaris XpmP.h include |
1765 | 1765 | file when it's available. |
1766 | 1766 | - Change the shadow of the toolbar items to get a visual feedback of it being |
1767 | - pressed on non-LessTiff. | |
1767 | + pressed on non-LessTif. | |
1768 | 1768 | - Use gadgets instead of windows for some items for speed. |
1769 | 1769 | |
1770 | 1770 | Command line completion: |
@@ -6645,7 +6645,7 @@ | ||
6645 | 6645 | Files: src/getchar.c |
6646 | 6646 | |
6647 | 6647 | Patch 6.1.031 |
6648 | -Problem: Cygwin: Xxd could read a file in text mode intead of binary mode. | |
6648 | +Problem: Cygwin: Xxd could read a file in text mode instead of binary mode. | |
6649 | 6649 | Solution: Use "rb" or "rt" when needed. (Pavol Juhas) |
6650 | 6650 | Files: src/xxd/xxd.c |
6651 | 6651 |
@@ -6947,7 +6947,7 @@ | ||
6947 | 6947 | Files: src/edit.c, src/feature.h, src/gui_mac.c, src/os_mac.c |
6948 | 6948 | |
6949 | 6949 | Patch 6.1.077 |
6950 | -Problem: On a Debian systEm wht ACL linking fails. (Lubomir Host) | |
6950 | +Problem: On a Debian system with ACL linking fails. (Lubomir Host) | |
6951 | 6951 | Solution: When the "acl" library is used, check if the "attr" library is |
6952 | 6952 | present and use it. |
6953 | 6953 | Files: src/auto/configure, src/configure.in, src/link.sh |
@@ -7229,7 +7229,7 @@ | ||
7229 | 7229 | |
7230 | 7230 | Patch 6.1.121 (depends on 6.1.098) |
7231 | 7231 | Problem: When starting Select mode from Insert mode, then using the Paste |
7232 | - menu entry, the cursor is left before the laste pasted character. | |
7232 | + menu entry, the cursor is left before the last pasted character. | |
7233 | 7233 | (Mario Schweigler) |
7234 | 7234 | Solution: Set the cursor for Insert mode one character to the right. |
7235 | 7235 | Files: runtime/menu.vim |
@@ -7963,7 +7963,7 @@ | ||
7963 | 7963 | Problem: Double clicking with the mouse to select a word does not work for |
7964 | 7964 | multi-byte characters. |
7965 | 7965 | Solution: Use vim_iswordc() instead of vim_isIDc(). This means 'iskeyword' |
7966 | - is used intead of 'isident'. Also fix that mixing ASCII with | |
7966 | + is used instead of 'isident'. Also fix that mixing ASCII with | |
7967 | 7967 | multi-byte word characters doesn't work, the mouse class for |
7968 | 7968 | punctuation and word characters was mixed up. |
7969 | 7969 | Files: src/normal.c |
@@ -10262,7 +10262,7 @@ | ||
10262 | 10262 | |
10263 | 10263 | Patch 6.2.053 |
10264 | 10264 | Problem: Prototype for bzero() doesn't match most systems. |
10265 | -Solution: Use "void *" instead of "char *" and "size_t" intead of "int". | |
10265 | +Solution: Use "void *" instead of "char *" and "size_t" instead of "int". | |
10266 | 10266 | Files: src/osdef1.h.in |
10267 | 10267 | |
10268 | 10268 | Patch 6.2.054 |
@@ -10534,7 +10534,7 @@ | ||
10534 | 10534 | Patch 6.2.096 |
10535 | 10535 | Problem: Win32: ":let @* = ''" put a newline on the clipboard. (Klaus |
10536 | 10536 | Bosau) |
10537 | -Solution: Put zero bytes on the clibpoard for an empty string. | |
10537 | +Solution: Put zero bytes on the clipboard for an empty string. | |
10538 | 10538 | Files: src/ops.c |
10539 | 10539 | |
10540 | 10540 | Patch 6.2.097 |
@@ -11339,7 +11339,7 @@ | ||
11339 | 11339 | runtime/doc/netbeans.txt, runtime/doc/tags |
11340 | 11340 | |
11341 | 11341 | Patch 6.2.216 (after 6.2.206) |
11342 | -Problem: Multi-byte characters stil cannot be used as hotkeys in a console | |
11342 | +Problem: Multi-byte characters still cannot be used as hotkeys in a console | |
11343 | 11343 | dialog. (Mattias Erkisson) |
11344 | 11344 | Solution: Make get_keystroke() handle multi-byte characters. |
11345 | 11345 | Files: src/misc1.c |
@@ -11376,7 +11376,7 @@ | ||
11376 | 11376 | Patch 6.2.222 |
11377 | 11377 | Problem: Using "--remote" several times on a row only opens some of the |
11378 | 11378 | files. (Dany St-Amant) |
11379 | -Solution: Don't delete all typehead when the server receives a command from | |
11379 | +Solution: Don't delete all typeahead when the server receives a command from | |
11380 | 11380 | a client, only delete typed characters. |
11381 | 11381 | Files: src/main.c |
11382 | 11382 |
@@ -11874,7 +11874,7 @@ | ||
11874 | 11874 | causes a crash. Evaluating an expression causes Vim to wait for |
11875 | 11875 | "cont" to be typed, without a prompt. (Hari Krishna Dara) |
11876 | 11876 | Solution: Disable debugging when evaluating an expression for a client. |
11877 | - (Michael Geddes) Don't try reading into the typehead buffer when | |
11877 | + (Michael Geddes) Don't try reading into the typeahead buffer when | |
11878 | 11878 | it may have been filled in another way. |
11879 | 11879 | Files: src/ex_getln.c, src/getchar.c, src/if_xcmdsrv.c, src/main.c, |
11880 | 11880 | src/misc1.c, src/proto/getchar.pro, src/proto/main.pro, |
@@ -12556,7 +12556,7 @@ | ||
12556 | 12556 | Problem: Win32 console: no extra key modifiers are supported. |
12557 | 12557 | Solution: Encode the modifiers into the input stream. Also fix that special |
12558 | 12558 | keys are converted and stop working when 'tenc' is set. Also fix |
12559 | - that when 'tenc' is intialized the input and output conversion is | |
12559 | + that when 'tenc' is initialized the input and output conversion is | |
12560 | 12560 | not setup properly until 'enc' or 'tenc' is set. |
12561 | 12561 | Files: src/getchar.c, src/option.c, src/os_win32.c |
12562 | 12562 |
@@ -13081,7 +13081,7 @@ | ||
13081 | 13081 | Problem: When reloading a hidden buffer changed outside of Vim and the |
13082 | 13082 | current buffer is read-only, the reloaded buffer becomes |
13083 | 13083 | read-only. (Hari Krishna Dara) |
13084 | -Solution: Save the 'readonly' flag of the realoaded buffer instead of the | |
13084 | +Solution: Save the 'readonly' flag of the reloaded buffer instead of the | |
13085 | 13085 | current buffer. |
13086 | 13086 | Files: src/fileio.c |
13087 | 13087 |
@@ -1,7 +1,7 @@ | ||
1 | 1 | " Vim indent file |
2 | 2 | " Language: VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb) |
3 | 3 | " Author: Johannes Zellner <johannes@zellner.org> |
4 | -" Last Change: Tue, 27 Apr 2004 14:54:59 CEST | |
4 | +" Last Change: Fri, 18 Jun 2004 07:22:42 CEST | |
5 | 5 | |
6 | 6 | if exists("b:did_indent") |
7 | 7 | finish |
@@ -10,7 +10,7 @@ | ||
10 | 10 | |
11 | 11 | setlocal indentexpr=VbGetIndent(v:lnum) |
12 | 12 | setlocal indentkeys& |
13 | -setlocal indentkeys+==~else,=~elseif,=~end,=~wend,=~case,=~next,=~select,~=loop,<:> | |
13 | +setlocal indentkeys+==~else,=~elseif,=~end,=~wend,=~case,=~next,=~select,=~loop,<:> | |
14 | 14 | |
15 | 15 | " Only define the function once. |
16 | 16 | if exists("*VbGetIndent") |
@@ -1,7 +1,7 @@ | ||
1 | 1 | " netrw.vim: (global plugin) Handles file transfer across a network |
2 | -" Last Change: Jun 04, 2004 | |
2 | +" Last Change: Jun 18, 2004 | |
3 | 3 | " Maintainer: Charles E. Campbell, Jr. PhD <drchipNOSPAM at campbellfamily.biz> |
4 | -" Version: 44 | |
4 | +" Version: 46 | |
5 | 5 | " License: Vim License (see vim's :help license) |
6 | 6 | " |
7 | 7 | " But be doers of the word, and not only hearers, deluding your own selves |
@@ -12,7 +12,7 @@ | ||
12 | 12 | if exists("loaded_netrw") || &cp |
13 | 13 | finish |
14 | 14 | endif |
15 | -let loaded_netrw = "v44" | |
15 | +let loaded_netrw = "v46" | |
16 | 16 | let s:save_cpo = &cpo |
17 | 17 | set cpo&vim |
18 | 18 |
@@ -68,6 +68,20 @@ | ||
68 | 68 | let g:netrw_fetch_cmd = "" |
69 | 69 | endif |
70 | 70 | endif |
71 | +if !exists("g:netrw_list_cmd") | |
72 | + if executable("ssh") | |
73 | + let g:netrw_list_cmd= "ssh HOSTNAME ls -Fa" | |
74 | + else | |
75 | +" call Decho("ssh is not executable, can't do netlist") | |
76 | + let g:netrw_list_cmd= "" | |
77 | + endif | |
78 | +endif | |
79 | +if exists("g:netrw_silent") && g:netrw_silent != 0 | |
80 | + let g:netrw_silentxfer= "silent " | |
81 | +else | |
82 | + let g:netrw_silentxfer= "" | |
83 | +endif | |
84 | + | |
71 | 85 | |
72 | 86 | if has("win32") |
73 | 87 | \ && exists("g:netrw_use_nt_rcp") |
@@ -97,7 +111,7 @@ | ||
97 | 111 | endif |
98 | 112 | au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "doau BufReadPre ".expand("<afile>")|exe "Nread 0r ".expand("<afile>")|exe "doau BufReadPost ".expand("<afile>") |
99 | 113 | au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "doau BufReadPre ".expand("<afile>")|exe "Nread " .expand("<afile>")|exe "doau BufReadPost ".expand("<afile>") |
100 | - au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "Nwrite " .expand("<afile>")|call <SID>NetRestorePosn() | |
114 | + au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "Nwrite " .expand("<afile>")|call <SID>NetRestorePosn() | |
101 | 115 | augroup END |
102 | 116 | endif |
103 | 117 |
@@ -151,9 +165,6 @@ | ||
151 | 165 | " save options |
152 | 166 | call s:NetOptionSave() |
153 | 167 | |
154 | - " get name of a temporary file | |
155 | - let tmpfile= tempname() | |
156 | - | |
157 | 168 | " Special Exception: if a file is named "0r", then |
158 | 169 | " "0r" will be used to read the |
159 | 170 | " following files instead of "r" |
@@ -168,6 +179,10 @@ | ||
168 | 179 | let ichoice = 1 |
169 | 180 | endif |
170 | 181 | |
182 | + " get name of a temporary file | |
183 | + let tmpfile= tempname() | |
184 | + | |
185 | +" call Decho("ichoice=".ichoice." readcmd<".readcmd.">") | |
171 | 186 | while ichoice <= a:0 |
172 | 187 | |
173 | 188 | " attempt to repeat with previous host-file-etc |
@@ -178,7 +193,7 @@ | ||
178 | 193 | |
179 | 194 | else |
180 | 195 | exe "let choice= a:" . ichoice |
181 | -" call Decho("NetRead1: choice<" . choice . ">") | |
196 | +" call Decho("no lastfile: choice<" . choice . ">") | |
182 | 197 | |
183 | 198 | " Reconstruct Choice if choice starts with '"' |
184 | 199 | if match(choice,"?") == 0 |
@@ -219,13 +234,13 @@ | ||
219 | 234 | endif |
220 | 235 | endif |
221 | 236 | endif |
222 | -" call Decho("NetRead2: choice<" . choice . ">") | |
237 | +" call Decho("choice<" . choice . ">") | |
223 | 238 | let ichoice= ichoice + 1 |
224 | 239 | |
225 | 240 | " fix up windows urls |
226 | 241 | if has("win32") |
227 | 242 | let choice = substitute(choice,'\\','/','ge') |
228 | -" call Decho("fixing up windows url to <".choice.">") | |
243 | +" call Decho("fixing up windows url to <".choice."> tmpfile<".tmpfile) | |
229 | 244 | exe 'lcd ' . fnamemodify(tmpfile,':h') |
230 | 245 | let tmpfile = fnamemodify(tmpfile,':t') |
231 | 246 | endif |
@@ -233,12 +248,24 @@ | ||
233 | 248 | " Determine method of read (ftp, rcp, etc) |
234 | 249 | call s:NetMethod(choice) |
235 | 250 | |
251 | + " Check if NetList() should be handling this request | |
252 | +" call Decho("checking if netlist: choice<".choice."> netrw_list_cmd<".g:netrw_list_cmd.">") | |
253 | + if choice =~ "^.*/$" | |
254 | + if strlen(g:netrw_list_cmd) > 0 | |
255 | + call s:NetList(choice) | |
256 | +" call Dret("NetRead") | |
257 | + else | |
258 | + echoerr "sorry, can't do a remote listing; ssh isn't executable" | |
259 | + endif | |
260 | + return | |
261 | + endif | |
262 | + | |
236 | 263 | " ============ |
237 | 264 | " Perform Read |
238 | 265 | " ============ |
239 | 266 | |
240 | 267 | "......................................... |
241 | - " rcp: Method #1 | |
268 | + " rcp: NetRead Method #1 | |
242 | 269 | if b:netrw_method == 1 " read with rcp |
243 | 270 | " call Decho("read via rcp (method #1)") |
244 | 271 | " ER: noting done with g:netrw_uid yet? |
@@ -260,12 +287,12 @@ | ||
260 | 287 | endif |
261 | 288 | endif |
262 | 289 | " call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile) |
263 | - exe "!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
264 | - let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method) | |
290 | + exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
291 | + let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method) | |
265 | 292 | let b:netrw_lastfile = choice |
266 | 293 | |
267 | 294 | "......................................... |
268 | - " ftp + <.netrc>: Method #2 | |
295 | + " ftp + <.netrc>: NetRead Method #2 | |
269 | 296 | elseif b:netrw_method == 2 " read with ftp + <.netrc> |
270 | 297 | " call Decho("read via ftp+.netrc (method #2)") |
271 | 298 | let netrw_fname= b:netrw_fname |
@@ -275,10 +302,10 @@ | ||
275 | 302 | exe "put ='get ".netrw_fname." ".tmpfile."'" |
276 | 303 | if exists("g:netrw_port") && g:netrw_port != "" |
277 | 304 | " call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port) |
278 | - exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port | |
305 | + exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port | |
279 | 306 | else |
280 | 307 | " call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine) |
281 | - exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine | |
308 | + exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine | |
282 | 309 | endif |
283 | 310 | " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar) |
284 | 311 | if getline(1) !~ "^$" |
@@ -289,7 +316,7 @@ | ||
289 | 316 | let b:netrw_lastfile = choice |
290 | 317 | |
291 | 318 | "......................................... |
292 | - " ftp + machine,id,passwd,filename: Method #3 | |
319 | + " ftp + machine,id,passwd,filename: NetRead Method #3 | |
293 | 320 | elseif b:netrw_method == 3 " read with ftp + machine, id, passwd, and fname |
294 | 321 | " Construct execution string (four lines) which will be passed through filter |
295 | 322 | " call Decho("read via ftp+mipf (method #3)") |
@@ -321,7 +348,7 @@ | ||
321 | 348 | " call Decho('performing ftp -i -n') |
322 | 349 | norm 1Gdd |
323 | 350 | " call Decho("executing: %!".g:netrw_ftp_cmd." -i -n") |
324 | - exe "%!".g:netrw_ftp_cmd." -i -n" | |
351 | + exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n" | |
325 | 352 | " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar) |
326 | 353 | if getline(1) !~ "^$" |
327 | 354 | echoerr getline(1) |
@@ -331,7 +358,7 @@ | ||
331 | 358 | let b:netrw_lastfile = choice |
332 | 359 | |
333 | 360 | "......................................... |
334 | - " scp: Method #4 | |
361 | + " scp: NetRead Method #4 | |
335 | 362 | elseif b:netrw_method == 4 " read with scp |
336 | 363 | " call Decho("read via scp (method #4)") |
337 | 364 | if exists("g:netrw_port") && g:netrw_port != "" |
@@ -342,10 +369,10 @@ | ||
342 | 369 | if g:netrw_cygwin == 1 |
343 | 370 | let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') |
344 | 371 | " call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile) |
345 | - exe "!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile | |
372 | + exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile | |
346 | 373 | else |
347 | 374 | " call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile) |
348 | - exe "!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
375 | + exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
349 | 376 | endif |
350 | 377 | let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method) |
351 | 378 | let b:netrw_lastfile = choice |
@@ -361,7 +388,7 @@ | ||
361 | 388 | if match(b:netrw_fname,"#") == -1 |
362 | 389 | " simple wget |
363 | 390 | " call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&')) |
364 | - exe "!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&') | |
391 | + exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&') | |
365 | 392 | let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method) |
366 | 393 | |
367 | 394 | else |
@@ -371,7 +398,7 @@ | ||
371 | 398 | " call Decho("netrw_html<".netrw_html.">") |
372 | 399 | " call Decho("netrw_tag <".netrw_tag.">") |
373 | 400 | " call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html) |
374 | - exe "!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html | |
401 | + exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html | |
375 | 402 | let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method) |
376 | 403 | " call Decho('<\s*a\s*name=\s*"'.netrw_tag.'"/') |
377 | 404 | exe 'norm! 1G/<\s*a\s*name=\s*"'.netrw_tag.'"/'."\<CR>" |
@@ -379,7 +406,7 @@ | ||
379 | 406 | let b:netrw_lastfile = choice |
380 | 407 | |
381 | 408 | "......................................... |
382 | - " cadaver: Method #6 | |
409 | + " cadaver: NetRead Method #6 | |
383 | 410 | elseif b:netrw_method == 6 " read with cadaver |
384 | 411 | " call Decho("read via cadaver (method #6)") |
385 | 412 |
@@ -404,28 +431,28 @@ | ||
404 | 431 | " perform cadaver operation: |
405 | 432 | norm 1Gdd |
406 | 433 | " call Decho("executing: %!".g:netrw_dav_cmd) |
407 | - exe "%!".g:netrw_dav_cmd | |
434 | + exe g:netrw_silentxfer."%!".g:netrw_dav_cmd | |
408 | 435 | bd! |
409 | 436 | let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method) |
410 | 437 | let b:netrw_lastfile = choice |
411 | 438 | |
412 | 439 | "......................................... |
413 | - " rsync: Method #7 | |
440 | + " rsync: NetRead Method #7 | |
414 | 441 | elseif b:netrw_method == 7 " read with rsync |
415 | 442 | " call Decho("read via rsync (method #7)") |
416 | 443 | if g:netrw_cygwin == 1 |
417 | 444 | let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') |
418 | 445 | " call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile) |
419 | - exe "!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile | |
446 | + exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile | |
420 | 447 | else |
421 | 448 | " call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile) |
422 | - exe "!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
449 | + exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
423 | 450 | endif |
424 | 451 | let result = s:NetGetFile(readcmd,tmpfile, b:netrw_method) |
425 | 452 | let b:netrw_lastfile = choice |
426 | 453 | |
427 | 454 | "......................................... |
428 | - " fetch: Method #8 | |
455 | + " fetch: NetRead Method #8 | |
429 | 456 | " fetch://[user@]host[:http]/path |
430 | 457 | elseif b:netrw_method == 8 " read with fetch |
431 | 458 | if g:netrw_fetch_cmd == "" |
@@ -441,17 +468,17 @@ | ||
441 | 468 | |
442 | 469 | if exists("g:netrw_uid") && g:netrw_uid != "" && exists("g:netrw_passwd") && g:netrw_passwd != "" |
443 | 470 | " call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&')) |
444 | - exe "!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&') | |
471 | + exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&') | |
445 | 472 | else |
446 | 473 | " call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&')) |
447 | - exe "!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&') | |
474 | + exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&') | |
448 | 475 | endif |
449 | 476 | |
450 | 477 | let result = s:NetGetFile(readcmd,tmpfile, b:netrw_method) |
451 | 478 | let b:netrw_lastfile = choice |
452 | 479 | |
453 | 480 | "......................................... |
454 | - " sftp: Method #9 | |
481 | + " sftp: NetRead Method #9 | |
455 | 482 | elseif b:netrw_method == 9 " read with sftp |
456 | 483 | " call Decho("read via sftp (method #4)") |
457 | 484 | if g:netrw_cygwin == 1 |
@@ -461,7 +488,7 @@ | ||
461 | 488 | exe "!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile |
462 | 489 | else |
463 | 490 | " call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile) |
464 | - exe "!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
491 | + exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile | |
465 | 492 | endif |
466 | 493 | let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method) |
467 | 494 | let b:netrw_lastfile = choice |
@@ -488,7 +515,7 @@ | ||
488 | 515 | " ------------------------------------------------------------------------ |
489 | 516 | " NetGetFile: Function to read file "fname" with command "readcmd". {{{1 |
490 | 517 | fun! s:NetGetFile(readcmd, fname, method) |
491 | -" call Dfunc("NetGetFile(readcmd<".a:readcmd.">,fname<".a:fname."> method<".a:method.">)") | |
518 | +"" call Dfunc("NetGetFile(readcmd<".a:readcmd.">,fname<".a:fname."> method<".a:method.">)") | |
492 | 519 | |
493 | 520 | if exists("*NetReadFixup") |
494 | 521 | " for the use of NetReadFixup (not otherwise used internally) |
@@ -499,14 +526,14 @@ | ||
499 | 526 | if &term == "win32" |
500 | 527 | if &shell == "bash" |
501 | 528 | let fname=a:fname |
502 | -" call Decho("(win32 && bash) fname<".fname.">") | |
529 | +"" call Decho("(win32 && bash) fname<".fname.">") | |
503 | 530 | else |
504 | 531 | let fname=substitute(a:fname,'/','\\\\','ge') |
505 | -" call Decho("(win32 && !bash) fname<".fname.">") | |
532 | +"" call Decho("(win32 && !bash) fname<".fname.">") | |
506 | 533 | endif |
507 | 534 | else |
508 | 535 | let fname= a:fname |
509 | -" call Decho("(copied) fname<".fname.">") | |
536 | +"" call Decho("(copied) fname<".fname.">") | |
510 | 537 | endif |
511 | 538 | |
512 | 539 | " get the file, but disable undo when reading a new buffer |
@@ -576,21 +603,21 @@ | ||
576 | 603 | else |
577 | 604 | let line2= line("$") - line2 |
578 | 605 | endif |
579 | -" call Decho("calling NetReadFixup(method<".a:method."> line1=".line1." line2=".line2.")") | |
606 | +"" call Decho("calling NetReadFixup(method<".a:method."> line1=".line1." line2=".line2.")") | |
580 | 607 | call NetReadFixup(a:method, line1, line2) |
581 | 608 | endif |
582 | -" call Decho("readcmd<".a:readcmd."> cmdarg<".v:cmdarg."> fname<".a:fname."> readable=".filereadable(a:fname)) | |
609 | +"" call Decho("readcmd<".a:readcmd."> cmdarg<".v:cmdarg."> fname<".a:fname."> readable=".filereadable(a:fname)) | |
583 | 610 | |
584 | 611 | " insure that we have the right filetype and that its being displayed |
585 | 612 | filetype detect |
586 | 613 | redraw! |
587 | -" call Dret("NetGetFile") | |
614 | +"" call Dret("NetGetFile") | |
588 | 615 | endfun |
589 | 616 | |
590 | 617 | " ------------------------------------------------------------------------ |
591 | 618 | " NetWrite: responsible for writing a file over the net {{{1 |
592 | 619 | fun! s:NetWrite(...) range |
593 | -" call Dfunc("NetWrite(a:0=".a:0.")") | |
620 | +"" call Dfunc("NetWrite(a:0=".a:0.")") | |
594 | 621 | |
595 | 622 | " option handling |
596 | 623 | let mod= 0 |
@@ -612,7 +639,7 @@ | ||
612 | 639 | |
613 | 640 | " attempt to repeat with previous host-file-etc |
614 | 641 | if exists("b:netrw_lastfile") && a:0 == 0 |
615 | -" call Decho("using b:netrw_lastfile<" . b:netrw_lastfile . ">") | |
642 | +"" call Decho("using b:netrw_lastfile<" . b:netrw_lastfile . ">") | |
616 | 643 | let choice = b:netrw_lastfile |
617 | 644 | let ichoice= ichoice + 1 |
618 | 645 | else |
@@ -647,7 +674,7 @@ | ||
647 | 674 | let ichoice = ichoice + 1 |
648 | 675 | if choice > a:0 |
649 | 676 | echoerr "Unbalanced string in filename '". wholechoice ."'" |
650 | -" call Dret("NetWrite") | |
677 | +"" call Dret("NetWrite") | |
651 | 678 | return |
652 | 679 | endif |
653 | 680 | let choice= a:{ichoice} |
@@ -656,7 +683,7 @@ | ||
656 | 683 | endif |
657 | 684 | endif |
658 | 685 | endif |
659 | -" call Decho("choice<" . choice . ">") | |
686 | +"" call Decho("choice<" . choice . ">") | |
660 | 687 | let ichoice= ichoice + 1 |
661 | 688 | |
662 | 689 | " fix up windows urls |
@@ -675,9 +702,9 @@ | ||
675 | 702 | " ============= |
676 | 703 | |
677 | 704 | "......................................... |
678 | - " rcp: Method #1 | |
705 | + " rcp: NetWrite Method #1 | |
679 | 706 | if b:netrw_method == 1 " write with rcp |
680 | -" Decho "write via rcp (method #1)" | |
707 | +"" Decho "write via rcp (method #1)" | |
681 | 708 | if s:netrw_has_nt_rcp == 1 |
682 | 709 | if exists("g:netrw_uid") && ( g:netrw_uid != "" ) |
683 | 710 | let uid_machine = g:netrw_machine .'.'. g:netrw_uid |
@@ -691,26 +718,26 @@ | ||
691 | 718 | let uid_machine = g:netrw_machine |
692 | 719 | endif |
693 | 720 | endif |
694 | -" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&')) | |
695 | - exe "!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&') | |
721 | +"" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&')) | |
722 | + exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&') | |
696 | 723 | let b:netrw_lastfile = choice |
697 | 724 | |
698 | 725 | "......................................... |
699 | - " ftp + <.netrc>: Method #2 | |
726 | + " ftp + <.netrc>: NetWrite Method #2 | |
700 | 727 | elseif b:netrw_method == 2 " write with ftp + <.netrc> |
701 | 728 | let netrw_fname = b:netrw_fname |
702 | 729 | new |
703 | 730 | set ff=unix |
704 | 731 | exe "put ='".g:netrw_ftpmode."'" |
705 | -" call Decho(" NetWrite: put ='".g:netrw_ftpmode."'") | |
732 | +"" call Decho(" NetWrite: put ='".g:netrw_ftpmode."'") | |
706 | 733 | exe "put ='put ".tmpfile." ".netrw_fname."'" |
707 | -" call Decho("put ='put ".tmpfile." ".netrw_fname."'") | |
734 | +"" call Decho("put ='put ".tmpfile." ".netrw_fname."'") | |
708 | 735 | if exists("g:netrw_port") && g:netrw_port != "" |
709 | -" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port) | |
710 | - exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port | |
736 | +"" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port) | |
737 | + exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port | |
711 | 738 | else |
712 | -" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine) | |
713 | - exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine | |
739 | +"" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine) | |
740 | + exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine | |
714 | 741 | endif |
715 | 742 | " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar) |
716 | 743 | if getline(1) !~ "^$" |
@@ -721,7 +748,7 @@ | ||
721 | 748 | let b:netrw_lastfile = choice |
722 | 749 | |
723 | 750 | "......................................... |
724 | - " ftp + machine, id, passwd, filename: Method #3 | |
751 | + " ftp + machine, id, passwd, filename: NetWrite Method #3 | |
725 | 752 | elseif b:netrw_method == 3 " write with ftp + machine, id, passwd, and fname |
726 | 753 | let netrw_fname= b:netrw_fname |
727 | 754 | new |
@@ -745,10 +772,10 @@ | ||
745 | 772 | " -i : turns off interactive prompting from ftp |
746 | 773 | " -n unix : DON'T use <.netrc>, even though it exists |
747 | 774 | " -n win32: quit being obnoxious about password |
748 | -" call Decho('performing ftp -i -n') | |
775 | +"" call Decho('performing ftp -i -n') | |
749 | 776 | norm 1Gdd |
750 | -" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n") | |
751 | - exe "%!".g:netrw_ftp_cmd." -i -n" | |
777 | +"" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n") | |
778 | + exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n" | |
752 | 779 | " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar) |
753 | 780 | if getline(1) !~ "^$" |
754 | 781 | echoerr getline(1) |
@@ -757,7 +784,7 @@ | ||
757 | 784 | bd! |
758 | 785 | |
759 | 786 | "......................................... |
760 | - " scp: Method #4 | |
787 | + " scp: NetWrite Method #4 | |
761 | 788 | elseif b:netrw_method == 4 " write with scp |
762 | 789 | if exists("g:netrw_port") && g:netrw_port != "" |
763 | 790 | let useport= " -P ".g:netrw_port |
@@ -766,23 +793,23 @@ | ||
766 | 793 | endif |
767 | 794 | if g:netrw_cygwin == 1 |
768 | 795 | let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') |
769 | -" call Decho("executing: !".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
770 | - exe "!".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
796 | +"" call Decho("executing: !".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
797 | + exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
771 | 798 | else |
772 | -" call Decho("executing: !".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
773 | - exe "!".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
799 | +"" call Decho("executing: !".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
800 | + exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
774 | 801 | endif |
775 | 802 | let b:netrw_lastfile = choice |
776 | 803 | |
777 | 804 | "......................................... |
778 | - " http: Method #5 | |
805 | + " http: NetWrite Method #5 | |
779 | 806 | elseif b:netrw_method == 5 |
780 | 807 | echoerr "***warning*** currently <netrw.vim> does not support writing using http:" |
781 | 808 | |
782 | 809 | "......................................... |
783 | - " dav: Method #6 | |
810 | + " dav: NetWrite Method #6 | |
784 | 811 | elseif b:netrw_method == 6 " write with cadaver |
785 | -" call Decho("write via cadaver (method #6)") | |
812 | +"" call Decho("write via cadaver (method #6)") | |
786 | 813 | |
787 | 814 | " Construct execution string (four lines) which will be passed through filter |
788 | 815 | let netrw_fname= b:netrw_fname |
@@ -804,26 +831,26 @@ | ||
804 | 831 | |
805 | 832 | " perform cadaver operation: |
806 | 833 | norm 1Gdd |
807 | -" call Decho("executing: %!".g:netrw_dav_cmd) | |
808 | - exe "%!".g:netrw_dav_cmd | |
834 | +"" call Decho("executing: %!".g:netrw_dav_cmd) | |
835 | + exe g:netrw_silentxfer."%!".g:netrw_dav_cmd | |
809 | 836 | bd! |
810 | 837 | let b:netrw_lastfile = choice |
811 | 838 | |
812 | 839 | "......................................... |
813 | - " rsync: Method #7 | |
840 | + " rsync: NetWrite Method #7 | |
814 | 841 | elseif b:netrw_method == 7 " write with rsync |
815 | 842 | if g:netrw_cygwin == 1 |
816 | 843 | let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') |
817 | -" call Decho("executing: !".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
818 | - exe "!".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
844 | +"" call Decho("executing: !".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
845 | + exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
819 | 846 | else |
820 | -" call Decho("executing: !".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
821 | - exe "!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
847 | +"" call Decho("executing: !".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')) | |
848 | + exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&') | |
822 | 849 | endif |
823 | 850 | let b:netrw_lastfile = choice |
824 | 851 | |
825 | 852 | "......................................... |
826 | - " scp: Method #9 | |
853 | + " scp: NetWrite Method #9 | |
827 | 854 | elseif b:netrw_method == 9 " write with sftp |
828 | 855 | let netrw_fname= b:netrw_fname |
829 | 856 | if exists("g:netrw_uid") && ( g:netrw_uid != "" ) |
@@ -835,8 +862,8 @@ | ||
835 | 862 | set ff=unix |
836 | 863 | put ='put '.tmpfile.' '.netrw_fname |
837 | 864 | norm 1Gdd |
838 | -" call Decho("executing: %!".g:netrw_sftp_cmd.' '.uid_machine) | |
839 | - exe "%!".g:netrw_sftp_cmd.' '.uid_machine | |
865 | +"" call Decho("executing: %!".g:netrw_sftp_cmd.' '.uid_machine) | |
866 | + exe g:netrw_silentxfer."%!".g:netrw_sftp_cmd.' '.uid_machine | |
840 | 867 | bd! |
841 | 868 | let b:netrw_lastfile= choice |
842 | 869 |
@@ -847,7 +874,7 @@ | ||
847 | 874 | endwhile |
848 | 875 | |
849 | 876 | " cleanup |
850 | -" call Decho("cleanup") | |
877 | +"" call Decho("cleanup") | |
851 | 878 | let result=delete(tmpfile) |
852 | 879 | call s:NetOptionRestore() |
853 | 880 |
@@ -855,11 +882,146 @@ | ||
855 | 882 | let &mod= mod " usually equivalent to set nomod |
856 | 883 | endif |
857 | 884 | |
858 | -" call Dret("NetWrite") | |
885 | +"" call Dret("NetWrite") | |
859 | 886 | endfun |
860 | 887 | " end of NetWrite |
861 | 888 | |
862 | 889 | " ------------------------------------------------------------------------ |
890 | +" NetList: This function uses the command in g:netrw_list_cmd to get a list {{{1 | |
891 | +" of the contents of a remote directory. It is assumed that the | |
892 | +" g:netrw_list_cmd has a string, HOSTNAME, that needs to be substituted | |
893 | +" with the requested remote hostname first. | |
894 | +fun! <SID>NetList(dirname) | |
895 | +"" call Dfunc("NetList(dirname<".a:dirname.">)") | |
896 | + | |
897 | + " sanity maintenance | |
898 | + let dirname= a:dirname | |
899 | + if dirname !~ '/$' && (!exists("g:netrw_machine") || !exists("b:netlist_method") || !exists("b:netlist_path")) | |
900 | + let dirname= dirname."/" | |
901 | + endif | |
902 | + set ma | |
903 | + | |
904 | + if dirname !~ '/$' && dirname !~ '^"' | |
905 | + " looks like a regular file, attempt transfer | |
906 | +"" call Decho("attempt transfer with regular file<".dirname.">") | |
907 | +"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">") | |
908 | + %d | |
909 | + | |
910 | + " remove any filetype indicator from end of dirname, except for the | |
911 | + " "this is a directory" indicator (/) | |
912 | + let dirname= substitute(dirname,"[*=@|]$","","e") | |
913 | +"" call Decho("modified dirname<".dirname.">") | |
914 | + | |
915 | + " remote-read the requested file into current buffer | |
916 | + let machine= g:netrw_machine | |
917 | + let method = b:netlist_method | |
918 | + let path = b:netlist_path | |
919 | + enew! | |
920 | + exe "file ".method."://".machine."/".path.dirname | |
921 | + exe "doau BufReadPre ".dirname | |
922 | + silent call s:NetRead(method."://".machine."/".path.dirname) | |
923 | + exe "doau BufReadPost ".dirname | |
924 | + 1d | |
925 | + set nomod noma | |
926 | + | |
927 | + silent! unlet b:netlist_method | |
928 | + silent! unlet b:netlist_cmd | |
929 | + silent! unlet b:netlist_path | |
930 | +"" call Dret("NetList") | |
931 | + return | |
932 | + | |
933 | + elseif dirname == './' | |
934 | + " refresh the directory list | |
935 | +"" call Decho("refresh directory listing") | |
936 | +"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">") | |
937 | + %d | |
938 | + | |
939 | + elseif dirname == '../' | |
940 | + " go up one directory | |
941 | + | |
942 | + if b:netlist_path !~ '/' && strlen(b:netlist_path) > 0 | |
943 | + " go to top (rltv) directory | |
944 | +"" call Decho("go up one directory : 1 path<".b:netlist_path.">") | |
945 | + let b:netlist_path= "" | |
946 | + | |
947 | + elseif b:netlist_path !~ '^[./]\+$' && strlen(b:netlist_path) > 0 | |
948 | + " remove a directory from the netlist_path | |
949 | +"" call Decho("go up one directory : 2 path<".b:netlist_path.">") | |
950 | + if b:netlist_path =~ '^[^/]*/$' | |
951 | + let b:netlist_path= "" | |
952 | + else | |
953 | + let b:netlist_path= substitute(b:netlist_path,'^\(.*/\)[^/]*/$','\1','') | |
954 | + endif | |
955 | + | |
956 | + else | |
957 | + " append ../ | |
958 | +"" call Decho("go up one directory : 3 path<".b:netlist_path.">") | |
959 | + let b:netlist_path= b:netlist_path.'../' | |
960 | + endif | |
961 | +"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">") | |
962 | + %d | |
963 | + | |
964 | + elseif dirname !~ '^\w\+:' && dirname =~ '/$' | |
965 | + " go down one directory | |
966 | +"" call Decho("go down one directory<".dirname.">") | |
967 | + let b:netlist_path=b:netlist_path.dirname | |
968 | +"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">") | |
969 | + %d | |
970 | + | |
971 | + else | |
972 | + " normal initial directory listing | |
973 | +"" call Decho("normal initial directory listing") | |
974 | + | |
975 | + let listcmd = substitute(g:netrw_list_cmd,'\<HOSTNAME\>',g:netrw_machine,'') | |
976 | + let method = substitute(dirname,'^\(\w\+\):.*$','\1','') | |
977 | + let fname = b:netrw_fname | |
978 | +"" call Decho("set up listcmd<".listcmd.">") | |
979 | +"" call Decho("set up method <".method.">") | |
980 | +"" call Decho("set up fname <".fname.">") | |
981 | + | |
982 | + " set up window | |
983 | + if &mod == 1 | |
984 | + wincmd s | |
985 | + endif | |
986 | + enew! | |
987 | + if v:version >= 602 | |
988 | + setlocal bh=wipe | |
989 | + endif | |
990 | + | |
991 | + " set up buffer-local variables | |
992 | + let b:netlist_method = method | |
993 | + let b:netlist_cmd = listcmd | |
994 | + let b:netlist_path = fname | |
995 | + | |
996 | + " set up buffer-local map | |
997 | + nnoremap <buffer> <cr> :call <SID>NetList(expand("<cWORD>"))<cr> | |
998 | + | |
999 | +"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">") | |
1000 | + endif | |
1001 | + | |
1002 | +"" call Decho("executing: r! ".b:netlist_cmd." '".b:netlist_path."'") | |
1003 | + put ='\" ==============================' | |
1004 | + put ='\" Netrw Remote Directory Listing' | |
1005 | + put ='\" '.g:netrw_machine.':'.b:netlist_path | |
1006 | + put ='\" ==============================' | |
1007 | + exe "silent r! ".b:netlist_cmd." '".b:netlist_path."'" | |
1008 | + 1d | |
1009 | + set ft=netrwlist | |
1010 | + silent 5,$s/^\(.*\)\/$/ \1/e | |
1011 | + silent 5,$call s:NetSort() | |
1012 | + silent 5,$s/^ \(.*\)$/\1\//e | |
1013 | + 5 | |
1014 | + exe 'file ['.g:netrw_machine.':'.b:netlist_path.']' | |
1015 | + if v:version >= 602 | |
1016 | + setlocal nomod bh=wipe bt=nofile nobl noma | |
1017 | + else | |
1018 | + setlocal nomod | |
1019 | + endif | |
1020 | + | |
1021 | +"" call Dret("NetList") | |
1022 | +endfun | |
1023 | + | |
1024 | +" ------------------------------------------------------------------------ | |
863 | 1025 | " NetMethod: determine method of transfer {{{1 |
864 | 1026 | " method == 1: rcp |
865 | 1027 | " 2: ftp + <.netrc> |
@@ -871,7 +1033,7 @@ | ||
871 | 1033 | " 8: fetch |
872 | 1034 | " 9: sftp |
873 | 1035 | fun! s:NetMethod(choice) " globals: method machine id passwd fname |
874 | -" call Dfunc("NetMethod(a:choice<".a:choice.">)") | |
1036 | +"" call Dfunc("NetMethod(a:choice<".a:choice.">)") | |
875 | 1037 | |
876 | 1038 | " initialization |
877 | 1039 | let b:netrw_method = 0 |
@@ -891,23 +1053,23 @@ | ||
891 | 1053 | " rsyncurm : rsync://host[:port]/path Use rsync |
892 | 1054 | " fetchurm : fetch://[user@]host[:http]/filename Use fetch (defaults to ftp, override for http) |
893 | 1055 | " sftpurm : sftp://[user@]host/filename Use scp |
894 | - let mipf = '\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)' | |
895 | - let mf = '\(\S\+\)\s\+\(\S\+\)' | |
896 | - let ftpurm = 'ftp://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\([#:]\d\+\)\=/\(.*\)$' | |
897 | - let rcpurm = 'rcp://\(\([^/@]\{-}\)@\)\=\([^/]\{-}\)/\(.*\)$' | |
898 | - let rcphf = '\(\([^@]\{-}\)@\)\=\(\I\i*\):\(\S\+\)' | |
899 | - let scpurm = 'scp://\([^/]\{-}\)\([#:]\d\+\)\=/\(.*\)$' | |
900 | - let httpurm = 'http://\([^/]\{-}\)\(/.*\)\=$' | |
901 | - let davurm = 'dav://\([^/]\{-}\)/\(.*\)\=$' | |
902 | - let rsyncurm = 'rsync://\([^/]\{-}\)/\(.*\)\=$' | |
903 | - let fetchurm = 'fetch://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\(:http\)\=/\(.*\)$' | |
904 | - let sftpurm = 'sftp://\([^/]\{-}\)/\(.*\)\=$' | |
1056 | + let mipf = '^\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)$' | |
1057 | + let mf = '^\(\S\+\)\s\+\(\S\+\)$' | |
1058 | + let ftpurm = '^ftp://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\([#:]\d\+\)\=/\(.*\)$' | |
1059 | + let rcpurm = '^rcp://\(\([^/@]\{-}\)@\)\=\([^/]\{-}\)/\(.*\)$' | |
1060 | + let rcphf = '^\(\(\h\w*\)@\)\=\(\h\w*\):\([^@]\+\)$' | |
1061 | + let scpurm = '^scp://\([^/]\{-}\)\([#:]\d\+\)\=/\(.*\)$' | |
1062 | + let httpurm = '^http://\([^/]\{-}\)\(/.*\)\=$' | |
1063 | + let davurm = '^dav://\([^/]\{-}\)/\(.*\)\=$' | |
1064 | + let rsyncurm = '^rsync://\([^/]\{-}\)/\(.*\)\=$' | |
1065 | + let fetchurm = '^fetch://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\(:http\)\=/\(.*\)$' | |
1066 | + let sftpurm = '^sftp://\([^/]\{-}\)/\(.*\)\=$' | |
905 | 1067 | |
906 | -" call Decho("determine method:") | |
1068 | +"" call Decho("determine method:") | |
907 | 1069 | " Determine Method |
908 | 1070 | " rcp://user@hostname/...path-to-file |
909 | 1071 | if match(a:choice,rcpurm) == 0 |
910 | -" call Decho("rcp://...") | |
1072 | +"" call Decho("rcp://...") | |
911 | 1073 | let b:netrw_method = 1 |
912 | 1074 | let userid = substitute(a:choice,rcpurm,'\2',"") |
913 | 1075 | let g:netrw_machine= substitute(a:choice,rcpurm,'\3',"") |
@@ -918,7 +1080,7 @@ | ||
918 | 1080 | |
919 | 1081 | " scp://user@hostname/...path-to-file |
920 | 1082 | elseif match(a:choice,scpurm) == 0 |
921 | -" call Decho("scp://...") | |
1083 | +"" call Decho("scp://...") | |
922 | 1084 | let b:netrw_method = 4 |
923 | 1085 | let g:netrw_machine= substitute(a:choice,scpurm,'\1',"") |
924 | 1086 | let b:netrw_port = substitute(a:choice,scpurm,'\2',"") |
@@ -926,28 +1088,28 @@ | ||
926 | 1088 | |
927 | 1089 | " http://user@hostname/...path-to-file |
928 | 1090 | elseif match(a:choice,httpurm) == 0 |
929 | -" call Decho("http://...") | |
1091 | +"" call Decho("http://...") | |
930 | 1092 | let b:netrw_method = 5 |
931 | 1093 | let g:netrw_machine= substitute(a:choice,httpurm,'\1',"") |
932 | 1094 | let b:netrw_fname = substitute(a:choice,httpurm,'\2',"") |
933 | 1095 | |
934 | 1096 | " dav://hostname[:port]/..path-to-file.. |
935 | 1097 | elseif match(a:choice,davurm) == 0 |
936 | -" call Decho("dav://...") | |
1098 | +"" call Decho("dav://...") | |
937 | 1099 | let b:netrw_method= 6 |
938 | 1100 | let g:netrw_machine= substitute(a:choice,davurm,'\1',"") |
939 | 1101 | let b:netrw_fname = substitute(a:choice,davurm,'\2',"") |
940 | 1102 | |
941 | 1103 | " rsync://user@hostname/...path-to-file |
942 | 1104 | elseif match(a:choice,rsyncurm) == 0 |
943 | -" call Decho("rsync://...") | |
1105 | +"" call Decho("rsync://...") | |
944 | 1106 | let b:netrw_method = 7 |
945 | 1107 | let g:netrw_machine= substitute(a:choice,rsyncurm,'\1',"") |
946 | 1108 | let b:netrw_fname = substitute(a:choice,rsyncurm,'\2',"") |
947 | 1109 | |
948 | 1110 | " ftp://[user@]hostname[[:#]port]/...path-to-file |
949 | 1111 | elseif match(a:choice,ftpurm) == 0 |
950 | -" call Decho("ftp://...") | |
1112 | +"" call Decho("ftp://...") | |
951 | 1113 | let userid = substitute(a:choice,ftpurm,'\2',"") |
952 | 1114 | let g:netrw_machine= substitute(a:choice,ftpurm,'\3',"") |
953 | 1115 | let g:netrw_port = substitute(a:choice,ftpurm,'\4',"") |
@@ -975,7 +1137,7 @@ | ||
975 | 1137 | endif |
976 | 1138 | |
977 | 1139 | elseif match(a:choice,fetchurm) == 0 |
978 | -" call Decho("fetch://...") | |
1140 | +"" call Decho("fetch://...") | |
979 | 1141 | let b:netrw_method = 8 |
980 | 1142 | let g:netrw_userid = substitute(a:choice,fetchurm,'\2',"") |
981 | 1143 | let g:netrw_machine= substitute(a:choice,fetchurm,'\3',"") |
@@ -984,7 +1146,7 @@ | ||
984 | 1146 | |
985 | 1147 | " Issue an ftp : "machine id password [path/]filename" |
986 | 1148 | elseif match(a:choice,mipf) == 0 |
987 | -" call Decho("(ftp) host id pass file") | |
1149 | +"" call Decho("(ftp) host id pass file") | |
988 | 1150 | let b:netrw_method = 3 |
989 | 1151 | let g:netrw_machine = substitute(a:choice,mipf,'\1',"") |
990 | 1152 | let g:netrw_uid = substitute(a:choice,mipf,'\2',"") |
@@ -993,7 +1155,7 @@ | ||
993 | 1155 | |
994 | 1156 | " Issue an ftp: "hostname [path/]filename" |
995 | 1157 | elseif match(a:choice,mf) == 0 |
996 | -" call Decho("(ftp) host file") | |
1158 | +"" call Decho("(ftp) host file") | |
997 | 1159 | if exists("g:netrw_uid") && exists("g:netrw_passwd") |
998 | 1160 | let b:netrw_method = 3 |
999 | 1161 | let g:netrw_machine = substitute(a:choice,mf,'\1',"") |
@@ -1007,18 +1169,22 @@ | ||
1007 | 1169 | |
1008 | 1170 | " sftp://user@hostname/...path-to-file |
1009 | 1171 | elseif match(a:choice,sftpurm) == 0 |
1010 | -" call Decho("sftp://...") | |
1172 | +"" call Decho("sftp://...") | |
1011 | 1173 | let b:netrw_method = 9 |
1012 | 1174 | let g:netrw_machine= substitute(a:choice,sftpurm,'\1',"") |
1013 | 1175 | let b:netrw_fname = substitute(a:choice,sftpurm,'\2',"") |
1014 | 1176 | |
1015 | 1177 | " Issue an rcp: hostname:filename" (this one should be last) |
1016 | 1178 | elseif match(a:choice,rcphf) == 0 |
1017 | -" call Decho("(rcp) host:file)") | |
1179 | +"" call Decho("(rcp) [user@]host:file) rcphf<".rcphf.">") | |
1018 | 1180 | let b:netrw_method = 1 |
1019 | 1181 | let userid = substitute(a:choice,rcphf,'\2',"") |
1020 | 1182 | let g:netrw_machine= substitute(a:choice,rcphf,'\3',"") |
1021 | 1183 | let b:netrw_fname = substitute(a:choice,rcphf,'\4',"") |
1184 | +"" call Decho('\1<'.substitute(a:choice,rcphf,'\1',"").">") | |
1185 | +"" call Decho('\2<'.substitute(a:choice,rcphf,'\2',"").">") | |
1186 | +"" call Decho('\3<'.substitute(a:choice,rcphf,'\3',"").">") | |
1187 | +"" call Decho('\4<'.substitute(a:choice,rcphf,'\4',"").">") | |
1022 | 1188 | if userid != "" |
1023 | 1189 | let g:netrw_uid= userid |
1024 | 1190 | endif |
@@ -1032,18 +1198,18 @@ | ||
1032 | 1198 | let b:netrw_method = -1 |
1033 | 1199 | endif |
1034 | 1200 | |
1035 | -" call Decho("a:choice <".a:choice.">") | |
1036 | -" call Decho("b:netrw_method <".b:netrw_method.">") | |
1037 | -" call Decho("g:netrw_machine<".g:netrw_machine.">") | |
1038 | -" call Decho("g:netrw_port <".g:netrw_port.">") | |
1039 | -" if exists("g:netrw_uid") "Decho | |
1040 | -" call Decho("g:netrw_uid <".g:netrw_uid.">") | |
1041 | -" endif "Decho | |
1042 | -" if exists("g:netrw_passwd") "Decho | |
1043 | -" call Decho("g:netrw_passwd <".g:netrw_passwd.">") | |
1044 | -" endif "Decho | |
1045 | -" call Decho("b:netrw_fname <".b:netrw_fname.">") | |
1046 | -" call Dret("NetMethod") | |
1201 | +"" call Decho("a:choice <".a:choice.">") | |
1202 | +"" call Decho("b:netrw_method <".b:netrw_method.">") | |
1203 | +"" call Decho("g:netrw_machine<".g:netrw_machine.">") | |
1204 | +"" call Decho("g:netrw_port <".g:netrw_port.">") | |
1205 | +"" if exists("g:netrw_uid") "Decho | |
1206 | +"" call Decho("g:netrw_uid <".g:netrw_uid.">") | |
1207 | +"" endif "Decho | |
1208 | +"" if exists("g:netrw_passwd") "Decho | |
1209 | +"" call Decho("g:netrw_passwd <".g:netrw_passwd.">") | |
1210 | +"" endif "Decho | |
1211 | +"" call Decho("b:netrw_fname <".b:netrw_fname.">") | |
1212 | +"" call Dret("NetMethod") | |
1047 | 1213 | endfun |
1048 | 1214 | " end of NetMethod |
1049 | 1215 |
@@ -1056,32 +1222,32 @@ | ||
1056 | 1222 | |
1057 | 1223 | " get/set userid |
1058 | 1224 | if a:0 == 0 |
1059 | -" call Dfunc("NetUserPass(a:0<".a:0.">)") | |
1225 | +"" call Dfunc("NetUserPass(a:0<".a:0.">)") | |
1060 | 1226 | if !exists("g:netrw_uid") || g:netrw_uid == "" |
1061 | 1227 | " via prompt |
1062 | 1228 | let g:netrw_uid= input('Enter username: ') |
1063 | 1229 | endif |
1064 | 1230 | else " from command line |
1065 | -" call Dfunc("NetUserPass(a:1<".a:1.">) {") | |
1231 | +"" call Dfunc("NetUserPass(a:1<".a:1.">) {") | |
1066 | 1232 | let g:netrw_uid= a:1 |
1067 | 1233 | endif |
1068 | 1234 | |
1069 | 1235 | " get password |
1070 | 1236 | if a:0 <= 1 " via prompt |
1071 | -" call Decho("a:0=".a:0." case <=1:") | |
1237 | +"" call Decho("a:0=".a:0." case <=1:") | |
1072 | 1238 | let g:netrw_passwd= inputsecret("Enter Password: ") |
1073 | 1239 | else " from command line |
1074 | -" call Decho("a:0=".a:0." case >1: a:2<".a:2.">") | |
1240 | +"" call Decho("a:0=".a:0." case >1: a:2<".a:2.">") | |
1075 | 1241 | let g:netrw_passwd=a:2 |
1076 | 1242 | endif |
1077 | -" call Dret("NetUserPass") | |
1243 | +"" call Dret("NetUserPass") | |
1078 | 1244 | endfun |
1079 | 1245 | " end NetUserPass |
1080 | 1246 | |
1081 | 1247 | " ------------------------------------------------------------------------ |
1082 | 1248 | " NetOptionSave: save options and set to "standard" form {{{1 |
1083 | 1249 | fun!s:NetOptionSave() |
1084 | -" call Dfunc("NetOptionSave()") | |
1250 | +"" call Dfunc("NetOptionSave()") | |
1085 | 1251 | |
1086 | 1252 | " Get Temporary Filename |
1087 | 1253 | let s:aikeep = &ai |
@@ -1100,16 +1266,16 @@ | ||
1100 | 1266 | if has("win32") && !has("win95") |
1101 | 1267 | let s:swfkeep= &swf |
1102 | 1268 | set noswf |
1103 | -" call Decho("setting s:swfkeep to <".&swf.">") | |
1269 | +"" call Decho("setting s:swfkeep to <".&swf.">") | |
1104 | 1270 | endif |
1105 | 1271 | |
1106 | -" call Dret("NetOptionSave") | |
1272 | +"" call Dret("NetOptionSave") | |
1107 | 1273 | endfun |
1108 | 1274 | |
1109 | 1275 | " ------------------------------------------------------------------------ |
1110 | 1276 | " NetOptionRestore: restore options {{{1 |
1111 | 1277 | fun! s:NetOptionRestore() |
1112 | -" call Dfunc("NetOptionRestore()") | |
1278 | +"" call Dfunc("NetOptionRestore()") | |
1113 | 1279 | |
1114 | 1280 | let &ai = s:aikeep |
1115 | 1281 | let &cin = s:cinkeep |
@@ -1132,27 +1298,55 @@ | ||
1132 | 1298 | unlet s:twkeep |
1133 | 1299 | unlet s:dirkeep |
1134 | 1300 | |
1135 | -" call Dret("NetOptionRestore") | |
1301 | +"" call Dret("NetOptionRestore") | |
1136 | 1302 | endfun |
1137 | 1303 | |
1138 | 1304 | " ------------------------------------------------------------------------ |
1139 | 1305 | " NetReadFixup: this sort of function is typically written by the user {{{1 |
1140 | -" to handle extra junk that their system's ftp dumps | |
1141 | -" into the transfer. This function is provided as an | |
1142 | -" example and as a fix for a Windows 95 problem: in my | |
1143 | -" experience, win95's ftp always dumped four blank lines | |
1144 | -" at the end of the transfer. | |
1306 | +" to handle extra junk that their system's ftp dumps | |
1307 | +" into the transfer. This function is provided as an | |
1308 | +" example and as a fix for a Windows 95 problem: in my | |
1309 | +" experience, win95's ftp always dumped four blank lines | |
1310 | +" at the end of the transfer. | |
1145 | 1311 | if has("win95") && g:netrw_win95ftp |
1146 | 1312 | fun! NetReadFixup(method, line1, line2) |
1147 | -" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")") | |
1313 | +"" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")") | |
1148 | 1314 | if method == 3 " ftp (no <.netrc>) |
1149 | 1315 | let fourblanklines= line2 - 3 |
1150 | 1316 | silent fourblanklines.",".line2."g/^\s*/d" |
1151 | 1317 | endif |
1152 | -" call Dret("NetReadFixup") | |
1318 | +"" call Dret("NetReadFixup") | |
1153 | 1319 | endfun |
1154 | 1320 | endif |
1155 | 1321 | |
1322 | +" --------------------------------------------------------------------- | |
1323 | +" NetSort: Piet Delport's BISort2() function, modified to take a range | |
1324 | +fun! <SID>NetSort() range | |
1325 | + let i = a:firstline + 1 | |
1326 | + while i <= a:lastline | |
1327 | + " find insertion point via binary search | |
1328 | + let i_val = getline(i) | |
1329 | + let lo = a:firstline | |
1330 | + let hi = i | |
1331 | + while lo < hi | |
1332 | + let mid = (lo + hi) / 2 | |
1333 | + let mid_val = getline(mid) | |
1334 | + if i_val < mid_val | |
1335 | + let hi = mid | |
1336 | + else | |
1337 | + let lo = mid + 1 | |
1338 | + if i_val == mid_val | break | endif | |
1339 | + endif | |
1340 | + endwhile | |
1341 | + " do insert | |
1342 | + if lo < i | |
1343 | + exec i.'d_' | |
1344 | + call append(lo - 1, i_val) | |
1345 | + endif | |
1346 | + let i = i + 1 | |
1347 | + endwhile | |
1348 | +endfun | |
1349 | + | |
1156 | 1350 | " ------------------------------------------------------------------------ |
1157 | 1351 | " Restore {{{1 |
1158 | 1352 | let &cpo= s:save_cpo |
@@ -0,0 +1,29 @@ | ||
1 | +" Language : Netrw Remote-Directory Listing Syntax | |
2 | +" Maintainer : Charles E. Campbell, Jr. | |
3 | +" Last change: Jun 10, 2004 | |
4 | +" Version : 1 | |
5 | + | |
6 | +" Syntax Clearing: {{{1 | |
7 | +if version < 600 | |
8 | + syntax clear | |
9 | +elseif exists("b:current_syntax") | |
10 | + finish | |
11 | +endif | |
12 | + | |
13 | +" Directory List Syntax Highlighting: {{{1 | |
14 | +syn match netrwDir "^.*/$" contains=netrwSpecial | |
15 | +syn match netrwSpecial "[*=@|/]$" | |
16 | +syn match netrwSlash contained "/" | |
17 | +syn match netrwComment '".*$' | |
18 | + | |
19 | +" Highlighting Links: {{{1 | |
20 | +if !exists("did_drchip_dbg_syntax") | |
21 | + let did_drchip_netrwlist_syntax= 1 | |
22 | + hi link netrwComment Comment | |
23 | + hi link netrwDir Directory | |
24 | + hi link netrwSpecial Function | |
25 | +endif | |
26 | + | |
27 | +" Current Syntax: {{{1 | |
28 | +let b:current_syntax = "netrwlist" | |
29 | +" vim: ts=8 fdm=marker |
@@ -19,6 +19,8 @@ | ||
19 | 19 | syn match poFormat "%%" contained |
20 | 20 | syn region poString start=+"+ skip=+\\\\\|\\"+ end=+"+ |
21 | 21 | \ contains=poSpecial,poFormat |
22 | +syn region poFuzzy start=+^#,\sfuzzy+ end=+^$+ | |
23 | +syn match poUntranslated +^msgstr\s""\n\n+ | |
22 | 24 | |
23 | 25 | " Define the default highlighting. |
24 | 26 | " For version 5.7 and earlier: only when not done already |
@@ -37,6 +39,8 @@ | ||
37 | 39 | HiLink poSpecial Special |
38 | 40 | HiLink poFormat poSpecial |
39 | 41 | HiLink poString String |
42 | + HiLink poFuzzy Todo | |
43 | + HiLink poUntranslated Todo | |
40 | 44 | |
41 | 45 | delcommand HiLink |
42 | 46 | endif |
@@ -432,7 +432,7 @@ | ||
432 | 432 | #CONF_OPT_FEAT = --with-features=small |
433 | 433 | #CONF_OPT_FEAT = --with-features=normal |
434 | 434 | #CONF_OPT_FEAT = --with-features=big |
435 | -CONF_OPT_FEAT = --with-features=huge | |
435 | +#CONF_OPT_FEAT = --with-features=huge | |
436 | 436 | |
437 | 437 | # COMPILED BY - For including a specific e-mail address for ":version". |
438 | 438 | #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" |
@@ -493,7 +493,7 @@ | ||
493 | 493 | |
494 | 494 | # Often used for GCC: mixed optimizing, lot of optimizing, debugging |
495 | 495 | #CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes |
496 | -CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes | |
496 | +#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes | |
497 | 497 | #CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes |
498 | 498 | #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes |
499 | 499 | #CFLAGS = -g -O2 -DSTARTUPTIME=\"vimstartup\" -fno-strength-reduce -Wall -Wmissing-prototypes |
@@ -4579,7 +4579,7 @@ | ||
4579 | 4579 | } |
4580 | 4580 | #endif |
4581 | 4581 | if (buf->b_fname == NULL) |
4582 | - return _("[No File]"); | |
4582 | + return _("[No Name]"); | |
4583 | 4583 | return NULL; |
4584 | 4584 | } |
4585 | 4585 |
@@ -599,6 +599,20 @@ | ||
599 | 599 | } |
600 | 600 | |
601 | 601 | /* |
602 | + * Skip over an expression at "*pp". | |
603 | + * Return FAIL for an error, OK otherwise. | |
604 | + */ | |
605 | + int | |
606 | +skip_expr(pp) | |
607 | + char_u **pp; | |
608 | +{ | |
609 | + var retvar; | |
610 | + | |
611 | + *pp = skipwhite(*pp); | |
612 | + return eval1(pp, &retvar, FALSE); | |
613 | +} | |
614 | + | |
615 | +/* | |
602 | 616 | * Top level evaluation function, returning a string. |
603 | 617 | * Return pointer to allocated memory, or NULL for failure. |
604 | 618 | */ |
@@ -3375,6 +3389,20 @@ | ||
3375 | 3389 | buf = buflist_findname(name); |
3376 | 3390 | vim_free(name); |
3377 | 3391 | } |
3392 | + if (buf == NULL) | |
3393 | + { | |
3394 | + /* No full path name match, try a match with a URL or a "nofile" | |
3395 | + * buffer, these don't use the full path. */ | |
3396 | + for (buf = firstbuf; buf != NULL; buf = buf->b_next) | |
3397 | + if (buf->b_fname != NULL | |
3398 | + && (path_with_url(buf->b_fname) | |
3399 | +#ifdef FEAT_QUICKFIX | |
3400 | + || bt_nofile(buf) | |
3401 | +#endif | |
3402 | + ) | |
3403 | + && STRCMP(buf->b_fname, avar->var_val.var_string) == 0) | |
3404 | + break; | |
3405 | + } | |
3378 | 3406 | } |
3379 | 3407 | return buf; |
3380 | 3408 | } |
@@ -4573,7 +4573,7 @@ | ||
4573 | 4573 | buf_T *buf; |
4574 | 4574 | #ifdef FEAT_MULTI_LANG |
4575 | 4575 | int len; |
4576 | - char_u *lang = NULL; | |
4576 | + char_u *lang; | |
4577 | 4577 | #endif |
4578 | 4578 | |
4579 | 4579 | if (eap != NULL) |
@@ -4613,13 +4613,7 @@ | ||
4613 | 4613 | |
4614 | 4614 | #ifdef FEAT_MULTI_LANG |
4615 | 4615 | /* Check for a specified language */ |
4616 | - len = STRLEN(arg); | |
4617 | - if (len >= 3 && arg[len - 3] == '@' && ASCII_ISALPHA(arg[len - 2]) | |
4618 | - && ASCII_ISALPHA(arg[len - 1])) | |
4619 | - { | |
4620 | - lang = arg + len - 2; | |
4621 | - lang[-1] = NUL; /* remove the '@' */ | |
4622 | - } | |
4616 | + lang = check_help_lang(arg); | |
4623 | 4617 | #endif |
4624 | 4618 | |
4625 | 4619 | /* When no argument given go to the index. */ |
@@ -4748,6 +4742,28 @@ | ||
4748 | 4742 | } |
4749 | 4743 | |
4750 | 4744 | |
4745 | +#if defined(FEAT_MULTI_LANG) || defined(PROTO) | |
4746 | +/* | |
4747 | + * In an argument search for a language specifiers in the form "@xx". | |
4748 | + * Changes the "@" to NUL if found, and returns a pointer to "xx". | |
4749 | + * Returns NULL if not found. | |
4750 | + */ | |
4751 | + char_u * | |
4752 | +check_help_lang(arg) | |
4753 | + char_u *arg; | |
4754 | +{ | |
4755 | + int len = STRLEN(arg); | |
4756 | + | |
4757 | + if (len >= 3 && arg[len - 3] == '@' && ASCII_ISALPHA(arg[len - 2]) | |
4758 | + && ASCII_ISALPHA(arg[len - 1])) | |
4759 | + { | |
4760 | + arg[len - 3] = NUL; /* remove the '@' */ | |
4761 | + return arg + len - 2; | |
4762 | + } | |
4763 | + return NULL; | |
4764 | +} | |
4765 | +#endif | |
4766 | + | |
4751 | 4767 | /* |
4752 | 4768 | * Return a heuristic indicating how well the given string matches. The |
4753 | 4769 | * smaller the number, the better the match. This is the order of priorities, |
@@ -5180,7 +5196,9 @@ | ||
5180 | 5196 | garray_T ga; |
5181 | 5197 | int i, j; |
5182 | 5198 | int len; |
5199 | +#ifdef FEAT_MULTI_LANG | |
5183 | 5200 | char_u lang[2]; |
5201 | +#endif | |
5184 | 5202 | char_u ext[5]; |
5185 | 5203 | char_u fname[8]; |
5186 | 5204 | int filecount; |
@@ -2319,8 +2319,8 @@ | ||
2319 | 2319 | } |
2320 | 2320 | } |
2321 | 2321 | /* no arguments allowed */ |
2322 | - if (!ni && !(ea.argt & EXTRA) && *ea.arg != NUL && | |
2323 | - vim_strchr((char_u *)"|\"", *ea.arg) == NULL) | |
2322 | + if (!ni && !(ea.argt & EXTRA) && *ea.arg != NUL | |
2323 | + && vim_strchr((char_u *)"|\"", *ea.arg) == NULL) | |
2324 | 2324 | { |
2325 | 2325 | errormsg = (char_u *)_(e_trailing); |
2326 | 2326 | goto doend; |
@@ -3885,6 +3885,17 @@ | ||
3885 | 3885 | has_wildcards = mch_has_wildcard(eap->arg); |
3886 | 3886 | for (p = eap->arg; *p; ) |
3887 | 3887 | { |
3888 | +#ifdef FEAT_EVAL | |
3889 | + /* Skip over `=expr`, wildcards in it are not expanded. */ | |
3890 | + if (p[0] == '`' && p[1] == '=') | |
3891 | + { | |
3892 | + p += 2; | |
3893 | + (void)skip_expr(&p); | |
3894 | + if (*p == '`') | |
3895 | + ++p; | |
3896 | + continue; | |
3897 | + } | |
3898 | +#endif | |
3888 | 3899 | /* |
3889 | 3900 | * Quick check if this cannot be the start of a special string. |
3890 | 3901 | * Also removes backslash before '%', '#' and '<'. |
@@ -4157,6 +4168,18 @@ | ||
4157 | 4168 | if (*p == NUL) /* stop at NUL after CTRL-V */ |
4158 | 4169 | break; |
4159 | 4170 | } |
4171 | + | |
4172 | +#ifdef FEAT_EVAL | |
4173 | + /* Skip over `=expr` when wildcards are expanded. */ | |
4174 | + else if (p[0] == '`' && p[1] == '=') | |
4175 | + { | |
4176 | + p += 2; | |
4177 | + (void)skip_expr(&p); | |
4178 | + if (*p == '`') | |
4179 | + ++p; | |
4180 | + } | |
4181 | +#endif | |
4182 | + | |
4160 | 4183 | /* Check for '"': start of comment or '|': next command */ |
4161 | 4184 | /* :@" and :*" do not start a comment! |
4162 | 4185 | * :redir @" doesn't either. */ |
@@ -5290,8 +5290,11 @@ | ||
5290 | 5290 | } |
5291 | 5291 | if (p == NULL || buf->b_fname == NULL) |
5292 | 5292 | buf->b_fname = buf->b_ffname; |
5293 | - mf_fullname(buf->b_ml.ml_mfp); | |
5294 | - } | |
5293 | + } | |
5294 | + | |
5295 | + /* Always make the swap file name a full path, a "nofile" buffer may | |
5296 | + * also have a swap file. */ | |
5297 | + mf_fullname(buf->b_ml.ml_mfp); | |
5295 | 5298 | } |
5296 | 5299 | #ifdef FEAT_WINDOWS |
5297 | 5300 | status_redraw_all(); |
@@ -74,6 +74,9 @@ | ||
74 | 74 | # endif |
75 | 75 | #endif |
76 | 76 | |
77 | +/* Vim's Scrap flavor. */ | |
78 | +#define VIMSCRAPFLAVOR 'VIM!' | |
79 | + | |
77 | 80 | /* CARBON version only tested with Project Builder under MacOS X */ |
78 | 81 | #undef USE_CARBONIZED |
79 | 82 | #if (defined(__APPLE_CC__) || defined(__MRC__)) && defined(TARGET_API_MAC_CARBON) |
@@ -326,7 +329,7 @@ | ||
326 | 329 | */ |
327 | 330 | |
328 | 331 | #ifdef USE_AEVENT |
329 | -OSErr HandleUnusedParms (const AppleEvent *theAEvent); | |
332 | +OSErr HandleUnusedParms(const AppleEvent *theAEvent); | |
330 | 333 | #endif |
331 | 334 | |
332 | 335 | /* |
@@ -511,7 +514,7 @@ | ||
511 | 514 | if (*error) |
512 | 515 | { |
513 | 516 | #ifdef USE_SIOUX |
514 | - printf ("fname_from_AEDesc: AECountItems error: %d\n", error); | |
517 | + printf("fname_from_AEDesc: AECountItems error: %d\n", error); | |
515 | 518 | #endif |
516 | 519 | return(fnames); |
517 | 520 | } |
@@ -535,13 +538,13 @@ | ||
535 | 538 | /* Caller is able to clean up */ |
536 | 539 | /* TODO: Should be clean up or not? For safety. */ |
537 | 540 | #ifdef USE_SIOUX |
538 | - printf ("aevt_odoc: AEGetNthPtr error: %d\n", newError); | |
541 | + printf("aevt_odoc: AEGetNthPtr error: %d\n", newError); | |
539 | 542 | #endif |
540 | 543 | return(fnames); |
541 | 544 | } |
542 | 545 | |
543 | 546 | /* Convert the FSSpec to a pathname */ |
544 | - fnames[fileCount - 1] = FullPathFromFSSpec_save (fileToOpen); | |
547 | + fnames[fileCount - 1] = FullPathFromFSSpec_save(fileToOpen); | |
545 | 548 | } |
546 | 549 | |
547 | 550 | return (fnames); |
@@ -574,7 +577,7 @@ | ||
574 | 577 | * When the editor receives this event, determine whether the specified |
575 | 578 | * file is open. If it is, return the modification date/time for that file |
576 | 579 | * in the appropriate location specified in the structure. If the file is |
577 | - * not opened, put the value fnfErr (file not found) in that location. | |
580 | + * not opened, put the value fnfErr(file not found) in that location. | |
578 | 581 | * |
579 | 582 | */ |
580 | 583 |
@@ -591,7 +594,8 @@ | ||
591 | 594 | # pragma options align=reset |
592 | 595 | #endif |
593 | 596 | |
594 | -pascal OSErr Handle_KAHL_SRCH_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
597 | + pascal OSErr | |
598 | +Handle_KAHL_SRCH_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
595 | 599 | { |
596 | 600 | OSErr error = noErr; |
597 | 601 | buf_T *buf; |
@@ -604,16 +608,16 @@ | ||
604 | 608 | if (error) |
605 | 609 | { |
606 | 610 | #ifdef USE_SIOUX |
607 | - printf ("KAHL_SRCH: AEGetParamPtr error: %d\n", error); | |
611 | + printf("KAHL_SRCH: AEGetParamPtr error: %d\n", error); | |
608 | 612 | #endif |
609 | 613 | return(error); |
610 | 614 | } |
611 | 615 | |
612 | - error = HandleUnusedParms (theAEvent); | |
616 | + error = HandleUnusedParms(theAEvent); | |
613 | 617 | if (error) |
614 | 618 | { |
615 | 619 | #ifdef USE_SIOUX |
616 | - printf ("KAHL_SRCH: HandleUnusedParms error: %d\n", error); | |
620 | + printf("KAHL_SRCH: HandleUnusedParms error: %d\n", error); | |
617 | 621 | #endif |
618 | 622 | return(error); |
619 | 623 | } |
@@ -634,10 +638,10 @@ | ||
634 | 638 | *SearchData.theDate = buf->b_mtime; |
635 | 639 | |
636 | 640 | #ifdef USE_SIOUX |
637 | - printf ("KAHL_SRCH: file \"%#s\" {%d}", SearchData.theFile.name,SearchData.theFile.parID); | |
641 | + printf("KAHL_SRCH: file \"%#s\" {%d}", SearchData.theFile.name,SearchData.theFile.parID); | |
638 | 642 | if (foundFile == false) |
639 | - printf (" NOT"); | |
640 | - printf (" found. [date %lx, %lx]\n", *SearchData.theDate, buf->b_mtime_read); | |
643 | + printf(" NOT"); | |
644 | + printf(" found. [date %lx, %lx]\n", *SearchData.theDate, buf->b_mtime_read); | |
641 | 645 | #endif |
642 | 646 | |
643 | 647 | return error; |
@@ -684,7 +688,8 @@ | ||
684 | 688 | # pragma options align=reset |
685 | 689 | #endif |
686 | 690 | |
687 | -pascal OSErr Handle_KAHL_MOD_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
691 | + pascal OSErr | |
692 | +Handle_KAHL_MOD_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
688 | 693 | { |
689 | 694 | OSErr error = noErr; |
690 | 695 | AEDescList replyList; |
@@ -694,11 +699,11 @@ | ||
694 | 699 | |
695 | 700 | theFile.saved = 0; |
696 | 701 | |
697 | - error = HandleUnusedParms (theAEvent); | |
702 | + error = HandleUnusedParms(theAEvent); | |
698 | 703 | if (error) |
699 | 704 | { |
700 | 705 | #ifdef USE_SIOUX |
701 | - printf ("KAHL_MOD: HandleUnusedParms error: %d\n", error); | |
706 | + printf("KAHL_MOD: HandleUnusedParms error: %d\n", error); | |
702 | 707 | #endif |
703 | 708 | return(error); |
704 | 709 | } |
@@ -712,7 +717,7 @@ | ||
712 | 717 | if (error) |
713 | 718 | { |
714 | 719 | #ifdef USE_SIOUX |
715 | - printf ("KAHL_MOD: AECreateList error: %d\n", error); | |
720 | + printf("KAHL_MOD: AECreateList error: %d\n", error); | |
716 | 721 | #endif |
717 | 722 | return(error); |
718 | 723 | } |
@@ -720,12 +725,12 @@ | ||
720 | 725 | #if 0 |
721 | 726 | error = AECountItems(&replyList, &numFiles); |
722 | 727 | #ifdef USE_SIOUX |
723 | - printf ("KAHL_MOD ReplyList: %x %x\n", replyList.descriptorType, replyList.dataHandle); | |
724 | - printf ("KAHL_MOD ItemInList: %d\n", numFiles); | |
725 | -#endif | |
726 | - | |
727 | - /* AEPutKeyDesc (&replyList, keyAEPnject, &aDesc) | |
728 | - * AEPutKeyPtr (&replyList, keyAEPosition, typeChar, (Ptr)&theType, | |
728 | + printf("KAHL_MOD ReplyList: %x %x\n", replyList.descriptorType, replyList.dataHandle); | |
729 | + printf("KAHL_MOD ItemInList: %d\n", numFiles); | |
730 | +#endif | |
731 | + | |
732 | + /* AEPutKeyDesc(&replyList, keyAEPnject, &aDesc) | |
733 | + * AEPutKeyPtr(&replyList, keyAEPosition, typeChar, (Ptr)&theType, | |
729 | 734 | * sizeof(DescType)) |
730 | 735 | */ |
731 | 736 |
@@ -739,37 +744,37 @@ | ||
739 | 744 | /* Add this file to the list */ |
740 | 745 | theFile.theFile = buf->b_FSSpec; |
741 | 746 | theFile.theDate = buf->b_mtime; |
742 | -/* theFile.theDate = time (NULL) & (time_t) 0xFFFFFFF0; */ | |
743 | - error = AEPutPtr (&replyList, numFiles, typeChar, (Ptr) &theFile, sizeof(theFile)); | |
747 | +/* theFile.theDate = time(NULL) & (time_t) 0xFFFFFFF0; */ | |
748 | + error = AEPutPtr(&replyList, numFiles, typeChar, (Ptr) &theFile, sizeof(theFile)); | |
744 | 749 | #ifdef USE_SIOUX |
745 | 750 | if (numFiles == 0) |
746 | - printf ("KAHL_MOD: "); | |
751 | + printf("KAHL_MOD: "); | |
747 | 752 | else |
748 | - printf (", "); | |
749 | - printf ("\"%#s\" {%d} [date %lx, %lx]", theFile.theFile.name, theFile.theFile.parID, theFile.theDate, buf->b_mtime_read); | |
753 | + printf(", "); | |
754 | + printf("\"%#s\" {%d} [date %lx, %lx]", theFile.theFile.name, theFile.theFile.parID, theFile.theDate, buf->b_mtime_read); | |
750 | 755 | if (error) |
751 | - printf (" (%d)", error); | |
756 | + printf(" (%d)", error); | |
752 | 757 | numFiles++; |
753 | 758 | #endif |
754 | 759 | }; |
755 | 760 | |
756 | 761 | #ifdef USE_SIOUX |
757 | - printf ("\n"); | |
762 | + printf("\n"); | |
758 | 763 | #endif |
759 | 764 | |
760 | 765 | #if 0 |
761 | 766 | error = AECountItems(&replyList, &numFiles); |
762 | 767 | #ifdef USE_SIOUX |
763 | - printf ("KAHL_MOD ItemInList: %d\n", numFiles); | |
768 | + printf("KAHL_MOD ItemInList: %d\n", numFiles); | |
764 | 769 | #endif |
765 | 770 | #endif |
766 | 771 | |
767 | 772 | /* We can add data only if something to reply */ |
768 | - error = AEPutParamDesc (theReply, keyDirectObject, &replyList); | |
773 | + error = AEPutParamDesc(theReply, keyDirectObject, &replyList); | |
769 | 774 | |
770 | 775 | #ifdef USE_SIOUX |
771 | 776 | if (error) |
772 | - printf ("KAHL_MOD: AEPutParamDesc error: %d\n", error); | |
777 | + printf("KAHL_MOD: AEPutParamDesc error: %d\n", error); | |
773 | 778 | #endif |
774 | 779 | |
775 | 780 | if (replyList.dataHandle) |
@@ -819,7 +824,8 @@ | ||
819 | 824 | # pragma options align=reset |
820 | 825 | #endif |
821 | 826 | |
822 | -pascal OSErr Handle_KAHL_GTTX_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
827 | + pascal OSErr | |
828 | +Handle_KAHL_GTTX_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
823 | 829 | { |
824 | 830 | OSErr error = noErr; |
825 | 831 | buf_T *buf; |
@@ -839,7 +845,7 @@ | ||
839 | 845 | if (error) |
840 | 846 | { |
841 | 847 | #ifdef USE_SIOUX |
842 | - printf ("KAHL_GTTX: AEGetParamPtr error: %d\n", error); | |
848 | + printf("KAHL_GTTX: AEGetParamPtr error: %d\n", error); | |
843 | 849 | #endif |
844 | 850 | return(error); |
845 | 851 | } |
@@ -854,7 +860,7 @@ | ||
854 | 860 | |
855 | 861 | if (foundFile) |
856 | 862 | { |
857 | - BufferSize = 0; /* GetHandleSize (GetTextData.theText); */ | |
863 | + BufferSize = 0; /* GetHandleSize(GetTextData.theText); */ | |
858 | 864 | for (lineno = 0; lineno <= buf->b_ml.ml_line_count; lineno++) |
859 | 865 | { |
860 | 866 | /* Must use the right buffer */ |
@@ -863,48 +869,48 @@ | ||
863 | 869 | lineStart = BufferSize; |
864 | 870 | BufferSize += linesize; |
865 | 871 | /* Resize handle to linesize+1 to include the linefeed */ |
866 | - SetHandleSize (GetTextData.theText, BufferSize); | |
867 | - if (GetHandleSize (GetTextData.theText) != BufferSize) | |
872 | + SetHandleSize(GetTextData.theText, BufferSize); | |
873 | + if (GetHandleSize(GetTextData.theText) != BufferSize) | |
868 | 874 | { |
869 | 875 | #ifdef USE_SIOUX |
870 | - printf ("KAHL_GTTX: SetHandleSize increase: %d, size %d\n", | |
876 | + printf("KAHL_GTTX: SetHandleSize increase: %d, size %d\n", | |
871 | 877 | linesize, BufferSize); |
872 | 878 | #endif |
873 | 879 | break; /* Simple handling for now */ |
874 | 880 | } |
875 | 881 | else |
876 | 882 | { |
877 | - HLock (GetTextData.theText); | |
883 | + HLock(GetTextData.theText); | |
878 | 884 | fullbuffer = (char_u *) *GetTextData.theText; |
879 | - STRCPY ((char_u *) (fullbuffer + lineStart), line); | |
885 | + STRCPY((char_u *)(fullbuffer + lineStart), line); | |
880 | 886 | fullbuffer[BufferSize-1] = '\r'; |
881 | - HUnlock (GetTextData.theText); | |
887 | + HUnlock(GetTextData.theText); | |
882 | 888 | } |
883 | 889 | } |
884 | 890 | if (fullbuffer != NULL) |
885 | 891 | { |
886 | - HLock (GetTextData.theText); | |
892 | + HLock(GetTextData.theText); | |
887 | 893 | fullbuffer[BufferSize-1] = 0; |
888 | - HUnlock (GetTextData.theText); | |
894 | + HUnlock(GetTextData.theText); | |
889 | 895 | } |
890 | 896 | if (foundFile == false) |
891 | 897 | *GetTextData.theDate = fnfErr; |
892 | 898 | else |
893 | -/* *GetTextData.theDate = time (NULL) & (time_t) 0xFFFFFFF0;*/ | |
899 | +/* *GetTextData.theDate = time(NULL) & (time_t) 0xFFFFFFF0;*/ | |
894 | 900 | *GetTextData.theDate = buf->b_mtime; |
895 | 901 | } |
896 | 902 | #ifdef USE_SIOUX |
897 | - printf ("KAHL_GTTX: file \"%#s\" {%d} [date %lx, %lx]", GetTextData.theFile.name, GetTextData.theFile.parID, *GetTextData.theDate, buf->b_mtime_read); | |
903 | + printf("KAHL_GTTX: file \"%#s\" {%d} [date %lx, %lx]", GetTextData.theFile.name, GetTextData.theFile.parID, *GetTextData.theDate, buf->b_mtime_read); | |
898 | 904 | if (foundFile == false) |
899 | - printf (" NOT"); | |
900 | - printf (" found. (BufferSize = %d)\n", BufferSize); | |
901 | -#endif | |
902 | - | |
903 | - error = HandleUnusedParms (theAEvent); | |
905 | + printf(" NOT"); | |
906 | + printf(" found. (BufferSize = %d)\n", BufferSize); | |
907 | +#endif | |
908 | + | |
909 | + error = HandleUnusedParms(theAEvent); | |
904 | 910 | if (error) |
905 | 911 | { |
906 | 912 | #ifdef USE_SIOUX |
907 | - printf ("KAHL_GTTX: HandleUnusedParms error: %d\n", error); | |
913 | + printf("KAHL_GTTX: HandleUnusedParms error: %d\n", error); | |
908 | 914 | #endif |
909 | 915 | return(error); |
910 | 916 | } |
@@ -917,48 +923,45 @@ | ||
917 | 923 | */ |
918 | 924 | |
919 | 925 | /* Taken from MoreAppleEvents:ProcessHelpers*/ |
920 | -pascal OSErr FindProcessBySignature( const OSType targetType, | |
926 | +pascal OSErr FindProcessBySignature(const OSType targetType, | |
921 | 927 | const OSType targetCreator, |
922 | - ProcessSerialNumberPtr psnPtr ) | |
928 | + ProcessSerialNumberPtr psnPtr) | |
923 | 929 | { |
924 | 930 | OSErr anErr = noErr; |
925 | 931 | Boolean lookingForProcess = true; |
926 | 932 | |
927 | 933 | ProcessInfoRec infoRec; |
928 | 934 | |
929 | - infoRec.processInfoLength = sizeof( ProcessInfoRec ); | |
935 | + infoRec.processInfoLength = sizeof(ProcessInfoRec); | |
930 | 936 | infoRec.processName = nil; |
931 | 937 | infoRec.processAppSpec = nil; |
932 | 938 | |
933 | 939 | psnPtr->lowLongOfPSN = kNoProcess; |
934 | 940 | psnPtr->highLongOfPSN = kNoProcess; |
935 | 941 | |
936 | - while ( lookingForProcess ) | |
942 | + while (lookingForProcess) | |
937 | 943 | { |
938 | - anErr = GetNextProcess( psnPtr ); | |
939 | - if ( anErr != noErr ) | |
940 | - { | |
944 | + anErr = GetNextProcess(psnPtr); | |
945 | + if (anErr != noErr) | |
941 | 946 | lookingForProcess = false; |
942 | - } | |
943 | 947 | else |
944 | 948 | { |
945 | - anErr = GetProcessInformation( psnPtr, &infoRec ); | |
946 | - if ( ( anErr == noErr ) | |
947 | - && ( infoRec.processType == targetType ) | |
948 | - && ( infoRec.processSignature == targetCreator ) ) | |
949 | - { | |
949 | + anErr = GetProcessInformation(psnPtr, &infoRec); | |
950 | + if ((anErr == noErr) | |
951 | + && (infoRec.processType == targetType) | |
952 | + && (infoRec.processSignature == targetCreator)) | |
950 | 953 | lookingForProcess = false; |
951 | - } | |
952 | 954 | } |
953 | 955 | } |
954 | 956 | |
955 | 957 | return anErr; |
956 | 958 | }//end FindProcessBySignature |
957 | 959 | |
958 | -void Send_KAHL_MOD_AE (buf_T *buf) | |
960 | + void | |
961 | +Send_KAHL_MOD_AE(buf_T *buf) | |
959 | 962 | { |
960 | - OSErr anErr = noErr; | |
961 | - AEDesc targetAppDesc = { typeNull, nil }; | |
963 | + OSErr anErr = noErr; | |
964 | + AEDesc targetAppDesc = { typeNull, nil }; | |
962 | 965 | ProcessSerialNumber psn = { kNoProcess, kNoProcess }; |
963 | 966 | AppleEvent theReply = { typeNull, nil }; |
964 | 967 | AESendMode sendMode; |
@@ -967,48 +970,48 @@ | ||
967 | 970 | ModificationInfo ModData; |
968 | 971 | |
969 | 972 | |
970 | - anErr = FindProcessBySignature( 'APPL', 'CWIE', &psn ); | |
973 | + anErr = FindProcessBySignature('APPL', 'CWIE', &psn); | |
971 | 974 | #ifdef USE_SIOUX |
972 | - printf ("CodeWarrior is"); | |
975 | + printf("CodeWarrior is"); | |
973 | 976 | if (anErr != noErr) |
974 | - printf (" NOT"); | |
975 | - printf (" running\n"); | |
976 | -#endif | |
977 | - if ( anErr == noErr ) | |
977 | + printf(" NOT"); | |
978 | + printf(" running\n"); | |
979 | +#endif | |
980 | + if (anErr == noErr) | |
978 | 981 | { |
979 | - anErr = AECreateDesc (typeProcessSerialNumber, &psn, | |
980 | - sizeof( ProcessSerialNumber ), &targetAppDesc); | |
981 | - | |
982 | - if ( anErr == noErr ) | |
982 | + anErr = AECreateDesc(typeProcessSerialNumber, &psn, | |
983 | + sizeof(ProcessSerialNumber), &targetAppDesc); | |
984 | + | |
985 | + if (anErr == noErr) | |
983 | 986 | { |
984 | 987 | anErr = AECreateAppleEvent( 'KAHL', 'MOD ', &targetAppDesc, |
985 | 988 | kAutoGenerateReturnID, kAnyTransactionID, &theEvent); |
986 | 989 | } |
987 | 990 | |
988 | - AEDisposeDesc( &targetAppDesc ); | |
991 | + AEDisposeDesc(&targetAppDesc); | |
989 | 992 | |
990 | 993 | /* Add the parms */ |
991 | 994 | ModData.theFile = buf->b_FSSpec; |
992 | 995 | ModData.theDate = buf->b_mtime; |
993 | 996 | |
994 | 997 | if (anErr == noErr) |
995 | - anErr =AEPutParamPtr (&theEvent, keyDirectObject, typeChar, &ModData, sizeof(ModData)); | |
996 | - | |
997 | - if ( idleProcUPP == nil ) | |
998 | + anErr = AEPutParamPtr(&theEvent, keyDirectObject, typeChar, &ModData, sizeof(ModData)); | |
999 | + | |
1000 | + if (idleProcUPP == nil) | |
998 | 1001 | sendMode = kAENoReply; |
999 | 1002 | else |
1000 | 1003 | sendMode = kAEWaitReply; |
1001 | 1004 | |
1002 | - if ( anErr == noErr ) | |
1003 | - anErr = AESend( &theEvent, &theReply, sendMode, kAENormalPriority, kNoTimeOut, idleProcUPP, nil ); | |
1004 | - if ( anErr == noErr && sendMode == kAEWaitReply ) | |
1005 | + if (anErr == noErr) | |
1006 | + anErr = AESend(&theEvent, &theReply, sendMode, kAENormalPriority, kNoTimeOut, idleProcUPP, nil); | |
1007 | + if (anErr == noErr && sendMode == kAEWaitReply) | |
1005 | 1008 | { |
1006 | 1009 | #ifdef USE_SIOUX |
1007 | - printf ("KAHL_MOD: Send error: %d\n", anErr); | |
1008 | -#endif | |
1009 | -/* anErr = AEHGetHandlerError( &theReply );*/ | |
1010 | + printf("KAHL_MOD: Send error: %d\n", anErr); | |
1011 | +#endif | |
1012 | +/* anErr = AEHGetHandlerError(&theReply);*/ | |
1010 | 1013 | } |
1011 | - (void) AEDisposeDesc( &theReply ); | |
1014 | + (void) AEDisposeDesc(&theReply); | |
1012 | 1015 | } |
1013 | 1016 | } |
1014 | 1017 | #endif /* FEAT_CW_EDITOR */ |
@@ -1024,7 +1027,8 @@ | ||
1024 | 1027 | * Handle the Unused parms of an AppleEvent |
1025 | 1028 | */ |
1026 | 1029 | |
1027 | -OSErr HandleUnusedParms (const AppleEvent *theAEvent) | |
1030 | + OSErr | |
1031 | +HandleUnusedParms(const AppleEvent *theAEvent) | |
1028 | 1032 | { |
1029 | 1033 | OSErr error; |
1030 | 1034 | long actualSize; |
@@ -1086,7 +1090,8 @@ | ||
1086 | 1090 | endRange are all negative, there is no selection range specified. |
1087 | 1091 | */ |
1088 | 1092 | |
1089 | -pascal OSErr HandleODocAE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1093 | + pascal OSErr | |
1094 | +HandleODocAE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1090 | 1095 | { |
1091 | 1096 | /* |
1092 | 1097 | * TODO: Clean up the code with convert the AppleEvent into |
@@ -1107,7 +1112,7 @@ | ||
1107 | 1112 | long lnum; |
1108 | 1113 | |
1109 | 1114 | #ifdef USE_SIOUX |
1110 | - printf ("aevt_odoc:\n"); | |
1115 | + printf("aevt_odoc:\n"); | |
1111 | 1116 | #endif |
1112 | 1117 | |
1113 | 1118 | /* the direct object parameter is the list of aliases to files (one or more) */ |
@@ -1115,7 +1120,7 @@ | ||
1115 | 1120 | if (error) |
1116 | 1121 | { |
1117 | 1122 | #ifdef USE_SIOUX |
1118 | - printf ("aevt_odoc: AEGetParamDesc error: %d\n", error); | |
1123 | + printf("aevt_odoc: AEGetParamDesc error: %d\n", error); | |
1119 | 1124 | #endif |
1120 | 1125 | return(error); |
1121 | 1126 | } |
@@ -1129,13 +1134,13 @@ | ||
1129 | 1134 | if (error) |
1130 | 1135 | { |
1131 | 1136 | #ifdef USE_SIOUX |
1132 | - printf ("aevt_odoc: AEGetParamPtr error: %d\n", error); | |
1137 | + printf("aevt_odoc: AEGetParamPtr error: %d\n", error); | |
1133 | 1138 | #endif |
1134 | 1139 | return(error); |
1135 | 1140 | } |
1136 | 1141 | |
1137 | 1142 | #ifdef USE_SIOUX |
1138 | - printf ("aevt_odoc: lineNum: %d, startRange %d, endRange %d, [date %lx]\n", | |
1143 | + printf("aevt_odoc: lineNum: %d, startRange %d, endRange %d, [date %lx]\n", | |
1139 | 1144 | thePosition.lineNum, thePosition.startRange, thePosition.endRange, |
1140 | 1145 | thePosition.theDate); |
1141 | 1146 | #endif |
@@ -1216,11 +1221,11 @@ | ||
1216 | 1221 | finished: |
1217 | 1222 | AEDisposeDesc(&theList); /* dispose what we allocated */ |
1218 | 1223 | |
1219 | - error = HandleUnusedParms (theAEvent); | |
1224 | + error = HandleUnusedParms(theAEvent); | |
1220 | 1225 | if (error) |
1221 | 1226 | { |
1222 | 1227 | #ifdef USE_SIOUX |
1223 | - printf ("aevt_odoc: HandleUnusedParms error: %d\n", error); | |
1228 | + printf("aevt_odoc: HandleUnusedParms error: %d\n", error); | |
1224 | 1229 | #endif |
1225 | 1230 | return(error); |
1226 | 1231 | } |
@@ -1231,15 +1236,16 @@ | ||
1231 | 1236 | * |
1232 | 1237 | */ |
1233 | 1238 | |
1234 | -pascal OSErr Handle_aevt_oapp_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1239 | + pascal OSErr | |
1240 | +Handle_aevt_oapp_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1235 | 1241 | { |
1236 | 1242 | OSErr error = noErr; |
1237 | 1243 | |
1238 | 1244 | #ifdef USE_SIOUX |
1239 | - printf ("aevt_oapp:\n"); | |
1240 | -#endif | |
1241 | - | |
1242 | - error = HandleUnusedParms (theAEvent); | |
1245 | + printf("aevt_oapp:\n"); | |
1246 | +#endif | |
1247 | + | |
1248 | + error = HandleUnusedParms(theAEvent); | |
1243 | 1249 | if (error) |
1244 | 1250 | { |
1245 | 1251 | return(error); |
@@ -1252,15 +1258,16 @@ | ||
1252 | 1258 | * |
1253 | 1259 | */ |
1254 | 1260 | |
1255 | -pascal OSErr Handle_aevt_quit_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1261 | + pascal OSErr | |
1262 | +Handle_aevt_quit_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1256 | 1263 | { |
1257 | 1264 | OSErr error = noErr; |
1258 | 1265 | |
1259 | 1266 | #ifdef USE_SIOUX |
1260 | - printf ("aevt_quit\n"); | |
1261 | -#endif | |
1262 | - | |
1263 | - error = HandleUnusedParms (theAEvent); | |
1267 | + printf("aevt_quit\n"); | |
1268 | +#endif | |
1269 | + | |
1270 | + error = HandleUnusedParms(theAEvent); | |
1264 | 1271 | if (error) |
1265 | 1272 | { |
1266 | 1273 | return(error); |
@@ -1276,15 +1283,16 @@ | ||
1276 | 1283 | * |
1277 | 1284 | */ |
1278 | 1285 | |
1279 | -pascal OSErr Handle_aevt_pdoc_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1286 | + pascal OSErr | |
1287 | +Handle_aevt_pdoc_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1280 | 1288 | { |
1281 | 1289 | OSErr error = noErr; |
1282 | 1290 | |
1283 | 1291 | #ifdef USE_SIOUX |
1284 | - printf ("aevt_pdoc:\n"); | |
1285 | -#endif | |
1286 | - | |
1287 | - error = HandleUnusedParms (theAEvent); | |
1292 | + printf("aevt_pdoc:\n"); | |
1293 | +#endif | |
1294 | + | |
1295 | + error = HandleUnusedParms(theAEvent); | |
1288 | 1296 | if (error) |
1289 | 1297 | { |
1290 | 1298 | return(error); |
@@ -1298,15 +1306,16 @@ | ||
1298 | 1306 | * |
1299 | 1307 | * (Just get rid of all the parms) |
1300 | 1308 | */ |
1301 | -pascal OSErr Handle_unknown_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1309 | + pascal OSErr | |
1310 | +Handle_unknown_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon) | |
1302 | 1311 | { |
1303 | 1312 | OSErr error = noErr; |
1304 | 1313 | |
1305 | 1314 | #ifdef USE_SIOUX |
1306 | - printf ("Unknown Event: %x\n", theAEvent->descriptorType); | |
1307 | -#endif | |
1308 | - | |
1309 | - error = HandleUnusedParms (theAEvent); | |
1315 | + printf("Unknown Event: %x\n", theAEvent->descriptorType); | |
1316 | +#endif | |
1317 | + | |
1318 | + error = HandleUnusedParms(theAEvent); | |
1310 | 1319 | if (error) |
1311 | 1320 | { |
1312 | 1321 | return(error); |
@@ -1324,7 +1333,8 @@ | ||
1324 | 1333 | /* |
1325 | 1334 | * Install the various AppleEvent Handlers |
1326 | 1335 | */ |
1327 | -OSErr InstallAEHandlers (void) | |
1336 | + OSErr | |
1337 | +InstallAEHandlers(void) | |
1328 | 1338 | { |
1329 | 1339 | OSErr error; |
1330 | 1340 |
@@ -1438,7 +1448,7 @@ | ||
1438 | 1448 | * Returns the index inside the menu wher |
1439 | 1449 | */ |
1440 | 1450 | short /* Shoulde we return MenuItemIndex? */ |
1441 | -gui_mac_get_menu_item_index (pMenu) | |
1451 | +gui_mac_get_menu_item_index(pMenu) | |
1442 | 1452 | vimmenu_T *pMenu; |
1443 | 1453 | { |
1444 | 1454 | short index; |
@@ -1475,7 +1485,7 @@ | ||
1475 | 1485 | } |
1476 | 1486 | |
1477 | 1487 | static vimmenu_T * |
1478 | -gui_mac_get_vim_menu (menuID, itemIndex, pMenu) | |
1488 | +gui_mac_get_vim_menu(menuID, itemIndex, pMenu) | |
1479 | 1489 | short menuID; |
1480 | 1490 | short itemIndex; |
1481 | 1491 | vimmenu_T *pMenu; |
@@ -1529,7 +1539,7 @@ | ||
1529 | 1539 | */ |
1530 | 1540 | pascal |
1531 | 1541 | void |
1532 | -gui_mac_drag_thumb (ControlHandle theControl, short partCode) | |
1542 | +gui_mac_drag_thumb(ControlHandle theControl, short partCode) | |
1533 | 1543 | { |
1534 | 1544 | scrollbar_T *sb; |
1535 | 1545 | int value, dragging; |
@@ -1538,13 +1548,13 @@ | ||
1538 | 1548 | |
1539 | 1549 | theControlToUse = dragged_sb; |
1540 | 1550 | |
1541 | - sb = gui_find_scrollbar((long) GetControlReference (theControlToUse)); | |
1551 | + sb = gui_find_scrollbar((long) GetControlReference(theControlToUse)); | |
1542 | 1552 | |
1543 | 1553 | if (sb == NULL) |
1544 | 1554 | return; |
1545 | 1555 | |
1546 | 1556 | /* Need to find value by diff between Old Poss New Pos */ |
1547 | - value = GetControl32BitValue (theControlToUse); | |
1557 | + value = GetControl32BitValue(theControlToUse); | |
1548 | 1558 | dragging = (partCode != 0); |
1549 | 1559 | |
1550 | 1560 | /* When "allow_scrollbar" is FALSE still need to remember the new |
@@ -1556,7 +1566,7 @@ | ||
1556 | 1566 | |
1557 | 1567 | pascal |
1558 | 1568 | void |
1559 | -gui_mac_scroll_action (ControlHandle theControl, short partCode) | |
1569 | +gui_mac_scroll_action(ControlHandle theControl, short partCode) | |
1560 | 1570 | { |
1561 | 1571 | /* TODO: have live support */ |
1562 | 1572 | scrollbar_T *sb, *sb_info; |
@@ -1566,7 +1576,7 @@ | ||
1566 | 1576 | int dragging = FALSE; |
1567 | 1577 | int dont_scroll_save = dont_scroll; |
1568 | 1578 | |
1569 | - sb = gui_find_scrollbar((long) GetControlReference (theControl)); | |
1579 | + sb = gui_find_scrollbar((long)GetControlReference(theControl)); | |
1570 | 1580 | |
1571 | 1581 | if (sb == NULL) |
1572 | 1582 | return; |
@@ -1648,7 +1658,7 @@ | ||
1648 | 1658 | * TODO: Add support for potential TOOLBAR |
1649 | 1659 | */ |
1650 | 1660 | void |
1651 | -gui_mac_doInContentClick (theEvent, whichWindow) | |
1661 | +gui_mac_doInContentClick(theEvent, whichWindow) | |
1652 | 1662 | EventRecord *theEvent; |
1653 | 1663 | WindowPtr whichWindow; |
1654 | 1664 | { |
@@ -1660,10 +1670,10 @@ | ||
1660 | 1670 | short dblClick; |
1661 | 1671 | |
1662 | 1672 | thePoint = theEvent->where; |
1663 | - GlobalToLocal (&thePoint); | |
1664 | - SelectWindow (whichWindow); | |
1665 | - | |
1666 | - thePortion = FindControl (thePoint, whichWindow, &theControl); | |
1673 | + GlobalToLocal(&thePoint); | |
1674 | + SelectWindow(whichWindow); | |
1675 | + | |
1676 | + thePortion = FindControl(thePoint, whichWindow, &theControl); | |
1667 | 1677 | |
1668 | 1678 | if (theControl != NUL) |
1669 | 1679 | { |
@@ -1685,7 +1695,7 @@ | ||
1685 | 1695 | #endif |
1686 | 1696 | /* pass 0 as the part to tell gui_mac_drag_thumb, that the mouse |
1687 | 1697 | * button has been released */ |
1688 | - gui_mac_drag_thumb (theControl, 0); /* Should it be thePortion ? (Dany) */ | |
1698 | + gui_mac_drag_thumb(theControl, 0); /* Should it be thePortion ? (Dany) */ | |
1689 | 1699 | dragged_sb = NULL; |
1690 | 1700 | } |
1691 | 1701 | } |
@@ -1731,7 +1741,7 @@ | ||
1731 | 1741 | #endif |
1732 | 1742 | #endif |
1733 | 1743 | { |
1734 | - SetRect (&dragRect, FILL_X(X_2_COL(thePoint.h)), | |
1744 | + SetRect(&dragRect, FILL_X(X_2_COL(thePoint.h)), | |
1735 | 1745 | FILL_Y(Y_2_ROW(thePoint.v)), |
1736 | 1746 | FILL_X(X_2_COL(thePoint.h)+1), |
1737 | 1747 | FILL_Y(Y_2_ROW(thePoint.v)+1)); |
@@ -1746,7 +1756,7 @@ | ||
1746 | 1756 | * Handle the click in the titlebar (to move the window) |
1747 | 1757 | */ |
1748 | 1758 | void |
1749 | -gui_mac_doInDragClick (where, whichWindow) | |
1759 | +gui_mac_doInDragClick(where, whichWindow) | |
1750 | 1760 | Point where; |
1751 | 1761 | WindowPtr whichWindow; |
1752 | 1762 | { |
@@ -1755,11 +1765,11 @@ | ||
1755 | 1765 | |
1756 | 1766 | /* TODO: may try to prevent move outside screen? */ |
1757 | 1767 | #ifdef USE_CARBONIZED |
1758 | - movingLimitsPtr = GetRegionBounds ( GetGrayRgn(), &movingLimits ); | |
1768 | + movingLimitsPtr = GetRegionBounds(GetGrayRgn(), &movingLimits); | |
1759 | 1769 | #else |
1760 | 1770 | movingLimitsPtr = &(*GetGrayRgn())->rgnBBox; |
1761 | 1771 | #endif |
1762 | - DragWindow (whichWindow, where, movingLimitsPtr); | |
1772 | + DragWindow(whichWindow, where, movingLimitsPtr); | |
1763 | 1773 | } |
1764 | 1774 | |
1765 | 1775 | /* |
@@ -1779,7 +1789,7 @@ | ||
1779 | 1789 | #ifdef USE_CARBONIZED |
1780 | 1790 | Rect NewContentRect; |
1781 | 1791 | |
1782 | - resizeLimitsPtr = GetRegionBounds ( GetGrayRgn(), &resizeLimits ); | |
1792 | + resizeLimitsPtr = GetRegionBounds(GetGrayRgn(), &resizeLimits); | |
1783 | 1793 | #else |
1784 | 1794 | resizeLimits = qd.screenBits.bounds; |
1785 | 1795 | #endif |
@@ -1919,17 +1929,17 @@ | ||
1919 | 1929 | whichWindow = (WindowPtr) event->message; |
1920 | 1930 | |
1921 | 1931 | /* Save Current Port */ |
1922 | - GetPort (&savePort); | |
1932 | + GetPort(&savePort); | |
1923 | 1933 | |
1924 | 1934 | /* Select the Window's Port */ |
1925 | 1935 | #ifdef USE_CARBONIZED |
1926 | - SetPortWindowPort (whichWindow); | |
1936 | + SetPortWindowPort(whichWindow); | |
1927 | 1937 | #else |
1928 | - SetPort (whichWindow); | |
1938 | + SetPort(whichWindow); | |
1929 | 1939 | #endif |
1930 | 1940 | |
1931 | 1941 | /* Let's update the window */ |
1932 | - BeginUpdate (whichWindow); | |
1942 | + BeginUpdate(whichWindow); | |
1933 | 1943 | /* Redraw the biggest rectangle covering the area |
1934 | 1944 | * to be updated. |
1935 | 1945 | */ |
@@ -1945,9 +1955,9 @@ | ||
1945 | 1955 | updateRgn = whichWindow->visRgn; |
1946 | 1956 | #endif |
1947 | 1957 | /* Use the HLock useless in Carbon? Is it harmful?*/ |
1948 | - HLock ((Handle) updateRgn); | |
1958 | + HLock((Handle) updateRgn); | |
1949 | 1959 | #ifdef USE_CARBONIZED |
1950 | - updateRectPtr = GetRegionBounds ( updateRgn, &updateRect ); | |
1960 | + updateRectPtr = GetRegionBounds(updateRgn, &updateRect); | |
1951 | 1961 | # if 0 |
1952 | 1962 | /* Code from original Carbon Port (using GetWindowRegion. |
1953 | 1963 | * I believe the UpdateRgn is already in local (Dany) |
@@ -1966,33 +1976,33 @@ | ||
1966 | 1976 | gui_mch_set_bg_color(gui.back_pixel); |
1967 | 1977 | if (updateRectPtr->left < FILL_X(0)) |
1968 | 1978 | { |
1969 | - SetRect (&rc, 0, 0, FILL_X(0), FILL_Y(Rows)); | |
1970 | - EraseRect (&rc); | |
1979 | + SetRect(&rc, 0, 0, FILL_X(0), FILL_Y(Rows)); | |
1980 | + EraseRect(&rc); | |
1971 | 1981 | } |
1972 | 1982 | if (updateRectPtr->top < FILL_Y(0)) |
1973 | 1983 | { |
1974 | - SetRect (&rc, 0, 0, FILL_X(Columns), FILL_Y(0)); | |
1975 | - EraseRect (&rc); | |
1984 | + SetRect(&rc, 0, 0, FILL_X(Columns), FILL_Y(0)); | |
1985 | + EraseRect(&rc); | |
1976 | 1986 | } |
1977 | 1987 | if (updateRectPtr->right > FILL_X(Columns)) |
1978 | 1988 | { |
1979 | - SetRect (&rc, FILL_X(Columns), 0, | |
1989 | + SetRect(&rc, FILL_X(Columns), 0, | |
1980 | 1990 | FILL_X(Columns) + gui.border_offset, FILL_Y(Rows)); |
1981 | - EraseRect (&rc); | |
1991 | + EraseRect(&rc); | |
1982 | 1992 | } |
1983 | 1993 | if (updateRectPtr->bottom > FILL_Y(Rows)) |
1984 | 1994 | { |
1985 | - SetRect (&rc, 0, FILL_Y(Rows), FILL_X(Columns) + gui.border_offset, | |
1995 | + SetRect(&rc, 0, FILL_Y(Rows), FILL_X(Columns) + gui.border_offset, | |
1986 | 1996 | FILL_Y(Rows) + gui.border_offset); |
1987 | - EraseRect (&rc); | |
1997 | + EraseRect(&rc); | |
1988 | 1998 | } |
1989 | - HUnlock ((Handle) updateRgn); | |
1999 | + HUnlock((Handle) updateRgn); | |
1990 | 2000 | #ifdef USE_CARBONIZED |
1991 | - DisposeRgn (updateRgn); | |
2001 | + DisposeRgn(updateRgn); | |
1992 | 2002 | #endif |
1993 | 2003 | |
1994 | 2004 | /* Update scrollbars */ |
1995 | - DrawControls (whichWindow); | |
2005 | + DrawControls(whichWindow); | |
1996 | 2006 | |
1997 | 2007 | /* Update the GrowBox */ |
1998 | 2008 | /* Taken from FAQ 33-27 */ |
@@ -2004,15 +2014,15 @@ | ||
2004 | 2014 | growRect.top = growRect.bottom - 15; |
2005 | 2015 | growRect.left = growRect.right - 15; |
2006 | 2016 | #endif |
2007 | - GetClip (saveRgn); | |
2008 | - ClipRect (&growRect); | |
2009 | - DrawGrowIcon (whichWindow); | |
2010 | - SetClip (saveRgn); | |
2011 | - DisposeRgn (saveRgn); | |
2012 | - EndUpdate (whichWindow); | |
2017 | + GetClip(saveRgn); | |
2018 | + ClipRect(&growRect); | |
2019 | + DrawGrowIcon(whichWindow); | |
2020 | + SetClip(saveRgn); | |
2021 | + DisposeRgn(saveRgn); | |
2022 | + EndUpdate(whichWindow); | |
2013 | 2023 | |
2014 | 2024 | /* Restore original Port */ |
2015 | - SetPort (savePort); | |
2025 | + SetPort(savePort); | |
2016 | 2026 | } |
2017 | 2027 | |
2018 | 2028 | /* |
@@ -2040,8 +2050,8 @@ | ||
2040 | 2050 | |
2041 | 2051 | #if 0 /* Removed by Dany as per above June 2001 */ |
2042 | 2052 | a_bool = false; |
2043 | - SetPreserveGlyph (a_bool); | |
2044 | - SetOutlinePreferred (a_bool); | |
2053 | + SetPreserveGlyph(a_bool); | |
2054 | + SetOutlinePreferred(a_bool); | |
2045 | 2055 | #endif |
2046 | 2056 | } |
2047 | 2057 | } |
@@ -2099,8 +2109,20 @@ | ||
2099 | 2109 | |
2100 | 2110 | /* Intercept CTRL-C */ |
2101 | 2111 | if (theEvent->modifiers & controlKey) |
2112 | + { | |
2102 | 2113 | if (key_char == Ctrl_C && ctrl_c_interrupts) |
2103 | 2114 | got_int = TRUE; |
2115 | + else if ((theEvent->modifiers & ~(controlKey|shiftKey)) == 0 | |
2116 | + && (key_char == '2' || key_char == '6')) | |
2117 | + { | |
2118 | + /* CTRL-^ and CTRL-@ don't work in the normal way. */ | |
2119 | + if (key_char == '2') | |
2120 | + key_char = Ctrl_AT; | |
2121 | + else | |
2122 | + key_char = Ctrl_HAT; | |
2123 | + theEvent->modifiers = 0; | |
2124 | + } | |
2125 | + } | |
2104 | 2126 | |
2105 | 2127 | /* Intercept CMD-. */ |
2106 | 2128 | if (theEvent->modifiers & cmdKey) |
@@ -2143,8 +2165,8 @@ | ||
2143 | 2165 | key_char = special_keys[i].vim_code0; |
2144 | 2166 | else |
2145 | 2167 | # endif |
2146 | - key_char = TO_SPECIAL( special_keys[i].vim_code0, | |
2147 | - special_keys[i].vim_code1 ); | |
2168 | + key_char = TO_SPECIAL(special_keys[i].vim_code0, | |
2169 | + special_keys[i].vim_code1); | |
2148 | 2170 | key_char = simplify_key(key_char,&modifiers); |
2149 | 2171 | break; |
2150 | 2172 | } |
@@ -2162,36 +2184,38 @@ | ||
2162 | 2184 | { |
2163 | 2185 | #if 1 |
2164 | 2186 | /* Clear modifiers when only one modifier is set */ |
2165 | - if( (modifiers == MOD_MASK_SHIFT) || | |
2166 | - (modifiers == MOD_MASK_CTRL) || | |
2167 | - (modifiers == MOD_MASK_ALT)) | |
2187 | + if ((modifiers == MOD_MASK_SHIFT) | |
2188 | + || (modifiers == MOD_MASK_CTRL) | |
2189 | + || (modifiers == MOD_MASK_ALT)) | |
2168 | 2190 | modifiers = 0; |
2169 | 2191 | #else |
2170 | - if( modifiers & MOD_MASK_CTRL) | |
2192 | + if (modifiers & MOD_MASK_CTRL) | |
2171 | 2193 | modifiers = modifiers & ~MOD_MASK_CTRL; |
2172 | - if( modifiers & MOD_MASK_ALT) | |
2194 | + if (modifiers & MOD_MASK_ALT) | |
2173 | 2195 | modifiers = modifiers & ~MOD_MASK_ALT; |
2174 | - if( modifiers & MOD_MASK_SHIFT) | |
2196 | + if (modifiers & MOD_MASK_SHIFT) | |
2175 | 2197 | modifiers = modifiers & ~MOD_MASK_SHIFT; |
2176 | 2198 | #endif |
2177 | 2199 | } |
2178 | - if( modifiers ) | |
2200 | + if (modifiers) | |
2179 | 2201 | { |
2180 | - string[ len++ ] = CSI; | |
2181 | - string[ len++ ] = KS_MODIFIER; | |
2182 | - string[ len++ ] = modifiers; | |
2202 | + string[len++] = CSI; | |
2203 | + string[len++] = KS_MODIFIER; | |
2204 | + string[len++] = modifiers; | |
2183 | 2205 | } |
2184 | 2206 | |
2185 | - if( IS_SPECIAL( key_char ) ) | |
2207 | + if (IS_SPECIAL(key_char)) | |
2186 | 2208 | { |
2187 | - string[ len++ ] = CSI; | |
2188 | - string[ len++ ] = K_SECOND( key_char ); | |
2189 | - string[ len++ ] = K_THIRD( key_char ); | |
2209 | + string[len++] = CSI; | |
2210 | + string[len++] = K_SECOND(key_char); | |
2211 | + string[len++] = K_THIRD(key_char); | |
2190 | 2212 | } |
2191 | 2213 | else |
2192 | 2214 | { |
2193 | 2215 | #ifdef FEAT_MBYTE |
2194 | - if (input_conv.vc_type != CONV_NONE) | |
2216 | + /* Convert characters when needed (e.g., from MacRoman to latin1). | |
2217 | + * This doesn't work for the NUL byte. */ | |
2218 | + if (input_conv.vc_type != CONV_NONE && key_char > 0) | |
2195 | 2219 | { |
2196 | 2220 | char_u from[2], *to; |
2197 | 2221 | int l; |
@@ -2236,13 +2260,13 @@ | ||
2236 | 2260 | * Handle MouseClick |
2237 | 2261 | */ |
2238 | 2262 | void |
2239 | -gui_mac_doMouseDownEvent (theEvent) | |
2263 | +gui_mac_doMouseDownEvent(theEvent) | |
2240 | 2264 | EventRecord *theEvent; |
2241 | 2265 | { |
2242 | 2266 | short thePart; |
2243 | 2267 | WindowPtr whichWindow; |
2244 | 2268 | |
2245 | - thePart = FindWindow (theEvent->where, &whichWindow); | |
2269 | + thePart = FindWindow(theEvent->where, &whichWindow); | |
2246 | 2270 | |
2247 | 2271 | switch (thePart) |
2248 | 2272 | { |
@@ -2251,19 +2275,19 @@ | ||
2251 | 2275 | break; |
2252 | 2276 | |
2253 | 2277 | case (inMenuBar): |
2254 | - gui_mac_handle_menu(MenuSelect (theEvent->where)); | |
2278 | + gui_mac_handle_menu(MenuSelect(theEvent->where)); | |
2255 | 2279 | break; |
2256 | 2280 | |
2257 | 2281 | case (inContent): |
2258 | - gui_mac_doInContentClick (theEvent, whichWindow); | |
2282 | + gui_mac_doInContentClick(theEvent, whichWindow); | |
2259 | 2283 | break; |
2260 | 2284 | |
2261 | 2285 | case (inDrag): |
2262 | - gui_mac_doInDragClick (theEvent->where, whichWindow); | |
2286 | + gui_mac_doInDragClick(theEvent->where, whichWindow); | |
2263 | 2287 | break; |
2264 | 2288 | |
2265 | 2289 | case (inGrow): |
2266 | - gui_mac_doInGrowClick (theEvent->where, whichWindow); | |
2290 | + gui_mac_doInGrowClick(theEvent->where, whichWindow); | |
2267 | 2291 | break; |
2268 | 2292 | |
2269 | 2293 | case (inGoAway): |
@@ -2285,18 +2309,18 @@ | ||
2285 | 2309 | * [this event is a moving in and out of a region] |
2286 | 2310 | */ |
2287 | 2311 | void |
2288 | -gui_mac_doMouseMovedEvent (event) | |
2312 | +gui_mac_doMouseMovedEvent(event) | |
2289 | 2313 | EventRecord *event; |
2290 | 2314 | { |
2291 | 2315 | Point thePoint; |
2292 | 2316 | int_u vimModifiers; |
2293 | 2317 | |
2294 | 2318 | thePoint = event->where; |
2295 | - GlobalToLocal (&thePoint); | |
2319 | + GlobalToLocal(&thePoint); | |
2296 | 2320 | vimModifiers = EventModifiers2VimMouseModifiers(event->modifiers); |
2297 | 2321 | |
2298 | 2322 | if (!Button()) |
2299 | - gui_mouse_moved (thePoint.h, thePoint.v); | |
2323 | + gui_mouse_moved(thePoint.h, thePoint.v); | |
2300 | 2324 | else |
2301 | 2325 | #ifdef USE_CTRLCLICKMENU |
2302 | 2326 | if (!clickIsPopup) |
@@ -2305,7 +2329,7 @@ | ||
2305 | 2329 | thePoint.v, FALSE, vimModifiers); |
2306 | 2330 | |
2307 | 2331 | /* Reset the region from which we move in and out */ |
2308 | - SetRect (&dragRect, FILL_X(X_2_COL(thePoint.h)), | |
2332 | + SetRect(&dragRect, FILL_X(X_2_COL(thePoint.h)), | |
2309 | 2333 | FILL_Y(Y_2_ROW(thePoint.v)), |
2310 | 2334 | FILL_X(X_2_COL(thePoint.h)+1), |
2311 | 2335 | FILL_Y(Y_2_ROW(thePoint.v)+1)); |
@@ -2319,7 +2343,7 @@ | ||
2319 | 2343 | * Handle the mouse release |
2320 | 2344 | */ |
2321 | 2345 | void |
2322 | -gui_mac_doMouseUpEvent (theEvent) | |
2346 | +gui_mac_doMouseUpEvent(theEvent) | |
2323 | 2347 | EventRecord *theEvent; |
2324 | 2348 | { |
2325 | 2349 | Point thePoint; |
@@ -2331,7 +2355,7 @@ | ||
2331 | 2355 | dragRectEnbl = FALSE; |
2332 | 2356 | dragRectControl = kCreateEmpty; |
2333 | 2357 | thePoint = theEvent->where; |
2334 | - GlobalToLocal (&thePoint); | |
2358 | + GlobalToLocal(&thePoint); | |
2335 | 2359 | |
2336 | 2360 | vimModifiers = EventModifiers2VimMouseModifiers(theEvent->modifiers); |
2337 | 2361 | #ifdef USE_CTRLCLICKMENU |
@@ -2341,8 +2365,7 @@ | ||
2341 | 2365 | clickIsPopup = FALSE; |
2342 | 2366 | } |
2343 | 2367 | #endif |
2344 | - gui_send_mouse_event | |
2345 | - (MOUSE_RELEASE, thePoint.h, thePoint.v, FALSE, vimModifiers); | |
2368 | + gui_send_mouse_event(MOUSE_RELEASE, thePoint.h, thePoint.v, FALSE, vimModifiers); | |
2346 | 2369 | } |
2347 | 2370 | |
2348 | 2371 | #ifdef USE_MOUSEWHEEL |
@@ -2431,7 +2454,7 @@ | ||
2431 | 2454 | /* Handle the menu CntxMenuID, CntxMenuItem */ |
2432 | 2455 | /* The submenu can be handle directly by gui_mac_handle_menu */ |
2433 | 2456 | /* But what about the current menu, is the meny changed by ContextualMenuSelect */ |
2434 | - gui_mac_handle_menu ((CntxMenuID << 16) + CntxMenuItem); | |
2457 | + gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem); | |
2435 | 2458 | } |
2436 | 2459 | else if (CntxMenuID == kCMShowHelpSelected) |
2437 | 2460 | { |
@@ -2464,9 +2487,9 @@ | ||
2464 | 2487 | { |
2465 | 2488 | #ifndef USE_CARBONIZED |
2466 | 2489 | /* Desk Accessory doesn't exist in Carbon */ |
2467 | - appleMenu = GetMenuHandle (menu); | |
2468 | - GetMenuItemText (appleMenu, item, itemName); | |
2469 | - (void) OpenDeskAcc (itemName); | |
2490 | + appleMenu = GetMenuHandle(menu); | |
2491 | + GetMenuItemText(appleMenu, item, itemName); | |
2492 | + (void) OpenDeskAcc(itemName); | |
2470 | 2493 | #endif |
2471 | 2494 | } |
2472 | 2495 | } |
@@ -2477,7 +2500,7 @@ | ||
2477 | 2500 | if (theVimMenu) |
2478 | 2501 | gui_menu_cb(theVimMenu); |
2479 | 2502 | } |
2480 | - HiliteMenu (0); | |
2503 | + HiliteMenu(0); | |
2481 | 2504 | } |
2482 | 2505 | |
2483 | 2506 | /* |
@@ -2485,7 +2508,7 @@ | ||
2485 | 2508 | */ |
2486 | 2509 | |
2487 | 2510 | void |
2488 | -gui_mac_handle_event (event) | |
2511 | +gui_mac_handle_event(event) | |
2489 | 2512 | EventRecord *event; |
2490 | 2513 | { |
2491 | 2514 | OSErr error; |
@@ -2509,7 +2532,7 @@ | ||
2509 | 2532 | { |
2510 | 2533 | case (keyDown): |
2511 | 2534 | case (autoKey): |
2512 | - gui_mac_doKeyEvent (event); | |
2535 | + gui_mac_doKeyEvent(event); | |
2513 | 2536 | break; |
2514 | 2537 | |
2515 | 2538 | case (keyUp): |
@@ -2525,7 +2548,7 @@ | ||
2525 | 2548 | break; |
2526 | 2549 | |
2527 | 2550 | case (updateEvt): |
2528 | - gui_mac_doUpdateEvent (event); | |
2551 | + gui_mac_doUpdateEvent(event); | |
2529 | 2552 | break; |
2530 | 2553 | |
2531 | 2554 | case (diskEvt): |
@@ -2533,17 +2556,17 @@ | ||
2533 | 2556 | break; |
2534 | 2557 | |
2535 | 2558 | case (activateEvt): |
2536 | - gui_mac_doActivateEvent (event); | |
2559 | + gui_mac_doActivateEvent(event); | |
2537 | 2560 | break; |
2538 | 2561 | |
2539 | 2562 | case (osEvt): |
2540 | 2563 | switch ((event->message >> 24) & 0xFF) |
2541 | 2564 | { |
2542 | 2565 | case (0xFA): /* mouseMovedMessage */ |
2543 | - gui_mac_doMouseMovedEvent (event); | |
2566 | + gui_mac_doMouseMovedEvent(event); | |
2544 | 2567 | break; |
2545 | 2568 | case (0x01): /* suspendResumeMessage */ |
2546 | - gui_mac_doSuspendEvent (event); | |
2569 | + gui_mac_doSuspendEvent(event); | |
2547 | 2570 | break; |
2548 | 2571 | } |
2549 | 2572 | break; |
@@ -2565,7 +2588,7 @@ | ||
2565 | 2588 | |
2566 | 2589 | |
2567 | 2590 | GuiFont |
2568 | -gui_mac_find_font (font_name) | |
2591 | +gui_mac_find_font(font_name) | |
2569 | 2592 | char_u *font_name; |
2570 | 2593 | { |
2571 | 2594 | char_u c; |
@@ -2590,12 +2613,12 @@ | ||
2590 | 2613 | pFontName[0] = STRLEN(font_name); |
2591 | 2614 | *p = c; |
2592 | 2615 | |
2593 | - GetFNum (pFontName, &font_id); | |
2616 | + GetFNum(pFontName, &font_id); | |
2594 | 2617 | #else |
2595 | 2618 | /* name = C2Pascal_save(menu->dname); */ |
2596 | 2619 | fontNamePtr = C2Pascal_save_and_remove_backslash(font_name); |
2597 | 2620 | |
2598 | - GetFNum (fontNamePtr, &font_id); | |
2621 | + GetFNum(fontNamePtr, &font_id); | |
2599 | 2622 | #endif |
2600 | 2623 | |
2601 | 2624 |
@@ -2603,7 +2626,7 @@ | ||
2603 | 2626 | { |
2604 | 2627 | /* Oups, the system font was it the one the user want */ |
2605 | 2628 | |
2606 | - GetFontName (0, systemFontname); | |
2629 | + GetFontName(0, systemFontname); | |
2607 | 2630 | if (!EqualString(pFontName, systemFontname, false, false)) |
2608 | 2631 | return NOFONT; |
2609 | 2632 | } |
@@ -2709,36 +2732,36 @@ | ||
2709 | 2732 | SIOUXSettings.showstatusline = true; |
2710 | 2733 | SIOUXSettings.toppixel = 300; |
2711 | 2734 | SIOUXSettings.leftpixel = 10; |
2712 | - InstallConsole (1); /* fileno(stdout) = 1, on page 430 of MSL C */ | |
2713 | - printf ("Debugging console enabled\n"); | |
2714 | - /* SIOUXSetTitle ((char_u *) "Vim Stdout"); */ | |
2715 | -#endif | |
2716 | - | |
2717 | - pomme = NewMenu (256, "\p\024"); /* 0x14= = Apple Menu */ | |
2718 | - | |
2719 | - AppendMenu (pomme, "\pAbout VIM"); | |
2735 | + InstallConsole(1); /* fileno(stdout) = 1, on page 430 of MSL C */ | |
2736 | + printf("Debugging console enabled\n"); | |
2737 | + /* SIOUXSetTitle((char_u *) "Vim Stdout"); */ | |
2738 | +#endif | |
2739 | + | |
2740 | + pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */ | |
2741 | + | |
2742 | + AppendMenu(pomme, "\pAbout VIM"); | |
2720 | 2743 | #ifndef USE_CARBONIZED |
2721 | - AppendMenu (pomme, "\p-"); | |
2722 | - AppendResMenu (pomme, 'DRVR'); | |
2723 | -#endif | |
2724 | - | |
2725 | - InsertMenu (pomme, 0); | |
2744 | + AppendMenu(pomme, "\p-"); | |
2745 | + AppendResMenu(pomme, 'DRVR'); | |
2746 | +#endif | |
2747 | + | |
2748 | + InsertMenu(pomme, 0); | |
2726 | 2749 | |
2727 | 2750 | DrawMenuBar(); |
2728 | 2751 | |
2729 | 2752 | |
2730 | 2753 | #ifndef USE_OFFSETED_WINDOW |
2731 | - SetRect (&windRect, 10, 48, 10+80*7 + 16, 48+24*11); | |
2754 | + SetRect(&windRect, 10, 48, 10+80*7 + 16, 48+24*11); | |
2732 | 2755 | #else |
2733 | - SetRect (&windRect, 300, 40, 300+80*7 + 16, 40+24*11); | |
2756 | + SetRect(&windRect, 300, 40, 300+80*7 + 16, 40+24*11); | |
2734 | 2757 | #endif |
2735 | 2758 | |
2736 | 2759 | |
2737 | 2760 | #ifdef USE_CARBONIZED |
2738 | 2761 | CreateNewWindow(kDocumentWindowClass, |
2739 | 2762 | kWindowResizableAttribute | kWindowCollapseBoxAttribute, |
2740 | - &windRect, &gui.VimWindow ); | |
2741 | - SetPortWindowPort ( gui.VimWindow ); | |
2763 | + &windRect, &gui.VimWindow); | |
2764 | + SetPortWindowPort(gui.VimWindow); | |
2742 | 2765 | #else |
2743 | 2766 | gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true, documentProc, |
2744 | 2767 | (WindowPtr) -1L, false, 0); |
@@ -2753,11 +2776,11 @@ | ||
2753 | 2776 | gui.in_focus = TRUE; /* For the moment -> syn. of front application */ |
2754 | 2777 | |
2755 | 2778 | #if TARGET_API_MAC_CARBON |
2756 | - gScrollAction = NewControlActionUPP (gui_mac_scroll_action); | |
2757 | - gScrollDrag = NewControlActionUPP (gui_mac_drag_thumb); | |
2779 | + gScrollAction = NewControlActionUPP(gui_mac_scroll_action); | |
2780 | + gScrollDrag = NewControlActionUPP(gui_mac_drag_thumb); | |
2758 | 2781 | #else |
2759 | - gScrollAction = NewControlActionProc (gui_mac_scroll_action); | |
2760 | - gScrollDrag = NewControlActionProc (gui_mac_drag_thumb); | |
2782 | + gScrollAction = NewControlActionProc(gui_mac_scroll_action); | |
2783 | + gScrollDrag = NewControlActionProc(gui_mac_drag_thumb); | |
2761 | 2784 | #endif |
2762 | 2785 | |
2763 | 2786 | /* Getting a handle to the Help menu */ |
@@ -2769,7 +2792,7 @@ | ||
2769 | 2792 | # endif |
2770 | 2793 | |
2771 | 2794 | if (gui.MacOSHelpMenu != nil) |
2772 | - gui.MacOSHelpItems = CountMenuItems (gui.MacOSHelpMenu); | |
2795 | + gui.MacOSHelpItems = CountMenuItems(gui.MacOSHelpMenu); | |
2773 | 2796 | else |
2774 | 2797 | gui.MacOSHelpItems = 0; |
2775 | 2798 | #endif |
@@ -2781,25 +2804,25 @@ | ||
2781 | 2804 | #endif |
2782 | 2805 | #ifdef USE_EXE_NAME |
2783 | 2806 | # ifndef USE_FIND_BUNDLE_PATH |
2784 | - HGetVol (volName, &applVRefNum, &applDirID); | |
2807 | + HGetVol(volName, &applVRefNum, &applDirID); | |
2785 | 2808 | /* TN2015: mention a possible bad VRefNum */ |
2786 | - FSMakeFSSpec (applVRefNum, applDirID, "\p", &applDir); | |
2809 | + FSMakeFSSpec(applVRefNum, applDirID, "\p", &applDir); | |
2787 | 2810 | # else |
2788 | 2811 | /* OSErr GetApplicationBundleFSSpec(FSSpecPtr theFSSpecPtr) |
2789 | 2812 | * of TN2015 |
2790 | 2813 | * This technic remove the ../Contents/MacOS/etc part |
2791 | 2814 | */ |
2792 | - (void) GetCurrentProcess(&psn); | |
2815 | + (void)GetCurrentProcess(&psn); | |
2793 | 2816 | /* if (err != noErr) return err; */ |
2794 | 2817 | |
2795 | - (void) GetProcessBundleLocation(&psn, &applFSRef); | |
2818 | + (void)GetProcessBundleLocation(&psn, &applFSRef); | |
2796 | 2819 | /* if (err != noErr) return err; */ |
2797 | 2820 | |
2798 | - (void) FSGetCatalogInfo(&applFSRef, kFSCatInfoNone, NULL, NULL, &applDir, NULL); | |
2821 | + (void)FSGetCatalogInfo(&applFSRef, kFSCatInfoNone, NULL, NULL, &applDir, NULL); | |
2799 | 2822 | |
2800 | 2823 | /* This technic return NIL when we disallow_gui */ |
2801 | 2824 | # endif |
2802 | - exe_name = FullPathFromFSSpec_save (applDir); | |
2825 | + exe_name = FullPathFromFSSpec_save(applDir); | |
2803 | 2826 | #endif |
2804 | 2827 | |
2805 | 2828 | #ifdef USE_VIM_CREATOR_ID |
@@ -2925,28 +2948,28 @@ | ||
2925 | 2948 | SIOUXSettings.showstatusline = true; |
2926 | 2949 | SIOUXSettings.toppixel = 300; |
2927 | 2950 | SIOUXSettings.leftpixel = 10; |
2928 | - InstallConsole (1); /* fileno(stdout) = 1, on page 430 of MSL C */ | |
2929 | - printf ("Debugging console enabled\n"); | |
2930 | - /* SIOUXSetTitle ((char_u *) "Vim Stdout"); */ | |
2931 | -#endif | |
2932 | - | |
2933 | - pomme = NewMenu (256, "\p\024"); /* 0x14= = Apple Menu */ | |
2934 | - | |
2935 | - AppendMenu (pomme, "\pAbout VIM"); | |
2951 | + InstallConsole(1); /* fileno(stdout) = 1, on page 430 of MSL C */ | |
2952 | + printf("Debugging console enabled\n"); | |
2953 | + /* SIOUXSetTitle((char_u *) "Vim Stdout"); */ | |
2954 | +#endif | |
2955 | + | |
2956 | + pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */ | |
2957 | + | |
2958 | + AppendMenu(pomme, "\pAbout VIM"); | |
2936 | 2959 | #ifndef USE_CARBONIZED |
2937 | - AppendMenu (pomme, "\p-"); | |
2938 | - AppendResMenu (pomme, 'DRVR'); | |
2939 | -#endif | |
2940 | - | |
2941 | - InsertMenu (pomme, 0); | |
2960 | + AppendMenu(pomme, "\p-"); | |
2961 | + AppendResMenu(pomme, 'DRVR'); | |
2962 | +#endif | |
2963 | + | |
2964 | + InsertMenu(pomme, 0); | |
2942 | 2965 | |
2943 | 2966 | DrawMenuBar(); |
2944 | 2967 | |
2945 | 2968 | |
2946 | 2969 | #ifndef USE_OFFSETED_WINDOW |
2947 | - SetRect (&windRect, 10, 48, 10+80*7 + 16, 48+24*11); | |
2970 | + SetRect(&windRect, 10, 48, 10+80*7 + 16, 48+24*11); | |
2948 | 2971 | #else |
2949 | - SetRect (&windRect, 300, 40, 300+80*7 + 16, 40+24*11); | |
2972 | + SetRect(&windRect, 300, 40, 300+80*7 + 16, 40+24*11); | |
2950 | 2973 | #endif |
2951 | 2974 | |
2952 | 2975 | gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true, |
@@ -2959,7 +2982,7 @@ | ||
2959 | 2982 | InstallReceiveHandler((DragReceiveHandlerUPP)receiveHandler, |
2960 | 2983 | gui.VimWindow, NULL); |
2961 | 2984 | #ifdef USE_CARBONIZED |
2962 | - SetPortWindowPort ( gui.VimWindow ); | |
2985 | + SetPortWindowPort(gui.VimWindow); | |
2963 | 2986 | #else |
2964 | 2987 | SetPort(gui.VimWindow); |
2965 | 2988 | #endif |
@@ -2972,11 +2995,11 @@ | ||
2972 | 2995 | gui.in_focus = TRUE; /* For the moment -> syn. of front application */ |
2973 | 2996 | |
2974 | 2997 | #if TARGET_API_MAC_CARBON |
2975 | - gScrollAction = NewControlActionUPP (gui_mac_scroll_action); | |
2976 | - gScrollDrag = NewControlActionUPP (gui_mac_drag_thumb); | |
2998 | + gScrollAction = NewControlActionUPP(gui_mac_scroll_action); | |
2999 | + gScrollDrag = NewControlActionUPP(gui_mac_drag_thumb); | |
2977 | 3000 | #else |
2978 | - gScrollAction = NewControlActionProc (gui_mac_scroll_action); | |
2979 | - gScrollDrag = NewControlActionProc (gui_mac_drag_thumb); | |
3001 | + gScrollAction = NewControlActionProc(gui_mac_scroll_action); | |
3002 | + gScrollDrag = NewControlActionProc(gui_mac_drag_thumb); | |
2980 | 3003 | #endif |
2981 | 3004 | |
2982 | 3005 | /* Getting a handle to the Help menu */ |
@@ -2988,7 +3011,7 @@ | ||
2988 | 3011 | # endif |
2989 | 3012 | |
2990 | 3013 | if (gui.MacOSHelpMenu != nil) |
2991 | - gui.MacOSHelpItems = CountMenuItems (gui.MacOSHelpMenu); | |
3014 | + gui.MacOSHelpItems = CountMenuItems(gui.MacOSHelpMenu); | |
2992 | 3015 | else |
2993 | 3016 | gui.MacOSHelpItems = 0; |
2994 | 3017 | #endif |
@@ -3123,7 +3146,7 @@ | ||
3123 | 3146 | OSStatus status; |
3124 | 3147 | |
3125 | 3148 | /* Carbon >= 1.0.2, MacOS >= 8.5 */ |
3126 | - status = GetWindowBounds (gui.VimWindow, kWindowStructureRgn, &bounds); | |
3149 | + status = GetWindowBounds(gui.VimWindow, kWindowStructureRgn, &bounds); | |
3127 | 3150 | |
3128 | 3151 | if (status != noErr) |
3129 | 3152 | return FAIL; |
@@ -3164,10 +3187,10 @@ | ||
3164 | 3187 | if (gui.which_scrollbars[SBAR_LEFT]) |
3165 | 3188 | { |
3166 | 3189 | #ifdef USE_CARBONIZED |
3167 | - VimPort = GetWindowPort ( gui.VimWindow ); | |
3168 | - GetPortBounds (VimPort, &VimBound); | |
3190 | + VimPort = GetWindowPort(gui.VimWindow); | |
3191 | + GetPortBounds(VimPort, &VimBound); | |
3169 | 3192 | VimBound.left = -gui.scrollbar_width; /* + 1;*/ |
3170 | - SetPortBounds (VimPort, &VimBound); | |
3193 | + SetPortBounds(VimPort, &VimBound); | |
3171 | 3194 | /* GetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &winPortRect); ??*/ |
3172 | 3195 | #else |
3173 | 3196 | gui.VimWindow->portRect.left = -gui.scrollbar_width; /* + 1;*/ |
@@ -3177,10 +3200,10 @@ | ||
3177 | 3200 | else |
3178 | 3201 | { |
3179 | 3202 | #ifdef USE_CARBONIZED |
3180 | - VimPort = GetWindowPort ( gui.VimWindow ); | |
3181 | - GetPortBounds (VimPort, &VimBound); | |
3203 | + VimPort = GetWindowPort(gui.VimWindow); | |
3204 | + GetPortBounds(VimPort, &VimBound); | |
3182 | 3205 | VimBound.left = 0; |
3183 | - SetPortBounds (VimPort, &VimBound); | |
3206 | + SetPortBounds(VimPort, &VimBound); | |
3184 | 3207 | #else |
3185 | 3208 | gui.VimWindow->portRect.left = 0; |
3186 | 3209 | #endif; |
@@ -3241,20 +3264,20 @@ | ||
3241 | 3264 | } |
3242 | 3265 | else |
3243 | 3266 | { |
3244 | - font = gui_mac_find_font (font_name); | |
3267 | + font = gui_mac_find_font(font_name); | |
3245 | 3268 | |
3246 | 3269 | if (font == NOFONT) |
3247 | 3270 | return FAIL; |
3248 | 3271 | } |
3249 | 3272 | gui.norm_font = font; |
3250 | 3273 | |
3251 | - TextSize (font >> 16); | |
3252 | - TextFont (font & 0xFFFF); | |
3253 | - | |
3254 | - GetFontInfo (&font_info); | |
3274 | + TextSize(font >> 16); | |
3275 | + TextFont(font & 0xFFFF); | |
3276 | + | |
3277 | + GetFontInfo(&font_info); | |
3255 | 3278 | |
3256 | 3279 | gui.char_ascent = font_info.ascent; |
3257 | - gui.char_width = CharWidth ('_'); | |
3280 | + gui.char_width = CharWidth('_'); | |
3258 | 3281 | gui.char_height = font_info.ascent + font_info.descent + p_linespace; |
3259 | 3282 | |
3260 | 3283 | return OK; |
@@ -3266,7 +3289,7 @@ | ||
3266 | 3289 | { |
3267 | 3290 | FontInfo font_info; |
3268 | 3291 | |
3269 | - GetFontInfo (&font_info); | |
3292 | + GetFontInfo(&font_info); | |
3270 | 3293 | gui.char_height = font_info.ascent + font_info.descent + p_linespace; |
3271 | 3294 | gui.char_ascent = font_info.ascent + p_linespace / 2; |
3272 | 3295 | return OK; |
@@ -3425,10 +3448,10 @@ | ||
3425 | 3448 | } |
3426 | 3449 | else |
3427 | 3450 | { |
3428 | - if (STRICMP (name, "hilite") == 0) | |
3451 | + if (STRICMP(name, "hilite") == 0) | |
3429 | 3452 | { |
3430 | - LMGetHiliteRGB (&MacColor); | |
3431 | - return (RGB (MacColor.red >> 8, MacColor.green >> 8, MacColor.blue >> 8)); | |
3453 | + LMGetHiliteRGB(&MacColor); | |
3454 | + return (RGB(MacColor.red >> 8, MacColor.green >> 8, MacColor.blue >> 8)); | |
3432 | 3455 | } |
3433 | 3456 | /* Check if the name is one of the colors we know */ |
3434 | 3457 | for (i = 0; i < sizeof(table) / sizeof(table[0]); i++) |
@@ -3504,7 +3527,7 @@ | ||
3504 | 3527 | TheColor.green = Green(color) * 0x0101; |
3505 | 3528 | TheColor.blue = Blue(color) * 0x0101; |
3506 | 3529 | |
3507 | - RGBForeColor (&TheColor); | |
3530 | + RGBForeColor(&TheColor); | |
3508 | 3531 | } |
3509 | 3532 | |
3510 | 3533 | /* |
@@ -3520,7 +3543,7 @@ | ||
3520 | 3543 | TheColor.green = Green(color) * 0x0101; |
3521 | 3544 | TheColor.blue = Blue(color) * 0x0101; |
3522 | 3545 | |
3523 | - RGBBackColor (&TheColor); | |
3546 | + RGBBackColor(&TheColor); | |
3524 | 3547 | } |
3525 | 3548 | |
3526 | 3549 | void |
@@ -3597,31 +3620,31 @@ | ||
3597 | 3620 | #endif |
3598 | 3621 | { |
3599 | 3622 | /* Use old-style, non-antialiased QuickDraw text rendering. */ |
3600 | - TextMode (srcCopy); | |
3601 | - TextFace (normal); | |
3623 | + TextMode(srcCopy); | |
3624 | + TextFace(normal); | |
3602 | 3625 | |
3603 | 3626 | /* SelectFont(hdc, gui.currFont); */ |
3604 | 3627 | |
3605 | 3628 | if (flags & DRAW_TRANSP) |
3606 | 3629 | { |
3607 | - TextMode (srcOr); | |
3630 | + TextMode(srcOr); | |
3608 | 3631 | } |
3609 | 3632 | |
3610 | - MoveTo (TEXT_X(col), TEXT_Y(row)); | |
3611 | - DrawText ((char *)s, 0, len); | |
3633 | + MoveTo(TEXT_X(col), TEXT_Y(row)); | |
3634 | + DrawText((char *)s, 0, len); | |
3612 | 3635 | |
3613 | 3636 | |
3614 | 3637 | if (flags & DRAW_BOLD) |
3615 | 3638 | { |
3616 | - TextMode (srcOr); | |
3617 | - MoveTo (TEXT_X(col) + 1, TEXT_Y(row)); | |
3618 | - DrawText ((char *)s, 0, len); | |
3639 | + TextMode(srcOr); | |
3640 | + MoveTo(TEXT_X(col) + 1, TEXT_Y(row)); | |
3641 | + DrawText((char *)s, 0, len); | |
3619 | 3642 | } |
3620 | 3643 | |
3621 | 3644 | if (flags & DRAW_UNDERL) |
3622 | 3645 | { |
3623 | - MoveTo (FILL_X(col), FILL_Y(row + 1) - 1); | |
3624 | - LineTo (FILL_X(col + len) - 1, FILL_Y(row + 1) - 1); | |
3646 | + MoveTo(FILL_X(col), FILL_Y(row + 1) - 1); | |
3647 | + LineTo(FILL_X(col + len) - 1, FILL_Y(row + 1) - 1); | |
3625 | 3648 | } |
3626 | 3649 | } |
3627 | 3650 |
@@ -3649,7 +3672,7 @@ | ||
3649 | 3672 | void |
3650 | 3673 | gui_mch_beep() |
3651 | 3674 | { |
3652 | - SysBeep (1); /* Should this be 0? (????) */ | |
3675 | + SysBeep(1); /* Should this be 0? (????) */ | |
3653 | 3676 | } |
3654 | 3677 | |
3655 | 3678 | void |
@@ -3740,7 +3763,7 @@ | ||
3740 | 3763 | |
3741 | 3764 | gui_mch_set_fg_color(color); |
3742 | 3765 | |
3743 | - FrameRect (&rc); | |
3766 | + FrameRect(&rc); | |
3744 | 3767 | } |
3745 | 3768 | |
3746 | 3769 | /* |
@@ -3767,7 +3790,7 @@ | ||
3767 | 3790 | |
3768 | 3791 | gui_mch_set_fg_color(color); |
3769 | 3792 | |
3770 | - PaintRect (&rc); | |
3793 | + PaintRect(&rc); | |
3771 | 3794 | } |
3772 | 3795 | |
3773 | 3796 |
@@ -3791,7 +3814,7 @@ | ||
3791 | 3814 | */ |
3792 | 3815 | EventRecord theEvent; |
3793 | 3816 | |
3794 | - if (EventAvail (everyEvent, &theEvent)) | |
3817 | + if (EventAvail(everyEvent, &theEvent)) | |
3795 | 3818 | if (theEvent.what != nullEvent) |
3796 | 3819 | gui_mch_wait_for_chars(0); |
3797 | 3820 | } |
@@ -3806,7 +3829,7 @@ | ||
3806 | 3829 | #endif |
3807 | 3830 | pascal |
3808 | 3831 | Boolean |
3809 | -WaitNextEventWrp (EventMask eventMask, EventRecord *theEvent, UInt32 sleep, RgnHandle mouseRgn) | |
3832 | +WaitNextEventWrp(EventMask eventMask, EventRecord *theEvent, UInt32 sleep, RgnHandle mouseRgn) | |
3810 | 3833 | { |
3811 | 3834 | if (((long) sleep) < -1) |
3812 | 3835 | sleep = 32767; |
@@ -3857,7 +3880,7 @@ | ||
3857 | 3880 | else*/ if (dragRectControl == kCreateRect) |
3858 | 3881 | { |
3859 | 3882 | dragRgn = cursorRgn; |
3860 | - RectRgn (dragRgn, &dragRect); | |
3883 | + RectRgn(dragRgn, &dragRect); | |
3861 | 3884 | dragRectControl = kNothing; |
3862 | 3885 | } |
3863 | 3886 | /* |
@@ -3871,12 +3894,12 @@ | ||
3871 | 3894 | sleeppyTick = 60*wtime/1000; |
3872 | 3895 | else |
3873 | 3896 | sleeppyTick = 32767; |
3874 | - if (WaitNextEventWrp (mask, &event, sleeppyTick, dragRgn)) | |
3897 | + if (WaitNextEventWrp(mask, &event, sleeppyTick, dragRgn)) | |
3875 | 3898 | { |
3876 | 3899 | #ifdef USE_SIOUX |
3877 | 3900 | if (!SIOUXHandleOneEvent(&event)) |
3878 | 3901 | #endif |
3879 | - gui_mac_handle_event (&event); | |
3902 | + gui_mac_handle_event(&event); | |
3880 | 3903 | if (input_available()) |
3881 | 3904 | { |
3882 | 3905 | allow_scrollbar = FALSE; |
@@ -3929,7 +3952,7 @@ | ||
3929 | 3952 | rc.bottom = FILL_Y(row2 + 1); |
3930 | 3953 | |
3931 | 3954 | gui_mch_set_bg_color(gui.back_pixel); |
3932 | - EraseRect (&rc); | |
3955 | + EraseRect(&rc); | |
3933 | 3956 | } |
3934 | 3957 | |
3935 | 3958 | /* |
@@ -3970,7 +3993,7 @@ | ||
3970 | 3993 | rc.bottom = FILL_Y(gui.scroll_region_bot + 1); |
3971 | 3994 | |
3972 | 3995 | gui_mch_set_bg_color(gui.back_pixel); |
3973 | - ScrollRect (&rc, 0, -num_lines * gui.char_height, (RgnHandle) nil); | |
3996 | + ScrollRect(&rc, 0, -num_lines * gui.char_height, (RgnHandle) nil); | |
3974 | 3997 | |
3975 | 3998 | gui_clear_block(gui.scroll_region_bot - num_lines + 1, |
3976 | 3999 | gui.scroll_region_left, |
@@ -3995,7 +4018,7 @@ | ||
3995 | 4018 | |
3996 | 4019 | gui_mch_set_bg_color(gui.back_pixel); |
3997 | 4020 | |
3998 | - ScrollRect (&rc, 0, gui.char_height * num_lines, (RgnHandle) nil); | |
4021 | + ScrollRect(&rc, 0, gui.char_height * num_lines, (RgnHandle) nil); | |
3999 | 4022 | |
4000 | 4023 | /* Update gui.cursor_row if the cursor scrolled or copied over */ |
4001 | 4024 | if (gui.cursor_row >= gui.row |
@@ -4028,6 +4051,7 @@ | ||
4028 | 4051 | ScrapFlavorFlags scrapFlags; |
4029 | 4052 | ScrapRef scrap = nil; |
4030 | 4053 | OSStatus error; |
4054 | + int flavor; | |
4031 | 4055 | #else |
4032 | 4056 | long scrapOffset; |
4033 | 4057 | long scrapSize; |
@@ -4038,19 +4062,31 @@ | ||
4038 | 4062 | |
4039 | 4063 | |
4040 | 4064 | #ifdef USE_CARBONIZED |
4041 | - error = GetCurrentScrap (&scrap); | |
4065 | + error = GetCurrentScrap(&scrap); | |
4042 | 4066 | if (error != noErr) |
4043 | 4067 | return; |
4044 | 4068 | |
4045 | - error = GetScrapFlavorFlags(scrap, kScrapFlavorTypeText, &scrapFlags); | |
4046 | - if (error != noErr) | |
4047 | - return; | |
4048 | - | |
4049 | - error = GetScrapFlavorSize (scrap, kScrapFlavorTypeText, &scrapSize); | |
4050 | - if (error != noErr) | |
4051 | - return; | |
4052 | - | |
4053 | - ReserveMem (scrapSize); | |
4069 | + flavor = 0; | |
4070 | + error = GetScrapFlavorFlags(scrap, VIMSCRAPFLAVOR, &scrapFlags); | |
4071 | + if (error == noErr) | |
4072 | + { | |
4073 | + error = GetScrapFlavorSize(scrap, VIMSCRAPFLAVOR, &scrapSize); | |
4074 | + if (error == noErr && scrapSize > 1) | |
4075 | + flavor = 1; | |
4076 | + } | |
4077 | + | |
4078 | + if (flavor == 0) | |
4079 | + { | |
4080 | + error = GetScrapFlavorFlags(scrap, kScrapFlavorTypeText, &scrapFlags); | |
4081 | + if (error != noErr) | |
4082 | + return; | |
4083 | + | |
4084 | + error = GetScrapFlavorSize(scrap, kScrapFlavorTypeText, &scrapSize); | |
4085 | + if (error != noErr) | |
4086 | + return; | |
4087 | + } | |
4088 | + | |
4089 | + ReserveMem(scrapSize); | |
4054 | 4090 | #else |
4055 | 4091 | /* Call to LoadScrap seem to avoid problem with crash on first paste */ |
4056 | 4092 | scrapSize = LoadScrap(); |
@@ -4061,23 +4097,28 @@ | ||
4061 | 4097 | { |
4062 | 4098 | #ifdef USE_CARBONIZED |
4063 | 4099 | /* In CARBON we don't need a Handle, a pointer is good */ |
4064 | - textOfClip = NewHandle (scrapSize); | |
4100 | + textOfClip = NewHandle(scrapSize); | |
4065 | 4101 | /* tempclip = lalloc(scrapSize+1, TRUE); */ |
4066 | 4102 | #else |
4067 | 4103 | textOfClip = NewHandle(0); |
4068 | 4104 | #endif |
4069 | - HLock (textOfClip); | |
4105 | + HLock(textOfClip); | |
4070 | 4106 | #ifdef USE_CARBONIZED |
4071 | - error = GetScrapFlavorData (scrap, kScrapFlavorTypeText, &scrapSize, *textOfClip); | |
4107 | + error = GetScrapFlavorData(scrap, | |
4108 | + flavor ? VIMSCRAPFLAVOR : kScrapFlavorTypeText, | |
4109 | + &scrapSize, *textOfClip); | |
4072 | 4110 | #else |
4073 | 4111 | scrapSize = GetScrap(textOfClip, 'TEXT', &scrapOffset); |
4074 | 4112 | #endif |
4075 | 4113 | |
4076 | - type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR; | |
4114 | + if (flavor) | |
4115 | + type = **textOfClip; | |
4116 | + else | |
4117 | + type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR; | |
4077 | 4118 | |
4078 | 4119 | tempclip = lalloc(scrapSize+1, TRUE); |
4079 | - STRNCPY(tempclip, *textOfClip, scrapSize); | |
4080 | - tempclip[scrapSize] = 0; | |
4120 | + STRNCPY(tempclip, *textOfClip + flavor, scrapSize - flavor); | |
4121 | + tempclip[scrapSize - flavor] = 0; | |
4081 | 4122 | |
4082 | 4123 | searchCR = (char *)tempclip; |
4083 | 4124 | while (searchCR != NULL) |
@@ -4184,15 +4225,23 @@ | ||
4184 | 4225 | ZeroScrap(); |
4185 | 4226 | #endif |
4186 | 4227 | |
4228 | +#ifdef USE_CARBONIZED | |
4229 | + textOfClip = NewHandle(scrapSize + 1); | |
4230 | +#else | |
4187 | 4231 | textOfClip = NewHandle(scrapSize); |
4232 | +#endif | |
4188 | 4233 | HLock(textOfClip); |
4189 | 4234 | |
4235 | +#ifdef USE_CARBONIZED | |
4236 | + **textOfClip = type; | |
4237 | + STRNCPY(*textOfClip + 1, str, scrapSize); | |
4238 | + GetCurrentScrap(&scrap); | |
4239 | + PutScrapFlavor(scrap, kScrapFlavorTypeText, kScrapFlavorMaskNone, | |
4240 | + scrapSize, *textOfClip + 1); | |
4241 | + PutScrapFlavor(scrap, VIMSCRAPFLAVOR, kScrapFlavorMaskNone, | |
4242 | + scrapSize + 1, *textOfClip); | |
4243 | +#else | |
4190 | 4244 | STRNCPY(*textOfClip, str, scrapSize); |
4191 | -#ifdef USE_CARBONIZED | |
4192 | - GetCurrentScrap (&scrap); | |
4193 | - PutScrapFlavor(scrap, kScrapFlavorTypeText, kScrapFlavorMaskNone, | |
4194 | - scrapSize, *textOfClip); | |
4195 | -#else | |
4196 | 4245 | PutScrap(scrapSize, 'TEXT', *textOfClip); |
4197 | 4246 | #endif |
4198 | 4247 | HUnlock(textOfClip); |
@@ -4211,7 +4260,7 @@ | ||
4211 | 4260 | { |
4212 | 4261 | Rect VimBound; |
4213 | 4262 | |
4214 | -/* HideWindow (gui.VimWindow); */ | |
4263 | +/* HideWindow(gui.VimWindow); */ | |
4215 | 4264 | #ifdef USE_CARBONIZED |
4216 | 4265 | GetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &VimBound); |
4217 | 4266 | #else |
@@ -4231,7 +4280,7 @@ | ||
4231 | 4280 | SetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &VimBound); |
4232 | 4281 | #endif |
4233 | 4282 | |
4234 | - ShowWindow (gui.VimWindow); | |
4283 | + ShowWindow(gui.VimWindow); | |
4235 | 4284 | } |
4236 | 4285 | |
4237 | 4286 | /* |
@@ -4321,11 +4370,11 @@ | ||
4321 | 4370 | #endif |
4322 | 4371 | { |
4323 | 4372 | /* Carbon suggest use of |
4324 | - * OSStatus CreateNewMenu ( MenuID, MenuAttributes, MenuRef *); | |
4325 | - * OSStatus SetMenuTitle ( MenuRef, ConstStr255Param title ); | |
4373 | + * OSStatus CreateNewMenu(MenuID, MenuAttributes, MenuRef *); | |
4374 | + * OSStatus SetMenuTitle(MenuRef, ConstStr255Param title); | |
4326 | 4375 | */ |
4327 | 4376 | menu->submenu_id = next_avail_id; |
4328 | - menu->submenu_handle = NewMenu (menu->submenu_id, name); | |
4377 | + menu->submenu_handle = NewMenu(menu->submenu_id, name); | |
4329 | 4378 | next_avail_id++; |
4330 | 4379 | } |
4331 | 4380 |
@@ -4341,7 +4390,7 @@ | ||
4341 | 4390 | #ifdef USE_HELPMENU |
4342 | 4391 | if (menu->submenu_id != kHMHelpMenuID) |
4343 | 4392 | #endif |
4344 | - InsertMenu (menu->submenu_handle, menu_after_me); /* insert before */ | |
4393 | + InsertMenu(menu->submenu_handle, menu_after_me); /* insert before */ | |
4345 | 4394 | #if 1 |
4346 | 4395 | /* Vim should normally update it. TODO: verify */ |
4347 | 4396 | DrawMenuBar(); |
@@ -4351,7 +4400,7 @@ | ||
4351 | 4400 | { |
4352 | 4401 | /* Adding as a submenu */ |
4353 | 4402 | |
4354 | - index = gui_mac_get_menu_item_index (menu); | |
4403 | + index = gui_mac_get_menu_item_index(menu); | |
4355 | 4404 | |
4356 | 4405 | /* Call InsertMenuItem followed by SetMenuItemText |
4357 | 4406 | * to avoid special character recognition by InsertMenuItem |
@@ -4363,7 +4412,7 @@ | ||
4363 | 4412 | InsertMenu(menu->submenu_handle, hierMenu); |
4364 | 4413 | } |
4365 | 4414 | |
4366 | - vim_free (name); | |
4415 | + vim_free(name); | |
4367 | 4416 | |
4368 | 4417 | #if 0 |
4369 | 4418 | /* Done by Vim later on */ |
@@ -4502,7 +4551,7 @@ | ||
4502 | 4551 | gui_mch_destroy_menu(menu) |
4503 | 4552 | vimmenu_T *menu; |
4504 | 4553 | { |
4505 | - short index = gui_mac_get_menu_item_index (menu); | |
4554 | + short index = gui_mac_get_menu_item_index(menu); | |
4506 | 4555 | |
4507 | 4556 | if (index > 0) |
4508 | 4557 | { |
@@ -4513,20 +4562,20 @@ | ||
4513 | 4562 | #endif |
4514 | 4563 | { |
4515 | 4564 | /* For now just don't delete help menu items. (Huh? Dany) */ |
4516 | - DeleteMenuItem (menu->parent->submenu_handle, index); | |
4565 | + DeleteMenuItem(menu->parent->submenu_handle, index); | |
4517 | 4566 | |
4518 | 4567 | /* Delete the Menu if it was a hierarchical Menu */ |
4519 | 4568 | if (menu->submenu_id != 0) |
4520 | 4569 | { |
4521 | - DeleteMenu (menu->submenu_id); | |
4522 | - DisposeMenu (menu->submenu_handle); | |
4570 | + DeleteMenu(menu->submenu_id); | |
4571 | + DisposeMenu(menu->submenu_handle); | |
4523 | 4572 | } |
4524 | 4573 | } |
4525 | 4574 | #ifdef USE_HELPMENU |
4526 | 4575 | # ifdef DEBUG_MAC_MENU |
4527 | 4576 | else |
4528 | 4577 | { |
4529 | - printf ("gmdm 1\n"); | |
4578 | + printf("gmdm 1\n"); | |
4530 | 4579 | } |
4531 | 4580 | # endif |
4532 | 4581 | #endif |
@@ -4534,7 +4583,7 @@ | ||
4534 | 4583 | #ifdef DEBUG_MAC_MENU |
4535 | 4584 | else |
4536 | 4585 | { |
4537 | - printf ("gmdm 2\n"); | |
4586 | + printf("gmdm 2\n"); | |
4538 | 4587 | } |
4539 | 4588 | #endif |
4540 | 4589 | } |
@@ -4545,8 +4594,8 @@ | ||
4545 | 4594 | if (menu->submenu_id != kHMHelpMenuID) |
4546 | 4595 | #endif |
4547 | 4596 | { |
4548 | - DeleteMenu (menu->submenu_id); | |
4549 | - DisposeMenu (menu->submenu_handle); | |
4597 | + DeleteMenu(menu->submenu_id); | |
4598 | + DisposeMenu(menu->submenu_handle); | |
4550 | 4599 | } |
4551 | 4600 | } |
4552 | 4601 | /* Shouldn't this be already done by Vim. TODO: Check */ |
@@ -4562,7 +4611,7 @@ | ||
4562 | 4611 | int grey; |
4563 | 4612 | { |
4564 | 4613 | /* TODO: Check if menu really exists */ |
4565 | - short index = gui_mac_get_menu_item_index (menu); | |
4614 | + short index = gui_mac_get_menu_item_index(menu); | |
4566 | 4615 | /* |
4567 | 4616 | index = menu->index; |
4568 | 4617 | */ |
@@ -4593,7 +4642,7 @@ | ||
4593 | 4642 | int hidden; |
4594 | 4643 | { |
4595 | 4644 | /* There's no hidden mode on MacOS */ |
4596 | - gui_mch_menu_grey (menu, hidden); | |
4645 | + gui_mch_menu_grey(menu, hidden); | |
4597 | 4646 | } |
4598 | 4647 | |
4599 | 4648 |
@@ -4622,7 +4671,7 @@ | ||
4622 | 4671 | HideControl(sb->id); |
4623 | 4672 | |
4624 | 4673 | #ifdef DEBUG_MAC_SB |
4625 | - printf ("enb_sb (%x) %x\n",sb->id, flag); | |
4674 | + printf("enb_sb (%x) %x\n",sb->id, flag); | |
4626 | 4675 | #endif |
4627 | 4676 | } |
4628 | 4677 |
@@ -4637,7 +4686,7 @@ | ||
4637 | 4686 | SetControl32BitMinimum (sb->id, 0); |
4638 | 4687 | SetControl32BitValue (sb->id, val); |
4639 | 4688 | #ifdef DEBUG_MAC_SB |
4640 | - printf ("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max); | |
4689 | + printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max); | |
4641 | 4690 | #endif |
4642 | 4691 | } |
4643 | 4692 |
@@ -4652,13 +4701,13 @@ | ||
4652 | 4701 | gui_mch_set_bg_color(gui.back_pixel); |
4653 | 4702 | /* if (gui.which_scrollbars[SBAR_LEFT]) |
4654 | 4703 | { |
4655 | - MoveControl (sb->id, x-16, y); | |
4656 | - SizeControl (sb->id, w + 1, h); | |
4704 | + MoveControl(sb->id, x-16, y); | |
4705 | + SizeControl(sb->id, w + 1, h); | |
4657 | 4706 | } |
4658 | 4707 | else |
4659 | 4708 | { |
4660 | - MoveControl (sb->id, x, y); | |
4661 | - SizeControl (sb->id, w + 1, h); | |
4709 | + MoveControl(sb->id, x, y); | |
4710 | + SizeControl(sb->id, w + 1, h); | |
4662 | 4711 | }*/ |
4663 | 4712 | if (sb == &gui.bottom_sbar) |
4664 | 4713 | h += 1; |
@@ -4668,10 +4717,10 @@ | ||
4668 | 4717 | if (gui.which_scrollbars[SBAR_LEFT]) |
4669 | 4718 | x -= 15; |
4670 | 4719 | |
4671 | - MoveControl (sb->id, x, y); | |
4672 | - SizeControl (sb->id, w, h); | |
4720 | + MoveControl(sb->id, x, y); | |
4721 | + SizeControl(sb->id, w, h); | |
4673 | 4722 | #ifdef DEBUG_MAC_SB |
4674 | - printf ("size_sb (%x) %x, %x, %x, %x\n",sb->id, x, y, w, h); | |
4723 | + printf("size_sb (%x) %x, %x, %x, %x\n",sb->id, x, y, w, h); | |
4675 | 4724 | #endif |
4676 | 4725 | } |
4677 | 4726 |
@@ -4687,7 +4736,7 @@ | ||
4687 | 4736 | bounds.right = -10; |
4688 | 4737 | bounds.left = -16; |
4689 | 4738 | |
4690 | - sb->id = NewControl (gui.VimWindow, | |
4739 | + sb->id = NewControl(gui.VimWindow, | |
4691 | 4740 | &bounds, |
4692 | 4741 | "\pScrollBar", |
4693 | 4742 | TRUE, |
@@ -4701,7 +4750,7 @@ | ||
4701 | 4750 | #endif |
4702 | 4751 | (long) sb->ident); |
4703 | 4752 | #ifdef DEBUG_MAC_SB |
4704 | - printf ("create_sb (%x) %x\n",sb->id, orient); | |
4753 | + printf("create_sb (%x) %x\n",sb->id, orient); | |
4705 | 4754 | #endif |
4706 | 4755 | } |
4707 | 4756 |
@@ -4710,9 +4759,9 @@ | ||
4710 | 4759 | scrollbar_T *sb; |
4711 | 4760 | { |
4712 | 4761 | gui_mch_set_bg_color(gui.back_pixel); |
4713 | - DisposeControl (sb->id); | |
4762 | + DisposeControl(sb->id); | |
4714 | 4763 | #ifdef DEBUG_MAC_SB |
4715 | - printf ("dest_sb (%x) \n",sb->id); | |
4764 | + printf("dest_sb (%x) \n",sb->id); | |
4716 | 4765 | #endif |
4717 | 4766 | } |
4718 | 4767 |
@@ -4818,7 +4867,7 @@ | ||
4818 | 4867 | OSErr error; |
4819 | 4868 | |
4820 | 4869 | /* Get Navigation Service Defaults value */ |
4821 | - NavGetDefaultDialogOptions (&navOptions); | |
4870 | + NavGetDefaultDialogOptions(&navOptions); | |
4822 | 4871 | |
4823 | 4872 | |
4824 | 4873 | /* TODO: If we get a :browse args, set the Multiple bit. */ |
@@ -4828,8 +4877,8 @@ | ||
4828 | 4877 | /* | kNavAllowMultipleFiles */ |
4829 | 4878 | | kNavAllowStationery; |
4830 | 4879 | |
4831 | - (void) C2PascalString (title, &navOptions.message); | |
4832 | - (void) C2PascalString (dflt, &navOptions.savedFileName); | |
4880 | + (void) C2PascalString(title, &navOptions.message); | |
4881 | + (void) C2PascalString(dflt, &navOptions.savedFileName); | |
4833 | 4882 | /* Could set clientName? |
4834 | 4883 | * windowTitle? (there's no title bar?) |
4835 | 4884 | */ |
@@ -4837,7 +4886,7 @@ | ||
4837 | 4886 | if (saving) |
4838 | 4887 | { |
4839 | 4888 | /* Change first parm AEDesc (typeFSS) *defaultLocation to match dflt */ |
4840 | - NavPutFile (NULL, &reply, &navOptions, NULL, 'TEXT', 'VIM!', NULL); | |
4889 | + NavPutFile(NULL, &reply, &navOptions, NULL, 'TEXT', 'VIM!', NULL); | |
4841 | 4890 | if (!reply.validRecord) |
4842 | 4891 | return NULL; |
4843 | 4892 | } |
@@ -4851,7 +4900,7 @@ | ||
4851 | 4900 | |
4852 | 4901 | fnames = new_fnames_from_AEDesc(&reply.selection, &numFiles, &error); |
4853 | 4902 | |
4854 | - NavDisposeReply (&reply); | |
4903 | + NavDisposeReply(&reply); | |
4855 | 4904 | |
4856 | 4905 | if (fnames) |
4857 | 4906 | { |
@@ -4870,26 +4919,26 @@ | ||
4870 | 4919 | |
4871 | 4920 | /* TODO: split dflt in path and filename */ |
4872 | 4921 | |
4873 | - (void) C2PascalString (title, &Prompt); | |
4874 | - (void) C2PascalString (dflt, &DefaultName); | |
4875 | - (void) C2PascalString (initdir, &Directory); | |
4922 | + (void) C2PascalString(title, &Prompt); | |
4923 | + (void) C2PascalString(dflt, &DefaultName); | |
4924 | + (void) C2PascalString(initdir, &Directory); | |
4876 | 4925 | |
4877 | 4926 | if (saving) |
4878 | 4927 | { |
4879 | 4928 | /* Use a custon filter instead of nil FAQ 9-4 */ |
4880 | - StandardPutFile (Prompt, DefaultName, &reply); | |
4929 | + StandardPutFile(Prompt, DefaultName, &reply); | |
4881 | 4930 | if (!reply.sfGood) |
4882 | 4931 | return NULL; |
4883 | 4932 | } |
4884 | 4933 | else |
4885 | 4934 | { |
4886 | - StandardGetFile (nil, -1, fileTypes, &reply); | |
4935 | + StandardGetFile(nil, -1, fileTypes, &reply); | |
4887 | 4936 | if (!reply.sfGood) |
4888 | 4937 | return NULL; |
4889 | 4938 | } |
4890 | 4939 | |
4891 | 4940 | /* Work fine but append a : for new file */ |
4892 | - return (FullPathFromFSSpec_save (reply.sfFile)); | |
4941 | + return (FullPathFromFSSpec_save(reply.sfFile)); | |
4893 | 4942 | |
4894 | 4943 | /* Shorten the file name if possible */ |
4895 | 4944 | /* mch_dirname(IObuff, IOSIZE); |
@@ -4943,9 +4992,9 @@ | ||
4943 | 4992 | { |
4944 | 4993 | #if 0 /* USE_CARBONIZED */ |
4945 | 4994 | /* Untested */ |
4946 | - MoveDialogItem (theDialog, itemNumber, X, Y); | |
4995 | + MoveDialogItem(theDialog, itemNumber, X, Y); | |
4947 | 4996 | if (inBox != nil) |
4948 | - GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, inBox); | |
4997 | + GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, inBox); | |
4949 | 4998 | #else |
4950 | 4999 | short itemType; |
4951 | 5000 | Handle itemHandle; |
@@ -4955,14 +5004,14 @@ | ||
4955 | 5004 | if (inBox != nil) |
4956 | 5005 | itemBox = inBox; |
4957 | 5006 | |
4958 | - GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, itemBox); | |
4959 | - OffsetRect (itemBox, -itemBox->left, -itemBox->top); | |
4960 | - OffsetRect (itemBox, X, Y); | |
5007 | + GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, itemBox); | |
5008 | + OffsetRect(itemBox, -itemBox->left, -itemBox->top); | |
5009 | + OffsetRect(itemBox, X, Y); | |
4961 | 5010 | /* To move a control (like a button) we need to call both |
4962 | 5011 | * MoveControl and SetDialogItem. FAQ 6-18 */ |
4963 | 5012 | if (1) /*(itemType & kControlDialogItem) */ |
4964 | - MoveControl ((ControlRef) itemHandle, X, Y); | |
4965 | - SetDialogItem (theDialog, itemNumber, itemType, itemHandle, itemBox); | |
5013 | + MoveControl((ControlRef) itemHandle, X, Y); | |
5014 | + SetDialogItem(theDialog, itemNumber, itemType, itemHandle, itemBox); | |
4966 | 5015 | #endif |
4967 | 5016 | } |
4968 | 5017 |
@@ -4977,7 +5026,7 @@ | ||
4977 | 5026 | Handle itemHandle; |
4978 | 5027 | Rect itemBox; |
4979 | 5028 | |
4980 | - GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, &itemBox); | |
5029 | + GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, &itemBox); | |
4981 | 5030 | |
4982 | 5031 | /* When width or height is zero do not change it */ |
4983 | 5032 | if (width == 0) |
@@ -4986,7 +5035,7 @@ | ||
4986 | 5035 | height = itemBox.bottom - itemBox.top; |
4987 | 5036 | |
4988 | 5037 | #if 0 /* USE_CARBONIZED */ |
4989 | - SizeDialogItem (theDialog, itemNumber, width, height); /* Untested */ | |
5038 | + SizeDialogItem(theDialog, itemNumber, width, height); /* Untested */ | |
4990 | 5039 | #else |
4991 | 5040 | /* Resize the bounding box */ |
4992 | 5041 | itemBox.right = itemBox.left + width; |
@@ -4995,10 +5044,10 @@ | ||
4995 | 5044 | /* To resize a control (like a button) we need to call both |
4996 | 5045 | * SizeControl and SetDialogItem. (deducted from FAQ 6-18) */ |
4997 | 5046 | if (itemType & kControlDialogItem) |
4998 | - SizeControl ((ControlRef) itemHandle, width, height); | |
5047 | + SizeControl((ControlRef) itemHandle, width, height); | |
4999 | 5048 | |
5000 | 5049 | /* Configure back the item */ |
5001 | - SetDialogItem (theDialog, itemNumber, itemType, itemHandle, &itemBox); | |
5050 | + SetDialogItem(theDialog, itemNumber, itemType, itemHandle, &itemBox); | |
5002 | 5051 | #endif |
5003 | 5052 | } |
5004 | 5053 |
@@ -5012,12 +5061,12 @@ | ||
5012 | 5061 | Handle itemHandle; |
5013 | 5062 | Rect itemBox; |
5014 | 5063 | |
5015 | - GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, &itemBox); | |
5064 | + GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, &itemBox); | |
5016 | 5065 | |
5017 | 5066 | if (itemType & kControlDialogItem) |
5018 | - SetControlTitle ((ControlRef) itemHandle, itemName); | |
5067 | + SetControlTitle((ControlRef) itemHandle, itemName); | |
5019 | 5068 | else |
5020 | - SetDialogItemText (itemHandle, itemName); | |
5069 | + SetDialogItemText(itemHandle, itemName); | |
5021 | 5070 | } |
5022 | 5071 | |
5023 | 5072 | int |
@@ -5072,7 +5121,7 @@ | ||
5072 | 5121 | vertical = (vim_strchr(p_go, GO_VERTICAL) != NULL); |
5073 | 5122 | |
5074 | 5123 | /* Create a new Dialog Box from template. */ |
5075 | - theDialog = GetNewDialog (129, nil, (WindowRef) -1); | |
5124 | + theDialog = GetNewDialog(129, nil, (WindowRef) -1); | |
5076 | 5125 | |
5077 | 5126 | /* Get the WindowRef */ |
5078 | 5127 | theWindow = GetDialogWindow(theDialog); |
@@ -5083,15 +5132,15 @@ | ||
5083 | 5132 | * within a visible window. (non-Carbon MacOS 9) |
5084 | 5133 | * Could be avoided by changing the resource. |
5085 | 5134 | */ |
5086 | - HideWindow (theWindow); | |
5135 | + HideWindow(theWindow); | |
5087 | 5136 | |
5088 | 5137 | /* Change the graphical port to the dialog, |
5089 | 5138 | * so we can measure the text with the proper font */ |
5090 | - GetPort (&oldPort); | |
5139 | + GetPort(&oldPort); | |
5091 | 5140 | #ifdef USE_CARBONIZED |
5092 | - SetPortDialogPort (theDialog); | |
5141 | + SetPortDialogPort(theDialog); | |
5093 | 5142 | #else |
5094 | - SetPort (theDialog); | |
5143 | + SetPort(theDialog); | |
5095 | 5144 | #endif |
5096 | 5145 | |
5097 | 5146 | /* Get the info about the default text, |
@@ -5102,12 +5151,12 @@ | ||
5102 | 5151 | /* Set the dialog title */ |
5103 | 5152 | if (title != NULL) |
5104 | 5153 | { |
5105 | - (void) C2PascalString (title, &PascalTitle); | |
5106 | - SetWTitle (theWindow, PascalTitle); | |
5154 | + (void) C2PascalString(title, &PascalTitle); | |
5155 | + SetWTitle(theWindow, PascalTitle); | |
5107 | 5156 | } |
5108 | 5157 | |
5109 | 5158 | /* Creates the buttons and add them to the Dialog Box. */ |
5110 | - buttonDITL = GetResource ('DITL', 130); | |
5159 | + buttonDITL = GetResource('DITL', 130); | |
5111 | 5160 | buttonChar = buttons; |
5112 | 5161 | button = 0; |
5113 | 5162 |
@@ -5126,30 +5175,30 @@ | ||
5126 | 5175 | name[0] = len; |
5127 | 5176 | |
5128 | 5177 | /* Add the button */ |
5129 | - AppendDITL (theDialog, buttonDITL, overlayDITL); /* appendDITLRight); */ | |
5178 | + AppendDITL(theDialog, buttonDITL, overlayDITL); /* appendDITLRight); */ | |
5130 | 5179 | |
5131 | 5180 | /* Change the button's name */ |
5132 | - macSetDialogItemText (theDialog, button, name); | |
5181 | + macSetDialogItemText(theDialog, button, name); | |
5133 | 5182 | |
5134 | 5183 | /* Resize the button to fit its name */ |
5135 | - width = StringWidth (name) + 2 * dfltButtonEdge; | |
5184 | + width = StringWidth(name) + 2 * dfltButtonEdge; | |
5136 | 5185 | /* Limite the size of any button to an acceptable value. */ |
5137 | 5186 | /* TODO: Should be based on the message width */ |
5138 | 5187 | if (width > maxButtonWidth) |
5139 | 5188 | width = maxButtonWidth; |
5140 | - macSizeDialogItem (theDialog, button, width, 0); | |
5189 | + macSizeDialogItem(theDialog, button, width, 0); | |
5141 | 5190 | |
5142 | 5191 | totalButtonWidth += width; |
5143 | 5192 | |
5144 | 5193 | if (width > widestButton) |
5145 | 5194 | widestButton = width; |
5146 | 5195 | } |
5147 | - ReleaseResource (buttonDITL); | |
5196 | + ReleaseResource(buttonDITL); | |
5148 | 5197 | lastButton = button; |
5149 | 5198 | |
5150 | 5199 | /* Add the icon to the Dialog Box. */ |
5151 | 5200 | iconItm.idx = lastButton + 1; |
5152 | - iconDITL = GetResource ('DITL', 131); | |
5201 | + iconDITL = GetResource('DITL', 131); | |
5153 | 5202 | switch (type) |
5154 | 5203 | { |
5155 | 5204 | case VIM_GENERIC: useIcon = kNoteIcon; |
@@ -5159,41 +5208,41 @@ | ||
5159 | 5208 | case VIM_QUESTION: useIcon = kNoteIcon; |
5160 | 5209 | default: useIcon = kStopIcon; |
5161 | 5210 | }; |
5162 | - AppendDITL (theDialog, iconDITL, overlayDITL); | |
5163 | - ReleaseResource (iconDITL); | |
5164 | - GetDialogItem (theDialog, iconItm.idx, &itemType, &itemHandle, &box); | |
5211 | + AppendDITL(theDialog, iconDITL, overlayDITL); | |
5212 | + ReleaseResource(iconDITL); | |
5213 | + GetDialogItem(theDialog, iconItm.idx, &itemType, &itemHandle, &box); | |
5165 | 5214 | /* TODO: Should the item be freed? */ |
5166 | - iconHandle = GetIcon (useIcon); | |
5167 | - SetDialogItem (theDialog, iconItm.idx, itemType, iconHandle, &box); | |
5215 | + iconHandle = GetIcon(useIcon); | |
5216 | + SetDialogItem(theDialog, iconItm.idx, itemType, iconHandle, &box); | |
5168 | 5217 | |
5169 | 5218 | /* Add the message to the Dialog box. */ |
5170 | 5219 | messageItm.idx = lastButton + 2; |
5171 | - messageDITL = GetResource ('DITL', 132); | |
5172 | - AppendDITL (theDialog, messageDITL, overlayDITL); | |
5173 | - ReleaseResource (messageDITL); | |
5174 | - GetDialogItem (theDialog, messageItm.idx, &itemType, &itemHandle, &box); | |
5175 | - (void) C2PascalString (message, &name); | |
5176 | - SetDialogItemText (itemHandle, name); | |
5177 | - messageItm.width = StringWidth (name); | |
5220 | + messageDITL = GetResource('DITL', 132); | |
5221 | + AppendDITL(theDialog, messageDITL, overlayDITL); | |
5222 | + ReleaseResource(messageDITL); | |
5223 | + GetDialogItem(theDialog, messageItm.idx, &itemType, &itemHandle, &box); | |
5224 | + (void) C2PascalString(message, &name); | |
5225 | + SetDialogItemText(itemHandle, name); | |
5226 | + messageItm.width = StringWidth(name); | |
5178 | 5227 | |
5179 | 5228 | /* Add the input box if needed */ |
5180 | 5229 | if (textfield != NULL) |
5181 | 5230 | { |
5182 | 5231 | /* Cheat for now reuse the message and convet to text edit */ |
5183 | 5232 | inputItm.idx = lastButton + 3; |
5184 | - inputDITL = GetResource ('DITL', 132); | |
5185 | - AppendDITL (theDialog, inputDITL, overlayDITL); | |
5186 | - ReleaseResource (inputDITL); | |
5187 | - GetDialogItem (theDialog, inputItm.idx, &itemType, &itemHandle, &box); | |
5188 | -/* SetDialogItem (theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &box);*/ | |
5189 | - (void) C2PascalString (textfield, &name); | |
5190 | - SetDialogItemText (itemHandle, name); | |
5191 | - inputItm.width = StringWidth (name); | |
5233 | + inputDITL = GetResource('DITL', 132); | |
5234 | + AppendDITL(theDialog, inputDITL, overlayDITL); | |
5235 | + ReleaseResource(inputDITL); | |
5236 | + GetDialogItem(theDialog, inputItm.idx, &itemType, &itemHandle, &box); | |
5237 | +/* SetDialogItem(theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &box);*/ | |
5238 | + (void) C2PascalString(textfield, &name); | |
5239 | + SetDialogItemText(itemHandle, name); | |
5240 | + inputItm.width = StringWidth(name); | |
5192 | 5241 | } |
5193 | 5242 | |
5194 | 5243 | /* Set the <ENTER> and <ESC> button. */ |
5195 | - SetDialogDefaultItem (theDialog, dfltbutton); | |
5196 | - SetDialogCancelItem (theDialog, 0); | |
5244 | + SetDialogDefaultItem(theDialog, dfltbutton); | |
5245 | + SetDialogCancelItem(theDialog, 0); | |
5197 | 5246 | |
5198 | 5247 | /* Reposition element */ |
5199 | 5248 |
@@ -5202,26 +5251,26 @@ | ||
5202 | 5251 | vertical = TRUE; |
5203 | 5252 | |
5204 | 5253 | /* Place icon */ |
5205 | - macMoveDialogItem (theDialog, iconItm.idx, dfltIconSideSpace, dfltElementSpacing, &box); | |
5254 | + macMoveDialogItem(theDialog, iconItm.idx, dfltIconSideSpace, dfltElementSpacing, &box); | |
5206 | 5255 | iconItm.box.right = box.right; |
5207 | 5256 | iconItm.box.bottom = box.bottom; |
5208 | 5257 | |
5209 | 5258 | /* Place Message */ |
5210 | 5259 | messageItm.box.left = iconItm.box.right + dfltIconSideSpace; |
5211 | - macSizeDialogItem (theDialog, messageItm.idx, 0, messageLines * (textFontInfo.ascent + textFontInfo.descent)); | |
5212 | - macMoveDialogItem (theDialog, messageItm.idx, messageItm.box.left, dfltElementSpacing, &messageItm.box); | |
5260 | + macSizeDialogItem(theDialog, messageItm.idx, 0, messageLines * (textFontInfo.ascent + textFontInfo.descent)); | |
5261 | + macMoveDialogItem(theDialog, messageItm.idx, messageItm.box.left, dfltElementSpacing, &messageItm.box); | |
5213 | 5262 | |
5214 | 5263 | /* Place Input */ |
5215 | 5264 | if (textfield != NULL) |
5216 | 5265 | { |
5217 | 5266 | inputItm.box.left = messageItm.box.left; |
5218 | 5267 | inputItm.box.top = messageItm.box.bottom + dfltElementSpacing; |
5219 | - macSizeDialogItem (theDialog, inputItm.idx, 0, textFontInfo.ascent + textFontInfo.descent); | |
5220 | - macMoveDialogItem (theDialog, inputItm.idx, inputItm.box.left, inputItm.box.top, &inputItm.box); | |
5268 | + macSizeDialogItem(theDialog, inputItm.idx, 0, textFontInfo.ascent + textFontInfo.descent); | |
5269 | + macMoveDialogItem(theDialog, inputItm.idx, inputItm.box.left, inputItm.box.top, &inputItm.box); | |
5221 | 5270 | /* Convert the static text into a text edit. |
5222 | 5271 | * For some reason this change need to be done last (Dany) */ |
5223 | - GetDialogItem (theDialog, inputItm.idx, &itemType, &itemHandle, &inputItm.box); | |
5224 | - SetDialogItem (theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &inputItm.box); | |
5272 | + GetDialogItem(theDialog, inputItm.idx, &itemType, &itemHandle, &inputItm.box); | |
5273 | + SetDialogItem(theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &inputItm.box); | |
5225 | 5274 | SelectDialogItemText(theDialog, inputItm.idx, 0, 32767); |
5226 | 5275 | } |
5227 | 5276 |
@@ -5240,12 +5289,12 @@ | ||
5240 | 5289 | for (button=1; button <= lastButton; button++) |
5241 | 5290 | { |
5242 | 5291 | |
5243 | - macMoveDialogItem (theDialog, button, buttonItm.box.left, buttonItm.box.top, &box); | |
5292 | + macMoveDialogItem(theDialog, button, buttonItm.box.left, buttonItm.box.top, &box); | |
5244 | 5293 | /* With vertical, it's better to have all button the same lenght */ |
5245 | 5294 | if (vertical) |
5246 | 5295 | { |
5247 | - macSizeDialogItem (theDialog, button, widestButton, 0); | |
5248 | - GetDialogItem (theDialog, button, &itemType, &itemHandle, &box); | |
5296 | + macSizeDialogItem(theDialog, button, widestButton, 0); | |
5297 | + GetDialogItem(theDialog, button, &itemType, &itemHandle, &box); | |
5249 | 5298 | } |
5250 | 5299 | /* Calculate position of next button */ |
5251 | 5300 | if (vertical) |
@@ -5260,7 +5309,7 @@ | ||
5260 | 5309 | |
5261 | 5310 | #ifdef USE_CARBONIZED |
5262 | 5311 | /* Magic resize */ |
5263 | - AutoSizeDialog (theDialog); | |
5312 | + AutoSizeDialog(theDialog); | |
5264 | 5313 | /* Need a horizontal resize anyway so not that useful */ |
5265 | 5314 | #endif |
5266 | 5315 |
@@ -5269,27 +5318,27 @@ | ||
5269 | 5318 | /* BringToFront(theWindow); */ |
5270 | 5319 | SelectWindow(theWindow); |
5271 | 5320 | |
5272 | -/* DrawDialog (theDialog); */ | |
5321 | +/* DrawDialog(theDialog); */ | |
5273 | 5322 | #if 0 |
5274 | - GetPort (&oldPort); | |
5323 | + GetPort(&oldPort); | |
5275 | 5324 | #ifdef USE_CARBONIZED |
5276 | - SetPortDialogPort (theDialog); | |
5325 | + SetPortDialogPort(theDialog); | |
5277 | 5326 | #else |
5278 | - SetPort (theDialog); | |
5327 | + SetPort(theDialog); | |
5279 | 5328 | #endif |
5280 | 5329 | #endif |
5281 | 5330 | |
5282 | 5331 | /* Hang until one of the button is hit */ |
5283 | 5332 | do |
5284 | 5333 | { |
5285 | - ModalDialog (nil, &itemHit); | |
5334 | + ModalDialog(nil, &itemHit); | |
5286 | 5335 | } while ((itemHit < 1) || (itemHit > lastButton)); |
5287 | 5336 | |
5288 | 5337 | /* Copy back the text entered by the user into the param */ |
5289 | 5338 | if (textfield != NULL) |
5290 | 5339 | { |
5291 | - GetDialogItem (theDialog, inputItm.idx, &itemType, &itemHandle, &box); | |
5292 | - GetDialogItemText (itemHandle, (char_u *) &name); | |
5340 | + GetDialogItem(theDialog, inputItm.idx, &itemType, &itemHandle, &box); | |
5341 | + GetDialogItemText(itemHandle, (char_u *) &name); | |
5293 | 5342 | #if IOSIZE < 256 |
5294 | 5343 | /* Truncate the name to IOSIZE if needed */ |
5295 | 5344 | if (name[0] > IOSIZE) |
@@ -5300,10 +5349,10 @@ | ||
5300 | 5349 | } |
5301 | 5350 | |
5302 | 5351 | /* Restore the original graphical port */ |
5303 | - SetPort (oldPort); | |
5352 | + SetPort(oldPort); | |
5304 | 5353 | |
5305 | 5354 | /* Get ride of th edialog (free memory) */ |
5306 | - DisposeDialog (theDialog); | |
5355 | + DisposeDialog(theDialog); | |
5307 | 5356 | |
5308 | 5357 | return itemHit; |
5309 | 5358 | /* |
@@ -5339,8 +5388,8 @@ | ||
5339 | 5388 | pError[0] = STRLEN(p); |
5340 | 5389 | |
5341 | 5390 | STRNCPY(&pError[1], p, pError[0]); |
5342 | - ParamText (pError, nil, nil, nil); | |
5343 | - Alert (128, nil); | |
5391 | + ParamText(pError, nil, nil, nil); | |
5392 | + Alert(128, nil); | |
5344 | 5393 | break; |
5345 | 5394 | /* TODO: handled message longer than 256 chars |
5346 | 5395 | * use auto-sizeable alert |
@@ -5388,8 +5437,8 @@ | ||
5388 | 5437 | CursorDevicePtr myMouse; |
5389 | 5438 | Point where; |
5390 | 5439 | |
5391 | - if ( NGetTrapAddress (_CursorDeviceDispatch, ToolTrap) | |
5392 | - != NGetTrapAddress (_Unimplemented, ToolTrap) ) | |
5440 | + if ( NGetTrapAddress(_CursorDeviceDispatch, ToolTrap) | |
5441 | + != NGetTrapAddress(_Unimplemented, ToolTrap)) | |
5393 | 5442 | { |
5394 | 5443 | /* New way */ |
5395 | 5444 |
@@ -5407,9 +5456,9 @@ | ||
5407 | 5456 | /* Get the next cursor device */ |
5408 | 5457 | CursorDeviceNextDevice(&myMouse); |
5409 | 5458 | } |
5410 | - while ( (myMouse != nil) && (myMouse->cntButtons != 1) ); | |
5411 | - | |
5412 | - CursorDeviceMoveTo (myMouse, x, y); | |
5459 | + while ((myMouse != nil) && (myMouse->cntButtons != 1)); | |
5460 | + | |
5461 | + CursorDeviceMoveTo(myMouse, x, y); | |
5413 | 5462 | } |
5414 | 5463 | else |
5415 | 5464 | { |
@@ -5445,10 +5494,10 @@ | ||
5445 | 5494 | GrafPtr savePort; |
5446 | 5495 | |
5447 | 5496 | /* Save Current Port: On MacOS X we seem to lose the port */ |
5448 | - GetPort (&savePort); /*OSX*/ | |
5449 | - | |
5450 | - GetMouse (&where); | |
5451 | - LocalToGlobal (&where); /*OSX*/ | |
5497 | + GetPort(&savePort); /*OSX*/ | |
5498 | + | |
5499 | + GetMouse(&where); | |
5500 | + LocalToGlobal(&where); /*OSX*/ | |
5452 | 5501 | CntxMenu = menu->submenu_handle; |
5453 | 5502 | |
5454 | 5503 | /* TODO: Get the text selection from Vim */ |
@@ -5463,7 +5512,7 @@ | ||
5463 | 5512 | /* Handle the menu CntxMenuID, CntxMenuItem */ |
5464 | 5513 | /* The submenu can be handle directly by gui_mac_handle_menu */ |
5465 | 5514 | /* But what about the current menu, is the menu changed by ContextualMenuSelect */ |
5466 | - gui_mac_handle_menu ((CntxMenuID << 16) + CntxMenuItem); | |
5515 | + gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem); | |
5467 | 5516 | } |
5468 | 5517 | else if (CntxMenuID == kCMShowHelpSelected) |
5469 | 5518 | { |
@@ -5472,7 +5521,7 @@ | ||
5472 | 5521 | } |
5473 | 5522 | |
5474 | 5523 | /* Restore original Port */ |
5475 | - SetPort (savePort); /*OSX*/ | |
5524 | + SetPort(savePort); /*OSX*/ | |
5476 | 5525 | #endif |
5477 | 5526 | } |
5478 | 5527 |
@@ -5482,10 +5531,10 @@ | ||
5482 | 5531 | mch_post_buffer_write(buf_T *buf) |
5483 | 5532 | { |
5484 | 5533 | # ifdef USE_SIOUX |
5485 | - printf ("Writing Buf...\n"); | |
5534 | + printf("Writing Buf...\n"); | |
5486 | 5535 | # endif |
5487 | - GetFSSpecFromPath (buf->b_ffname, &buf->b_FSSpec); | |
5488 | - Send_KAHL_MOD_AE (buf); | |
5536 | + GetFSSpecFromPath(buf->b_ffname, &buf->b_FSSpec); | |
5537 | + Send_KAHL_MOD_AE(buf); | |
5489 | 5538 | } |
5490 | 5539 | #endif |
5491 | 5540 |
@@ -5521,7 +5570,7 @@ | ||
5521 | 5570 | */ |
5522 | 5571 | |
5523 | 5572 | int |
5524 | -C2PascalString (CString, PascalString) | |
5573 | +C2PascalString(CString, PascalString) | |
5525 | 5574 | char_u *CString; |
5526 | 5575 | Str255 *PascalString; |
5527 | 5576 | { |
@@ -5546,7 +5595,7 @@ | ||
5546 | 5595 | } |
5547 | 5596 | |
5548 | 5597 | int |
5549 | -GetFSSpecFromPath (file, fileFSSpec) | |
5598 | +GetFSSpecFromPath(file, fileFSSpec) | |
5550 | 5599 | char_u *file; |
5551 | 5600 | FSSpec *fileFSSpec; |
5552 | 5601 | { |
@@ -5555,17 +5604,17 @@ | ||
5555 | 5604 | CInfoPBRec myCPB; |
5556 | 5605 | OSErr err; |
5557 | 5606 | |
5558 | - (void) C2PascalString (file, &filePascal); | |
5607 | + (void) C2PascalString(file, &filePascal); | |
5559 | 5608 | |
5560 | 5609 | myCPB.dirInfo.ioNamePtr = filePascal; |
5561 | 5610 | myCPB.dirInfo.ioVRefNum = 0; |
5562 | 5611 | myCPB.dirInfo.ioFDirIndex = 0; |
5563 | 5612 | myCPB.dirInfo.ioDrDirID = 0; |
5564 | 5613 | |
5565 | - err= PBGetCatInfo (&myCPB, false); | |
5614 | + err= PBGetCatInfo(&myCPB, false); | |
5566 | 5615 | |
5567 | 5616 | /* vRefNum, dirID, name */ |
5568 | - FSMakeFSSpec (0, 0, filePascal, fileFSSpec); | |
5617 | + FSMakeFSSpec(0, 0, filePascal, fileFSSpec); | |
5569 | 5618 | |
5570 | 5619 | /* TODO: Use an error code mechanism */ |
5571 | 5620 | return 0; |
@@ -5575,7 +5624,7 @@ | ||
5575 | 5624 | * Convert a FSSpec to a fuill path |
5576 | 5625 | */ |
5577 | 5626 | |
5578 | -char_u *FullPathFromFSSpec_save (FSSpec file) | |
5627 | +char_u *FullPathFromFSSpec_save(FSSpec file) | |
5579 | 5628 | { |
5580 | 5629 | /* |
5581 | 5630 | * TODO: Add protection for 256 char max. |
@@ -5603,7 +5652,7 @@ | ||
5603 | 5652 | #ifdef USE_UNIXFILENAME |
5604 | 5653 | /* Get the default volume */ |
5605 | 5654 | /* TODO: Remove as this only work if Vim is on the Boot Volume*/ |
5606 | - error=HGetVol ( NULL, &dfltVol_vRefNum, &dfltVol_dirID ); | |
5655 | + error=HGetVol(NULL, &dfltVol_vRefNum, &dfltVol_dirID); | |
5607 | 5656 | |
5608 | 5657 | if (error) |
5609 | 5658 | return NULL; |
@@ -5622,7 +5671,7 @@ | ||
5622 | 5671 | |
5623 | 5672 | /* As ioFDirIndex = 0, get the info of ioNamePtr, |
5624 | 5673 | which is relative to ioVrefNum, ioDirID */ |
5625 | - error = PBGetCatInfo (&theCPB, false); | |
5674 | + error = PBGetCatInfo(&theCPB, false); | |
5626 | 5675 | |
5627 | 5676 | /* If we are called for a new file we expect fnfErr */ |
5628 | 5677 | if ((error) && (error != fnfErr)) |
@@ -5671,20 +5720,20 @@ | ||
5671 | 5720 | { |
5672 | 5721 | /* If the file to be saved already exists, we can get its full path |
5673 | 5722 | by converting its FSSpec into an FSRef. */ |
5674 | - error=FSpMakeFSRef (&file, &refFile); | |
5723 | + error=FSpMakeFSRef(&file, &refFile); | |
5675 | 5724 | if (error) |
5676 | 5725 | return NULL; |
5677 | 5726 | |
5678 | - status=FSRefMakePath (&refFile, (UInt8 *) path, pathSize); | |
5727 | + status=FSRefMakePath(&refFile, (UInt8 *) path, pathSize); | |
5679 | 5728 | if (status) |
5680 | 5729 | return NULL; |
5681 | 5730 | } |
5682 | 5731 | |
5683 | 5732 | /* Add a slash at the end if needed */ |
5684 | 5733 | if (folder) |
5685 | - STRCAT (path, "/"); | |
5686 | - | |
5687 | - return (vim_strsave (path)); | |
5734 | + STRCAT(path, "/"); | |
5735 | + | |
5736 | + return (vim_strsave(path)); | |
5688 | 5737 | #else |
5689 | 5738 | /* TODO: Get rid of all USE_UNIXFILENAME below */ |
5690 | 5739 | /* Set ioNamePtr, it's the same area which is always reused. */ |
@@ -5695,7 +5744,7 @@ | ||
5695 | 5744 | theCPB.dirInfo.ioDrParID = file.parID; |
5696 | 5745 | theCPB.dirInfo.ioDrDirID = file.parID; |
5697 | 5746 | |
5698 | - if ((TRUE) && (file.parID != fsRtDirID /*fsRtParID*/ )) | |
5747 | + if ((TRUE) && (file.parID != fsRtDirID /*fsRtParID*/)) | |
5699 | 5748 | do |
5700 | 5749 | { |
5701 | 5750 | theCPB.dirInfo.ioFDirIndex = -1; |
@@ -5706,7 +5755,7 @@ | ||
5706 | 5755 | |
5707 | 5756 | /* As ioFDirIndex = -1, get the info of ioDrDirID, */ |
5708 | 5757 | /* *ioNamePtr[0 TO 31] will be updated */ |
5709 | - error = PBGetCatInfo (&theCPB,false); | |
5758 | + error = PBGetCatInfo(&theCPB,false); | |
5710 | 5759 | |
5711 | 5760 | if (error) |
5712 | 5761 | return NULL; |
@@ -5734,7 +5783,7 @@ | ||
5734 | 5783 | |
5735 | 5784 | /* As ioFDirIndex = -1, get the info of ioDrDirID, */ |
5736 | 5785 | /* *ioNamePtr[0 TO 31] will be updated */ |
5737 | - error = PBGetCatInfo (&theCPB,false); | |
5786 | + error = PBGetCatInfo(&theCPB,false); | |
5738 | 5787 | |
5739 | 5788 | if (error) |
5740 | 5789 | return NULL; |
@@ -5763,7 +5812,7 @@ | ||
5763 | 5812 | |
5764 | 5813 | /* Append final path separator if it's a folder */ |
5765 | 5814 | if (folder) |
5766 | - STRCAT (fname, ":"); | |
5815 | + STRCAT(fname, ":"); | |
5767 | 5816 | |
5768 | 5817 | /* As we use Unix File Name for MacOS X convert it */ |
5769 | 5818 | #ifdef USE_UNIXFILENAME |
@@ -5780,7 +5829,7 @@ | ||
5780 | 5829 | } |
5781 | 5830 | #endif |
5782 | 5831 | |
5783 | - return (vim_strsave (fname)); | |
5832 | + return (vim_strsave(fname)); | |
5784 | 5833 | #endif |
5785 | 5834 | } |
5786 | 5835 |
@@ -818,9 +818,11 @@ | ||
818 | 818 | { |
819 | 819 | if (strstr(buf, title) != NULL) |
820 | 820 | { |
821 | - /* Found it. Store the window ref. and quit searching. */ | |
821 | + /* Found it. Store the window ref. and quit searching if MDI | |
822 | + * works. */ | |
822 | 823 | vim_parent_hwnd = FindWindowEx(hwnd, NULL, "MDIClient", NULL); |
823 | - return FALSE; | |
824 | + if (vim_parent_hwnd != NULL) | |
825 | + return FALSE; | |
824 | 826 | } |
825 | 827 | } |
826 | 828 | return TRUE; /* continue searching */ |
@@ -1518,7 +1518,7 @@ | ||
1518 | 1518 | { |
1519 | 1519 | MSG_PUTS(_(" file name: ")); |
1520 | 1520 | if (b0.b0_fname[0] == NUL) |
1521 | - MSG_PUTS(_("[No File]")); | |
1521 | + MSG_PUTS(_("[No Name]")); | |
1522 | 1522 | else |
1523 | 1523 | msg_outtrans(b0.b0_fname); |
1524 | 1524 |
@@ -3781,7 +3781,7 @@ | ||
3781 | 3781 | * Change the ".swp" extension to find another file that can be used. |
3782 | 3782 | * First decrement the last char: ".swo", ".swn", etc. |
3783 | 3783 | * If that still isn't enough decrement the last but one char: ".svz" |
3784 | - * Can happen when editing many "No File" buffers. | |
3784 | + * Can happen when editing many "No Name" buffers. | |
3785 | 3785 | */ |
3786 | 3786 | if (fname[n - 1] == 'a') /* ".s?a" */ |
3787 | 3787 | { |
@@ -5186,7 +5186,23 @@ | ||
5186 | 5186 | if (cap->count1 - 1 >= curwin->w_cursor.lnum) |
5187 | 5187 | curwin->w_cursor.lnum = 1; |
5188 | 5188 | else |
5189 | - curwin->w_cursor.lnum -= cap->count1 - 1; | |
5189 | + { | |
5190 | +#ifdef FEAT_FOLDING | |
5191 | + if (hasAnyFolding(curwin)) | |
5192 | + { | |
5193 | + /* Count a fold for one screen line. */ | |
5194 | + for (n = cap->count1 - 1; n > 0 | |
5195 | + && curwin->w_cursor.lnum > curwin->w_topline; --n) | |
5196 | + { | |
5197 | + (void)hasFolding(curwin->w_cursor.lnum, | |
5198 | + &curwin->w_cursor.lnum, NULL); | |
5199 | + --curwin->w_cursor.lnum; | |
5200 | + } | |
5201 | + } | |
5202 | + else | |
5203 | +#endif | |
5204 | + curwin->w_cursor.lnum -= cap->count1 - 1; | |
5205 | + } | |
5190 | 5206 | } |
5191 | 5207 | else |
5192 | 5208 | { |
@@ -5222,8 +5238,23 @@ | ||
5222 | 5238 | if (n > 0 && used > curwin->w_height) |
5223 | 5239 | --n; |
5224 | 5240 | } |
5225 | - else | |
5241 | + else /* (cap->cmdchar == 'H') */ | |
5242 | + { | |
5226 | 5243 | n = cap->count1 - 1; |
5244 | +#ifdef FEAT_FOLDING | |
5245 | + if (hasAnyFolding(curwin)) | |
5246 | + { | |
5247 | + /* Count a fold for one screen line. */ | |
5248 | + lnum = curwin->w_topline; | |
5249 | + while (n-- > 0 && lnum < curwin->w_botline - 1) | |
5250 | + { | |
5251 | + hasFolding(lnum, NULL, &lnum); | |
5252 | + ++lnum; | |
5253 | + } | |
5254 | + n = lnum - curwin->w_topline; | |
5255 | + } | |
5256 | +#endif | |
5257 | + } | |
5227 | 5258 | curwin->w_cursor.lnum = curwin->w_topline + n; |
5228 | 5259 | if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) |
5229 | 5260 | curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; |
@@ -527,7 +527,7 @@ | ||
527 | 527 | */ |
528 | 528 | EventRecord theEvent; |
529 | 529 | |
530 | - if (EventAvail (keyDownMask, &theEvent)) | |
530 | + if (EventAvail(keyDownMask, &theEvent)) | |
531 | 531 | if ((theEvent.message & charCodeMask) == Ctrl_C && ctrl_c_interrupts) |
532 | 532 | got_int = TRUE; |
533 | 533 | #if 0 |
@@ -2987,7 +2987,12 @@ | ||
2987 | 2987 | mch_can_exe(name) |
2988 | 2988 | char_u *name; |
2989 | 2989 | { |
2990 | - return (searchpath(name) != NULL); | |
2990 | + char *p; | |
2991 | + | |
2992 | + p = searchpath(name); | |
2993 | + if (p == NULL || mch_isdir(p)) | |
2994 | + return FALSE; | |
2995 | + return TRUE; | |
2991 | 2996 | } |
2992 | 2997 | #endif |
2993 | 2998 |
@@ -1519,29 +1519,45 @@ | ||
1519 | 1519 | # include <shellapi.h> /* required for FindExecutable() */ |
1520 | 1520 | #endif |
1521 | 1521 | |
1522 | +/* | |
1523 | + * Return TRUE if "name" is in $PATH. | |
1524 | + * TODO: Should also check if it's really executable. | |
1525 | + */ | |
1522 | 1526 | static int |
1523 | 1527 | executable_exists(char *name) |
1524 | 1528 | { |
1525 | - char location[2 * _MAX_PATH + 2]; | |
1526 | - char widename[2 * _MAX_PATH]; | |
1527 | - | |
1528 | - /* There appears to be a bug in FindExecutableA() on Windows NT. | |
1529 | - * Use FindExecutableW() instead... */ | |
1530 | - if (g_PlatformId == VER_PLATFORM_WIN32_NT) | |
1529 | + char *dum; | |
1530 | + char fname[_MAX_PATH]; | |
1531 | + | |
1532 | +#ifdef FEAT_MBYTE | |
1533 | + if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) | |
1531 | 1534 | { |
1532 | - MultiByteToWideChar(CP_ACP, 0, (LPCTSTR)name, -1, | |
1533 | - (LPWSTR)widename, _MAX_PATH); | |
1534 | - if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"", | |
1535 | - (LPWSTR)location) > (HINSTANCE)32) | |
1536 | - return TRUE; | |
1535 | + WCHAR *p = enc_to_ucs2(name, NULL); | |
1536 | + WCHAR fnamew[_MAX_PATH]; | |
1537 | + WCHAR *dumw; | |
1538 | + long n; | |
1539 | + | |
1540 | + if (p != NULL) | |
1541 | + { | |
1542 | + n = (long)SearchPathW(NULL, p, NULL, _MAX_PATH, fnamew, &dumw); | |
1543 | + vim_free(p); | |
1544 | + if (n > 0 || GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) | |
1545 | + { | |
1546 | + if (n == 0) | |
1547 | + return FALSE; | |
1548 | + if (GetFileAttributesW(fnamew) & FILE_ATTRIBUTE_DIRECTORY) | |
1549 | + return FALSE; | |
1550 | + return TRUE; | |
1551 | + } | |
1552 | + /* Retry with non-wide function (for Windows 98). */ | |
1553 | + } | |
1537 | 1554 | } |
1538 | - else | |
1539 | - { | |
1540 | - if (FindExecutableA((LPCTSTR)name, (LPCTSTR)"", | |
1541 | - (LPTSTR)location) > (HINSTANCE)32) | |
1542 | - return TRUE; | |
1543 | - } | |
1544 | - return FALSE; | |
1555 | +#endif | |
1556 | + if (SearchPath(NULL, name, NULL, _MAX_PATH, fname, &dum) == 0) | |
1557 | + return FALSE; | |
1558 | + if (mch_isdir(fname)) | |
1559 | + return FALSE; | |
1560 | + return TRUE; | |
1545 | 1561 | } |
1546 | 1562 | |
1547 | 1563 | #ifdef FEAT_GUI_W32 |
@@ -97,8 +97,8 @@ | ||
97 | 97 | # Convert ru.po to create ru.cp1251.po. |
98 | 98 | ru.cp1251.po: ru.po |
99 | 99 | rm -f ru.cp1251.po |
100 | - iconv -f koi8-r -t cp1251 ru.po | \ | |
101 | - sed -e 's/charset=koi8-r/charset=cp1251/' -e 's/# Original translations/# Generated from ru.po, DO NOT EDIT/' > ru.cp1251.po | |
100 | + iconv -f utf-8 -t cp1251 ru.po | \ | |
101 | + sed -e 's/charset=utf-8/charset=cp1251/' -e 's/# Original translations/# Generated from ru.po, DO NOT EDIT/' > ru.cp1251.po | |
102 | 102 | |
103 | 103 | check: |
104 | 104 | @if test "x" = "x$(prefix)"; then \ |
@@ -9,10 +9,10 @@ | ||
9 | 9 | # |
10 | 10 | msgid "" |
11 | 11 | msgstr "" |
12 | -"Project-Id-Version: Vim 6.3a\n" | |
12 | +"Project-Id-Version: Vim 6.3\n" | |
13 | 13 | "Report-Msgid-Bugs-To: \n" |
14 | -"POT-Creation-Date: 2004-05-10 21:37+0400\n" | |
15 | -"PO-Revision-Date: 2004-05-10 21:37+0400\n" | |
14 | +"POT-Creation-Date: 2004-06-15 09:39+0400\n" | |
15 | +"PO-Revision-Date: 2004-05-19 00:23+0400\n" | |
16 | 16 | "Last-Translator: vassily ragosin <vrr@users.sourceforge.net>\n" |
17 | 17 | "Language-Team: vassily ragosin <vrr@users.sourceforge.net>\n" |
18 | 18 | "MIME-Version: 1.0\n" |
@@ -27,172 +27,172 @@ | ||
27 | 27 | msgid "E83: Cannot allocate buffer, using other one..." |
28 | 28 | msgstr "E83: Íåâîçìîæíî âûäåëèòü ïàìÿòü äëÿ áóôåðà, èñïîëüçóåì äðóãîé áóôåð..." |
29 | 29 | |
30 | -#: buffer.c:805 | |
30 | +#: buffer.c:808 | |
31 | 31 | #, c-format |
32 | 32 | msgid "E515: No buffers were unloaded" |
33 | 33 | msgstr "E515: Íè îäèí áóôåð íå áûë âûãðóæåí èç ïàìÿòè" |
34 | 34 | |
35 | -#: buffer.c:807 | |
35 | +#: buffer.c:810 | |
36 | 36 | #, c-format |
37 | 37 | msgid "E516: No buffers were deleted" |
38 | 38 | msgstr "E516: Íè îäèí áóôåð íå áûë óäàë¸í" |
39 | 39 | |
40 | -#: buffer.c:809 | |
40 | +#: buffer.c:812 | |
41 | 41 | #, c-format |
42 | 42 | msgid "E517: No buffers were wiped out" |
43 | 43 | msgstr "E517: Íè îäèí áóôåð íå áûë î÷èùåí" |
44 | 44 | |
45 | -#: buffer.c:817 | |
45 | +#: buffer.c:820 | |
46 | 46 | msgid "1 buffer unloaded" |
47 | 47 | msgstr "Îäèí áóôåð âûãðóæåí èç ïàìÿòè" |
48 | 48 | |
49 | -#: buffer.c:819 | |
49 | +#: buffer.c:822 | |
50 | 50 | #, c-format |
51 | 51 | msgid "%d buffers unloaded" |
52 | 52 | msgstr "Âñåãî âûãðóæåíî áóôåðîâ èç ïàìÿòè: %d" |
53 | 53 | |
54 | -#: buffer.c:824 | |
54 | +#: buffer.c:827 | |
55 | 55 | msgid "1 buffer deleted" |
56 | 56 | msgstr "Îäèí áóôåð óäàë¸í" |
57 | 57 | |
58 | -#: buffer.c:826 | |
58 | +#: buffer.c:829 | |
59 | 59 | #, c-format |
60 | 60 | msgid "%d buffers deleted" |
61 | 61 | msgstr "Âñåãî óäàëåíî áóôåðîâ: %d" |
62 | 62 | |
63 | -#: buffer.c:831 | |
63 | +#: buffer.c:834 | |
64 | 64 | msgid "1 buffer wiped out" |
65 | 65 | msgstr "Îäèí áóôåð î÷èùåí" |
66 | 66 | |
67 | -#: buffer.c:833 | |
67 | +#: buffer.c:836 | |
68 | 68 | #, c-format |
69 | 69 | msgid "%d buffers wiped out" |
70 | 70 | msgstr "Âñåãî î÷èùåíî áóôåðîâ: %d" |
71 | 71 | |
72 | -#: buffer.c:894 | |
72 | +#: buffer.c:897 | |
73 | 73 | msgid "E84: No modified buffer found" |
74 | 74 | msgstr "E84: Èçìåí¸ííûõ áóôåðîâ íå îáíàðóæåíî" |
75 | 75 | |
76 | 76 | #. back where we started, didn't find anything. |
77 | -#: buffer.c:933 | |
77 | +#: buffer.c:936 | |
78 | 78 | msgid "E85: There is no listed buffer" |
79 | 79 | msgstr "E85: Áóôåðû â ñïèñêå îòñóòñòâóþò" |
80 | 80 | |
81 | -#: buffer.c:945 | |
81 | +#: buffer.c:948 | |
82 | 82 | #, c-format |
83 | 83 | msgid "E86: Buffer %ld does not exist" |
84 | 84 | msgstr "E86: Áóôåð %ld íå ñóùåñòâóåò" |
85 | 85 | |
86 | -#: buffer.c:948 | |
86 | +#: buffer.c:951 | |
87 | 87 | msgid "E87: Cannot go beyond last buffer" |
88 | 88 | msgstr "E87: Ýòî ïîñëåäíèé áóôåð" |
89 | 89 | |
90 | -#: buffer.c:950 | |
90 | +#: buffer.c:953 | |
91 | 91 | msgid "E88: Cannot go before first buffer" |
92 | 92 | msgstr "E88: Ýòî ïåðâûé áóôåð" |
93 | 93 | |
94 | -#: buffer.c:988 | |
94 | +#: buffer.c:991 | |
95 | 95 | #, c-format |
96 | 96 | msgid "E89: No write since last change for buffer %ld (add ! to override)" |
97 | 97 | msgstr "E89: Èçìåíåíèÿ â áóôåðå %ld íå ñîõðàíåíû (!, ÷òîáû îáîéòè ïðîâåðêó)" |
98 | 98 | |
99 | -#: buffer.c:1005 | |
99 | +#: buffer.c:1008 | |
100 | 100 | msgid "E90: Cannot unload last buffer" |
101 | 101 | msgstr "E90: Íåâîçìîæíî âûãðóçèòü èç ïàìÿòè ïîñëåäíèé áóôåð" |
102 | 102 | |
103 | -#: buffer.c:1538 | |
103 | +#: buffer.c:1544 | |
104 | 104 | msgid "W14: Warning: List of file names overflow" |
105 | 105 | msgstr "W14: Ïðåäóïðåæäåíèå: ïåðåïîëíåíèå ñïèñêà èì¸í ôàéëîâ" |
106 | 106 | |
107 | -#: buffer.c:1709 | |
107 | +#: buffer.c:1716 | |
108 | 108 | #, c-format |
109 | 109 | msgid "E92: Buffer %ld not found" |
110 | 110 | msgstr "E92: Áóôåð %ld íå íàéäåí" |
111 | 111 | |
112 | -#: buffer.c:1940 | |
112 | +#: buffer.c:1947 | |
113 | 113 | #, c-format |
114 | 114 | msgid "E93: More than one match for %s" |
115 | 115 | msgstr "E93: Íåñêîëüêî ñîîòâåòñòâèé äëÿ %s" |
116 | 116 | |
117 | -#: buffer.c:1942 | |
117 | +#: buffer.c:1949 | |
118 | 118 | #, c-format |
119 | 119 | msgid "E94: No matching buffer for %s" |
120 | 120 | msgstr "E94: Íåò ñîîòâåòñòâóþùåãî %s áóôåðà" |
121 | 121 | |
122 | -#: buffer.c:2337 | |
122 | +#: buffer.c:2344 | |
123 | 123 | #, c-format |
124 | 124 | msgid "line %ld" |
125 | 125 | msgstr "ñòðîêà %ld" |
126 | 126 | |
127 | -#: buffer.c:2420 | |
127 | +#: buffer.c:2429 | |
128 | 128 | msgid "E95: Buffer with this name already exists" |
129 | 129 | msgstr "E95: Áóôåð ñ òàêèì èìåíåì óæå ñóùåñòâóåò" |
130 | 130 | |
131 | -#: buffer.c:2713 | |
131 | +#: buffer.c:2724 | |
132 | 132 | msgid " [Modified]" |
133 | 133 | msgstr " [Èçìåí¸í]" |
134 | 134 | |
135 | -#: buffer.c:2718 | |
135 | +#: buffer.c:2729 | |
136 | 136 | msgid "[Not edited]" |
137 | 137 | msgstr "[Íå ðåäàêòèðîâàëñÿ]" |
138 | 138 | |
139 | -#: buffer.c:2723 | |
139 | +#: buffer.c:2734 | |
140 | 140 | msgid "[New file]" |
141 | 141 | msgstr "[Íîâûé ôàéë]" |
142 | 142 | |
143 | -#: buffer.c:2724 | |
143 | +#: buffer.c:2735 | |
144 | 144 | msgid "[Read errors]" |
145 | 145 | msgstr "[Îøèáêè ÷òåíèÿ]" |
146 | 146 | |
147 | -#: buffer.c:2726 fileio.c:2112 | |
147 | +#: buffer.c:2737 fileio.c:2124 | |
148 | 148 | msgid "[readonly]" |
149 | 149 | msgstr "[òîëüêî äëÿ ÷òåíèÿ]" |
150 | 150 | |
151 | -#: buffer.c:2747 | |
151 | +#: buffer.c:2758 | |
152 | 152 | #, c-format |
153 | 153 | msgid "1 line --%d%%--" |
154 | 154 | msgstr "Îäíà ñòðîêà --%d%%--" |
155 | 155 | |
156 | -#: buffer.c:2749 | |
156 | +#: buffer.c:2760 | |
157 | 157 | #, c-format |
158 | 158 | msgid "%ld lines --%d%%--" |
159 | 159 | msgstr "%ld ñòð. --%d%%--" |
160 | 160 | |
161 | -#: buffer.c:2756 | |
161 | +#: buffer.c:2767 | |
162 | 162 | #, c-format |
163 | 163 | msgid "line %ld of %ld --%d%%-- col " |
164 | 164 | msgstr "ñòð. %ld èç %ld --%d%%-- êîë. " |
165 | 165 | |
166 | -#: buffer.c:2864 | |
166 | +#: buffer.c:2875 | |
167 | 167 | msgid "[No file]" |
168 | 168 | msgstr "[Íåò ôàéëà]" |
169 | 169 | |
170 | 170 | #. must be a help buffer |
171 | -#: buffer.c:2904 | |
171 | +#: buffer.c:2915 | |
172 | 172 | msgid "help" |
173 | 173 | msgstr "ñïðàâêà" |
174 | 174 | |
175 | -#: buffer.c:3463 screen.c:5075 | |
175 | +#: buffer.c:3474 screen.c:5079 | |
176 | 176 | msgid "[help]" |
177 | 177 | msgstr "[ñïðàâêà]" |
178 | 178 | |
179 | -#: buffer.c:3495 screen.c:5081 | |
179 | +#: buffer.c:3506 screen.c:5085 | |
180 | 180 | msgid "[Preview]" |
181 | 181 | msgstr "[Ïðåäïðîñìîòð]" |
182 | 182 | |
183 | -#: buffer.c:3775 | |
183 | +#: buffer.c:3786 | |
184 | 184 | msgid "All" |
185 | 185 | msgstr "Âåñü" |
186 | 186 | |
187 | -#: buffer.c:3775 | |
187 | +#: buffer.c:3786 | |
188 | 188 | msgid "Bot" |
189 | 189 | msgstr "Âíèçó" |
190 | 190 | |
191 | -#: buffer.c:3777 | |
191 | +#: buffer.c:3788 | |
192 | 192 | msgid "Top" |
193 | 193 | msgstr "Íàâåðõó" |
194 | 194 | |
195 | -#: buffer.c:4523 | |
195 | +#: buffer.c:4536 | |
196 | 196 | #, c-format |
197 | 197 | msgid "" |
198 | 198 | "\n" |
@@ -201,15 +201,15 @@ | ||
201 | 201 | "\n" |
202 | 202 | "# Ñïèñîê áóôåðîâ:\n" |
203 | 203 | |
204 | -#: buffer.c:4556 | |
204 | +#: buffer.c:4569 | |
205 | 205 | msgid "[Error List]" |
206 | 206 | msgstr "[Ñïèñîê îøèáîê]" |
207 | 207 | |
208 | -#: buffer.c:4569 memline.c:1520 | |
208 | +#: buffer.c:4582 memline.c:1521 | |
209 | 209 | msgid "[No File]" |
210 | 210 | msgstr "[Íåò ôàéëà]" |
211 | 211 | |
212 | -#: buffer.c:4882 | |
212 | +#: buffer.c:4895 | |
213 | 213 | msgid "" |
214 | 214 | "\n" |
215 | 215 | "--- Signs ---" |
@@ -217,12 +217,12 @@ | ||
217 | 217 | "\n" |
218 | 218 | "--- Çíà÷êè ---" |
219 | 219 | |
220 | -#: buffer.c:4901 | |
220 | +#: buffer.c:4914 | |
221 | 221 | #, c-format |
222 | 222 | msgid "Signs for %s:" |
223 | 223 | msgstr "Çíà÷êè äëÿ %s:" |
224 | 224 | |
225 | -#: buffer.c:4907 | |
225 | +#: buffer.c:4920 | |
226 | 226 | #, c-format |
227 | 227 | msgid " line=%ld id=%d name=%s" |
228 | 228 | msgstr " ñòðîêà=%ld id=%d èìÿ=%s" |
@@ -473,7 +473,7 @@ | ||
473 | 473 | #. * this way has the compelling advantage that translations need not to |
474 | 474 | #. * be touched at all. See below what 'ok' and 'ync' are used for. |
475 | 475 | #. |
476 | -#: eval.c:3687 gui.c:4382 gui_gtk.c:2059 | |
476 | +#: eval.c:3687 gui.c:4385 gui_gtk.c:2059 | |
477 | 477 | msgid "&Ok" |
478 | 478 | msgstr "&Ok" |
479 | 479 |
@@ -498,121 +498,121 @@ | ||
498 | 498 | msgid "E655: Too many symbolic links (cycle?)" |
499 | 499 | msgstr "E656: Ñëèøêîì ìíîãî ñèìâîëè÷åñêèõ ññûëîê (öèêë?)" |
500 | 500 | |
501 | -#: eval.c:6609 | |
501 | +#: eval.c:6626 | |
502 | 502 | msgid "E240: No connection to Vim server" |
503 | 503 | msgstr "E240: Íåò ñâÿçè ñ ñåðâåðîì Vim" |
504 | 504 | |
505 | -#: eval.c:6706 | |
505 | +#: eval.c:6724 | |
506 | 506 | msgid "E277: Unable to read a server reply" |
507 | 507 | msgstr "E227: Ñåðâåð íå îòâå÷àåò" |
508 | 508 | |
509 | -#: eval.c:6734 | |
509 | +#: eval.c:6752 | |
510 | 510 | msgid "E258: Unable to send to client" |
511 | 511 | msgstr "E258: Íå ìîãó îòâåòèòü êëèåíòó" |
512 | 512 | |
513 | -#: eval.c:6782 | |
513 | +#: eval.c:6800 | |
514 | 514 | #, c-format |
515 | 515 | msgid "E241: Unable to send to %s" |
516 | 516 | msgstr "E241: Íå ìîãó îòïðàâèòü ñîîáùåíèå äëÿ %s" |
517 | 517 | |
518 | -#: eval.c:6882 | |
518 | +#: eval.c:6900 | |
519 | 519 | msgid "(Invalid)" |
520 | 520 | msgstr "(Íåïðàâèëüíî)" |
521 | 521 | |
522 | -#: eval.c:8060 | |
522 | +#: eval.c:8078 | |
523 | 523 | #, c-format |
524 | 524 | msgid "E121: Undefined variable: %s" |
525 | 525 | msgstr "E121: Íåîïðåäåëåííàÿ ïåðåìåííàÿ: %s" |
526 | 526 | |
527 | -#: eval.c:8492 | |
527 | +#: eval.c:8510 | |
528 | 528 | #, c-format |
529 | 529 | msgid "E461: Illegal variable name: %s" |
530 | 530 | msgstr "E461: Íåäîïóñòèìîå èìÿ ïåðåìåííîé: %s" |
531 | 531 | |
532 | -#: eval.c:8784 | |
532 | +#: eval.c:8802 | |
533 | 533 | #, c-format |
534 | 534 | msgid "E122: Function %s already exists, add ! to replace it" |
535 | 535 | msgstr "E122: Ôóíêöèÿ %s óæå ñóùåñòâóåò. Äîáàâüòå !, ÷òîáû çàìåíèòü å¸." |
536 | 536 | |
537 | -#: eval.c:8857 | |
537 | +#: eval.c:8875 | |
538 | 538 | #, c-format |
539 | 539 | msgid "E123: Undefined function: %s" |
540 | 540 | msgstr "E123: Íåîïðåäåëåííàÿ ôóíêöèÿ: %s" |
541 | 541 | |
542 | -#: eval.c:8870 | |
542 | +#: eval.c:8888 | |
543 | 543 | #, c-format |
544 | 544 | msgid "E124: Missing '(': %s" |
545 | 545 | msgstr "E124: Ïðîïóùåíà '(': %s" |
546 | 546 | |
547 | -#: eval.c:8903 | |
547 | +#: eval.c:8921 | |
548 | 548 | #, c-format |
549 | 549 | msgid "E125: Illegal argument: %s" |
550 | 550 | msgstr "E125: Íåäîïóñòèìûé ïàðàìåòð: %s" |
551 | 551 | |
552 | -#: eval.c:8982 | |
552 | +#: eval.c:9000 | |
553 | 553 | msgid "E126: Missing :endfunction" |
554 | 554 | msgstr "E126: Ïðîïóùåíà êîìàíäà :endfunction" |
555 | 555 | |
556 | -#: eval.c:9089 | |
556 | +#: eval.c:9107 | |
557 | 557 | #, c-format |
558 | 558 | msgid "E127: Cannot redefine function %s: It is in use" |
559 | 559 | msgstr "E127: Íåâîçìîæíî ïåðåîïðåäåëèòü ôóíêöèþ %s, îíà èñïîëüçóåòñÿ" |
560 | 560 | |
561 | -#: eval.c:9159 | |
561 | +#: eval.c:9177 | |
562 | 562 | msgid "E129: Function name required" |
563 | 563 | msgstr "E129: Òðåáóåòñÿ èìÿ ôóíêöèè" |
564 | 564 | |
565 | -#: eval.c:9210 | |
565 | +#: eval.c:9228 | |
566 | 566 | #, c-format |
567 | 567 | msgid "E128: Function name must start with a capital: %s" |
568 | 568 | msgstr "E128: Èìÿ ôóíêöèè äîëæíî íà÷èíàòüñÿ ñ ïðîïèñíîé áóêâû: %s" |
569 | 569 | |
570 | -#: eval.c:9402 | |
570 | +#: eval.c:9420 | |
571 | 571 | #, c-format |
572 | 572 | msgid "E130: Undefined function: %s" |
573 | 573 | msgstr "E130: Ôóíêöèÿ %s íå îïðåäåëåíà" |
574 | 574 | |
575 | -#: eval.c:9407 | |
575 | +#: eval.c:9425 | |
576 | 576 | #, c-format |
577 | 577 | msgid "E131: Cannot delete function %s: It is in use" |
578 | 578 | msgstr "E131: Íåâîçìîæíî óäàëèòü ôóíêöèþ %s, îíà èñïîëüçóåòñÿ" |
579 | 579 | |
580 | -#: eval.c:9455 | |
580 | +#: eval.c:9473 | |
581 | 581 | msgid "E132: Function call depth is higher than 'maxfuncdepth'" |
582 | 582 | msgstr "E132: Ãëóáèíà âûçîâà ôóíêöèè áîëüøå, ÷åì çíà÷åíèå 'maxfuncdepth'" |
583 | 583 | |
584 | 584 | #. always scroll up, don't overwrite |
585 | -#: eval.c:9508 | |
585 | +#: eval.c:9526 | |
586 | 586 | #, c-format |
587 | 587 | msgid "calling %s" |
588 | 588 | msgstr "âûçîâ %s" |
589 | 589 | |
590 | -#: eval.c:9570 | |
590 | +#: eval.c:9588 | |
591 | 591 | #, c-format |
592 | 592 | msgid "%s aborted" |
593 | 593 | msgstr "%s ïðåðâàíà" |
594 | 594 | |
595 | -#: eval.c:9572 | |
595 | +#: eval.c:9590 | |
596 | 596 | #, c-format |
597 | 597 | msgid "%s returning #%ld" |
598 | 598 | msgstr "%s âîçâðàùàåò #%ld" |
599 | 599 | |
600 | -#: eval.c:9579 | |
600 | +#: eval.c:9597 | |
601 | 601 | #, c-format |
602 | 602 | msgid "%s returning \"%s\"" |
603 | 603 | msgstr "%s âîçâðàùàåò \"%s\"" |
604 | 604 | |
605 | 605 | #. always scroll up, don't overwrite |
606 | -#: eval.c:9595 ex_cmds2.c:2365 | |
606 | +#: eval.c:9613 ex_cmds2.c:2370 | |
607 | 607 | #, c-format |
608 | 608 | msgid "continuing in %s" |
609 | 609 | msgstr "ïðîäîëæåíèå â %s" |
610 | 610 | |
611 | -#: eval.c:9621 | |
611 | +#: eval.c:9639 | |
612 | 612 | msgid "E133: :return not inside a function" |
613 | 613 | msgstr "E133: êîìàíäà :return âíå ôóíêöèè" |
614 | 614 | |
615 | -#: eval.c:9952 | |
615 | +#: eval.c:9970 | |
616 | 616 | #, c-format |
617 | 617 | msgid "" |
618 | 618 | "\n" |
@@ -728,7 +728,7 @@ | ||
728 | 728 | msgid "Illegal starting char" |
729 | 729 | msgstr "Íåäîïóñòèìûé íà÷àëüíûé ñèìâîë" |
730 | 730 | |
731 | -#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763 | |
731 | +#: ex_cmds.c:2097 ex_cmds2.c:761 | |
732 | 732 | msgid "Save As" |
733 | 733 | msgstr "Ñîõðàíèòü êàê" |
734 | 734 |
@@ -756,11 +756,11 @@ | ||
756 | 756 | msgid "E141: No file name for buffer %ld" |
757 | 757 | msgstr "E141: Áóôåð %ld íå ñâÿçàí ñ èìåíåì ôàéëà" |
758 | 758 | |
759 | -#: ex_cmds.c:2405 | |
759 | +#: ex_cmds.c:2406 | |
760 | 760 | msgid "E142: File not written: Writing is disabled by 'write' option" |
761 | 761 | msgstr "E142: Ôàéë íå ñîõðàí¸í: çàïèñü îòêëþ÷åíà îïöèåé 'write'" |
762 | 762 | |
763 | -#: ex_cmds.c:2425 | |
763 | +#: ex_cmds.c:2426 | |
764 | 764 | #, c-format |
765 | 765 | msgid "" |
766 | 766 | "'readonly' option is set for \"%.*s\".\n" |
@@ -769,68 +769,68 @@ | ||
769 | 769 | "Äëÿ \"%.*s\" âêëþ÷åíà îïöèÿ 'readonly'.\n" |
770 | 770 | "Çàïèñàòü?" |
771 | 771 | |
772 | -#: ex_cmds.c:2597 | |
772 | +#: ex_cmds.c:2599 | |
773 | 773 | msgid "Edit File" |
774 | 774 | msgstr "Ðåäàêòèðîâàíèå ôàéëà" |
775 | 775 | |
776 | -#: ex_cmds.c:3205 | |
776 | +#: ex_cmds.c:3206 | |
777 | 777 | #, c-format |
778 | 778 | msgid "E143: Autocommands unexpectedly deleted new buffer %s" |
779 | 779 | msgstr "E143: Àâòîêîìàíäû íåîæèäàííî óáèëè íîâûé áóôåð %s" |
780 | 780 | |
781 | -#: ex_cmds.c:3339 | |
781 | +#: ex_cmds.c:3340 | |
782 | 782 | msgid "E144: non-numeric argument to :z" |
783 | 783 | msgstr "E144: Ïàðàìåòð êîìàíäû :z äîëæåí áûòü ÷èñëîì" |
784 | 784 | |
785 | -#: ex_cmds.c:3424 | |
785 | +#: ex_cmds.c:3425 | |
786 | 786 | msgid "E145: Shell commands not allowed in rvim" |
787 | 787 | msgstr "E145: Èñïîëüçîâàíèå êîìàíä îáîëî÷êè íå äîïóñêàåòñÿ â rvim." |
788 | 788 | |
789 | -#: ex_cmds.c:3531 | |
789 | +#: ex_cmds.c:3532 | |
790 | 790 | msgid "E146: Regular expressions can't be delimited by letters" |
791 | 791 | msgstr "E146: Ðåãóëÿðíûå âûðàæåíèÿ íå ìîãóò ðàçäåëÿòüñÿ áóêâàìè" |
792 | 792 | |
793 | -#: ex_cmds.c:3877 | |
793 | +#: ex_cmds.c:3878 | |
794 | 794 | #, c-format |
795 | 795 | msgid "replace with %s (y/n/a/q/l/^E/^Y)?" |
796 | 796 | msgstr "çàìåíèòü íà %s? (y/n/a/q/l/^E/^Y)" |
797 | 797 | |
798 | -#: ex_cmds.c:4270 | |
798 | +#: ex_cmds.c:4271 | |
799 | 799 | msgid "(Interrupted) " |
800 | 800 | msgstr "(Ïðåðâàíî)" |
801 | 801 | |
802 | -#: ex_cmds.c:4274 | |
802 | +#: ex_cmds.c:4275 | |
803 | 803 | msgid "1 substitution" |
804 | 804 | msgstr "Îäíà çàìåíà" |
805 | 805 | |
806 | -#: ex_cmds.c:4276 | |
806 | +#: ex_cmds.c:4277 | |
807 | 807 | #, c-format |
808 | 808 | msgid "%ld substitutions" |
809 | 809 | msgstr "%ld çàìåí" |
810 | 810 | |
811 | -#: ex_cmds.c:4279 | |
811 | +#: ex_cmds.c:4280 | |
812 | 812 | msgid " on 1 line" |
813 | 813 | msgstr " â îäíîé ñòðîêå" |
814 | 814 | |
815 | -#: ex_cmds.c:4281 | |
815 | +#: ex_cmds.c:4282 | |
816 | 816 | #, c-format |
817 | 817 | msgid " on %ld lines" |
818 | 818 | msgstr " â %ld ñòð." |
819 | 819 | |
820 | -#: ex_cmds.c:4332 | |
820 | +#: ex_cmds.c:4333 | |
821 | 821 | msgid "E147: Cannot do :global recursive" |
822 | 822 | msgstr "E147: Êîìàíäà :global íå ìîæåò áûòü ðåêóðñèâíîé" |
823 | 823 | |
824 | -#: ex_cmds.c:4367 | |
824 | +#: ex_cmds.c:4368 | |
825 | 825 | msgid "E148: Regular expression missing from global" |
826 | 826 | msgstr "E148: Â êîìàíäå :global ïðîïóùåíî ðåãóëÿðíîå âûðàæåíèå" |
827 | 827 | |
828 | -#: ex_cmds.c:4416 | |
828 | +#: ex_cmds.c:4417 | |
829 | 829 | #, c-format |
830 | 830 | msgid "Pattern found in every line: %s" |
831 | 831 | msgstr "Ñîîòâåòñòâèå øàáëîíó íàéäåíî íà êàæäîé ñòðîêå: %s" |
832 | 832 | |
833 | -#: ex_cmds.c:4497 | |
833 | +#: ex_cmds.c:4498 | |
834 | 834 | #, c-format |
835 | 835 | msgid "" |
836 | 836 | "\n" |
@@ -841,96 +841,96 @@ | ||
841 | 841 | "# Ïîñëåäíÿÿ ñòðîêà äëÿ çàìåíû:\n" |
842 | 842 | "$" |
843 | 843 | |
844 | -#: ex_cmds.c:4598 | |
844 | +#: ex_cmds.c:4599 | |
845 | 845 | msgid "E478: Don't panic!" |
846 | 846 | msgstr "E478: Ñïîêîéñòâèå, òîëüêî ñïîêîéñòâèå!" |
847 | 847 | |
848 | -#: ex_cmds.c:4650 | |
848 | +#: ex_cmds.c:4651 | |
849 | 849 | #, c-format |
850 | 850 | msgid "E661: Sorry, no '%s' help for %s" |
851 | 851 | msgstr "E661: ê ñîæàëåíèþ, ñïðàâêà '%s' äëÿ %s îòñóòñòâóåò" |
852 | 852 | |
853 | -#: ex_cmds.c:4653 | |
853 | +#: ex_cmds.c:4654 | |
854 | 854 | #, c-format |
855 | 855 | msgid "E149: Sorry, no help for %s" |
856 | 856 | msgstr "E149: Ê ñîæàëåíèþ ñïðàâêà äëÿ %s îòñóòñòâóåò" |
857 | 857 | |
858 | -#: ex_cmds.c:4687 | |
858 | +#: ex_cmds.c:4688 | |
859 | 859 | #, c-format |
860 | 860 | msgid "Sorry, help file \"%s\" not found" |
861 | 861 | msgstr "Èçâèíèòå, ôàéë ñïðàâêè \"%s\" íå íàéäåí" |
862 | 862 | |
863 | -#: ex_cmds.c:5170 | |
863 | +#: ex_cmds.c:5191 | |
864 | 864 | #, c-format |
865 | 865 | msgid "E150: Not a directory: %s" |
866 | 866 | msgstr "E150: %s íå ÿâëÿåòñÿ êàòàëîãîì" |
867 | 867 | |
868 | -#: ex_cmds.c:5309 | |
868 | +#: ex_cmds.c:5330 | |
869 | 869 | #, c-format |
870 | 870 | msgid "E152: Cannot open %s for writing" |
871 | 871 | msgstr "E152: Íåâîçìîæíî îòêðûòü %s äëÿ çàïèñè" |
872 | 872 | |
873 | -#: ex_cmds.c:5345 | |
873 | +#: ex_cmds.c:5366 | |
874 | 874 | #, c-format |
875 | 875 | msgid "E153: Unable to open %s for reading" |
876 | 876 | msgstr "E153: Íåâîçìîæíî îòêðûòü %s äëÿ ÷òåíèÿ" |
877 | 877 | |
878 | -#: ex_cmds.c:5367 | |
878 | +#: ex_cmds.c:5388 | |
879 | 879 | #, c-format |
880 | 880 | msgid "E670: Mix of help file encodings within a language: %s" |
881 | 881 | msgstr "E670: Ôàéëû ñïðàâêè èñïîëüçóþò ðàçíûå êîäèðîâêè äëÿ îäíîãî ÿçûêà: %s" |
882 | 882 | |
883 | -#: ex_cmds.c:5445 | |
883 | +#: ex_cmds.c:5466 | |
884 | 884 | #, c-format |
885 | 885 | msgid "E154: Duplicate tag \"%s\" in file %s" |
886 | 886 | msgstr "E154: Ïîâòîðÿþùàÿñÿ ìåòêà \"%s\" â ôàéëå %s" |
887 | 887 | |
888 | -#: ex_cmds.c:5557 | |
888 | +#: ex_cmds.c:5578 | |
889 | 889 | #, c-format |
890 | 890 | msgid "E160: Unknown sign command: %s" |
891 | 891 | msgstr "E160: Íåèçâåñòíàÿ êîìàíäà çíà÷êà %s" |
892 | 892 | |
893 | -#: ex_cmds.c:5577 | |
893 | +#: ex_cmds.c:5598 | |
894 | 894 | msgid "E156: Missing sign name" |
895 | 895 | msgstr "E156: Ïðîïóùåíî èìÿ çíà÷êà" |
896 | 896 | |
897 | -#: ex_cmds.c:5623 | |
897 | +#: ex_cmds.c:5644 | |
898 | 898 | msgid "E612: Too many signs defined" |
899 | 899 | msgstr "E612: Îïðåäåëåíî ñëèøêîì ìíîãî çíà÷êîâ" |
900 | 900 | |
901 | -#: ex_cmds.c:5691 | |
901 | +#: ex_cmds.c:5712 | |
902 | 902 | #, c-format |
903 | 903 | msgid "E239: Invalid sign text: %s" |
904 | 904 | msgstr "E239: Íåïðàâèëüíûé òåêñò çíà÷êà: %s" |
905 | 905 | |
906 | -#: ex_cmds.c:5722 ex_cmds.c:5913 | |
906 | +#: ex_cmds.c:5743 ex_cmds.c:5934 | |
907 | 907 | #, c-format |
908 | 908 | msgid "E155: Unknown sign: %s" |
909 | 909 | msgstr "E155: Íåèçâåñòíûé çíà÷îê: %s" |
910 | 910 | |
911 | -#: ex_cmds.c:5771 | |
911 | +#: ex_cmds.c:5792 | |
912 | 912 | msgid "E159: Missing sign number" |
913 | 913 | msgstr "E159: Ïðîïóùåí íîìåð çíà÷êà" |
914 | 914 | |
915 | -#: ex_cmds.c:5853 | |
915 | +#: ex_cmds.c:5874 | |
916 | 916 | #, c-format |
917 | 917 | msgid "E158: Invalid buffer name: %s" |
918 | 918 | msgstr "E158: Íåïðàâèëüíîå èìÿ áóôåðà: %s" |
919 | 919 | |
920 | -#: ex_cmds.c:5892 | |
920 | +#: ex_cmds.c:5913 | |
921 | 921 | #, c-format |
922 | 922 | msgid "E157: Invalid sign ID: %ld" |
923 | 923 | msgstr "E157: Íåïðàâèëüíûé ID çíà÷êà: %ld" |
924 | 924 | |
925 | -#: ex_cmds.c:5962 | |
925 | +#: ex_cmds.c:5983 | |
926 | 926 | msgid " (NOT FOUND)" |
927 | 927 | msgstr " (ÍÅ ÍÀÉÄÅÍÎ)" |
928 | 928 | |
929 | -#: ex_cmds.c:5964 | |
929 | +#: ex_cmds.c:5985 | |
930 | 930 | msgid " (not supported)" |
931 | 931 | msgstr " (íå ïîääåðæèâàåòñÿ)" |
932 | 932 | |
933 | -#: ex_cmds.c:6063 | |
933 | +#: ex_cmds.c:6084 | |
934 | 934 | msgid "[Deleted]" |
935 | 935 | msgstr "[Óäàëåíî]" |
936 | 936 |
@@ -938,7 +938,7 @@ | ||
938 | 938 | msgid "Entering Debug mode. Type \"cont\" to continue." |
939 | 939 | msgstr "Âêëþ÷¸í ðåæèì îòëàäêè. Äëÿ ïðîäîëæåíèÿ íàáåðèòå \"cont\"" |
940 | 940 | |
941 | -#: ex_cmds2.c:96 ex_docmd.c:966 | |
941 | +#: ex_cmds2.c:96 ex_docmd.c:968 | |
942 | 942 | #, c-format |
943 | 943 | msgid "line %ld: %s" |
944 | 944 | msgstr "ñòðîêà %ld: %s" |
@@ -972,7 +972,7 @@ | ||
972 | 972 | msgid "Save changes to \"%.*s\"?" |
973 | 973 | msgstr "Ñîõðàíèòü èçìåíåíèÿ â \"%.*s\"?" |
974 | 974 | |
975 | -#: ex_cmds2.c:788 ex_docmd.c:9378 | |
975 | +#: ex_cmds2.c:788 ex_docmd.c:9398 | |
976 | 976 | msgid "Untitled" |
977 | 977 | msgstr "Áåç èìåíè" |
978 | 978 |
@@ -1003,168 +1003,168 @@ | ||
1003 | 1003 | msgid "E666: compiler not supported: %s" |
1004 | 1004 | msgstr "E666: êîìïèëÿòîð íå ïîääåðæèâàåòñÿ: %s" |
1005 | 1005 | |
1006 | -#: ex_cmds2.c:1897 | |
1006 | +#: ex_cmds2.c:1901 | |
1007 | 1007 | #, c-format |
1008 | 1008 | msgid "Searching for \"%s\" in \"%s\"" |
1009 | 1009 | msgstr "Ïîèñê \"%s\" â \"%s\"" |
1010 | 1010 | |
1011 | -#: ex_cmds2.c:1919 | |
1011 | +#: ex_cmds2.c:1923 | |
1012 | 1012 | #, c-format |
1013 | 1013 | msgid "Searching for \"%s\"" |
1014 | 1014 | msgstr "Ïîèñê \"%s\"" |
1015 | 1015 | |
1016 | -#: ex_cmds2.c:1940 | |
1016 | +#: ex_cmds2.c:1945 | |
1017 | 1017 | #, c-format |
1018 | 1018 | msgid "not found in 'runtimepath': \"%s\"" |
1019 | 1019 | msgstr "íå íàéäåíî â 'runtimepath': \"%s\"" |
1020 | 1020 | |
1021 | -#: ex_cmds2.c:1974 | |
1021 | +#: ex_cmds2.c:1979 | |
1022 | 1022 | msgid "Source Vim script" |
1023 | 1023 | msgstr "Âûïîëíèòü ñöåíàðèé Vim" |
1024 | 1024 | |
1025 | -#: ex_cmds2.c:2164 | |
1025 | +#: ex_cmds2.c:2169 | |
1026 | 1026 | #, c-format |
1027 | 1027 | msgid "Cannot source a directory: \"%s\"" |
1028 | 1028 | msgstr "Íåëüçÿ ñ÷èòàòü êàòàëîã: \"%s\"" |
1029 | 1029 | |
1030 | -#: ex_cmds2.c:2202 | |
1030 | +#: ex_cmds2.c:2207 | |
1031 | 1031 | #, c-format |
1032 | 1032 | msgid "could not source \"%s\"" |
1033 | 1033 | msgstr "íåâîçìîæíî ñ÷èòàòü \"%s\"" |
1034 | 1034 | |
1035 | -#: ex_cmds2.c:2204 | |
1035 | +#: ex_cmds2.c:2209 | |
1036 | 1036 | #, c-format |
1037 | 1037 | msgid "line %ld: could not source \"%s\"" |
1038 | 1038 | msgstr "ñòðîêà %ld: íåâîçìîæíî ñ÷èòàòü \"%s\"" |
1039 | 1039 | |
1040 | -#: ex_cmds2.c:2218 | |
1040 | +#: ex_cmds2.c:2223 | |
1041 | 1041 | #, c-format |
1042 | 1042 | msgid "sourcing \"%s\"" |
1043 | 1043 | msgstr "ñ÷èòûâàíèå ñöåíàðèÿ \"%s\"" |
1044 | 1044 | |
1045 | -#: ex_cmds2.c:2220 | |
1045 | +#: ex_cmds2.c:2225 | |
1046 | 1046 | #, c-format |
1047 | 1047 | msgid "line %ld: sourcing \"%s\"" |
1048 | 1048 | msgstr "ñòðîêà %ld: ñ÷èòûâàíèå \"%s\"" |
1049 | 1049 | |
1050 | -#: ex_cmds2.c:2363 | |
1050 | +#: ex_cmds2.c:2368 | |
1051 | 1051 | #, c-format |
1052 | 1052 | msgid "finished sourcing %s" |
1053 | 1053 | msgstr "ñ÷èòûâàíèå ñöåíàðèÿ %s çàâåðøåíî" |
1054 | 1054 | |
1055 | -#: ex_cmds2.c:2707 | |
1055 | +#: ex_cmds2.c:2712 | |
1056 | 1056 | msgid "W15: Warning: Wrong line separator, ^M may be missing" |
1057 | 1057 | msgstr "" |
1058 | 1058 | "W15: Ïðåäóïðåæäåíèå: íåïðàâèëüíûé ðàçäåëèòåëü ñòðîêè. Âîçìîæíî ïðîïóùåíî ^M" |
1059 | 1059 | |
1060 | -#: ex_cmds2.c:2756 | |
1060 | +#: ex_cmds2.c:2761 | |
1061 | 1061 | msgid "E167: :scriptencoding used outside of a sourced file" |
1062 | 1062 | msgstr "E167: Êîìàíäà :scriptencoding èñïîëüçóåòñÿ âíå ôàéëà ñöåíàðèÿ" |
1063 | 1063 | |
1064 | -#: ex_cmds2.c:2789 | |
1064 | +#: ex_cmds2.c:2794 | |
1065 | 1065 | msgid "E168: :finish used outside of a sourced file" |
1066 | 1066 | msgstr "E168: Êîìàíäà :finish èñïîëüçóåòñÿ âíå ôàéëà ñöåíàðèÿ" |
1067 | 1067 | |
1068 | -#: ex_cmds2.c:3238 | |
1068 | +#: ex_cmds2.c:3243 | |
1069 | 1069 | #, c-format |
1070 | 1070 | msgid "Page %d" |
1071 | 1071 | msgstr "Ñòðàíèöà %d" |
1072 | 1072 | |
1073 | -#: ex_cmds2.c:3394 | |
1073 | +#: ex_cmds2.c:3399 | |
1074 | 1074 | msgid "No text to be printed" |
1075 | 1075 | msgstr "Ïå÷àòàòü íå÷åãî" |
1076 | 1076 | |
1077 | -#: ex_cmds2.c:3472 | |
1077 | +#: ex_cmds2.c:3477 | |
1078 | 1078 | #, c-format |
1079 | 1079 | msgid "Printing page %d (%d%%)" |
1080 | 1080 | msgstr "Ïå÷àòü ñòð. %d (%d%%)" |
1081 | 1081 | |
1082 | -#: ex_cmds2.c:3484 | |
1082 | +#: ex_cmds2.c:3489 | |
1083 | 1083 | #, c-format |
1084 | 1084 | msgid " Copy %d of %d" |
1085 | 1085 | msgstr " Êîïèÿ %d èç %d" |
1086 | 1086 | |
1087 | -#: ex_cmds2.c:3542 | |
1087 | +#: ex_cmds2.c:3547 | |
1088 | 1088 | #, c-format |
1089 | 1089 | msgid "Printed: %s" |
1090 | 1090 | msgstr "Íàïå÷àòàíî: %s" |
1091 | 1091 | |
1092 | -#: ex_cmds2.c:3549 | |
1092 | +#: ex_cmds2.c:3554 | |
1093 | 1093 | #, c-format |
1094 | 1094 | msgid "Printing aborted" |
1095 | 1095 | msgstr "Ïå÷àòü ïðåêðàùåíà" |
1096 | 1096 | |
1097 | -#: ex_cmds2.c:3914 | |
1097 | +#: ex_cmds2.c:3919 | |
1098 | 1098 | msgid "E455: Error writing to PostScript output file" |
1099 | 1099 | msgstr "E455: Îøèáêà çàïèñè â ôàéë PostScript" |
1100 | 1100 | |
1101 | -#: ex_cmds2.c:4189 | |
1101 | +#: ex_cmds2.c:4194 | |
1102 | 1102 | #, c-format |
1103 | 1103 | msgid "E624: Can't open file \"%s\"" |
1104 | 1104 | msgstr "E624: Íåâîçìîæíî îòêðûòü ôàéë \"%s\"" |
1105 | 1105 | |
1106 | -#: ex_cmds2.c:4199 ex_cmds2.c:4824 | |
1106 | +#: ex_cmds2.c:4204 ex_cmds2.c:4829 | |
1107 | 1107 | #, c-format |
1108 | 1108 | msgid "E457: Can't read PostScript resource file \"%s\"" |
1109 | 1109 | msgstr "E457: Íåâîçìîæíî ïðî÷èòàòü ôàéë ðåñóðñîâ PostScript \"%s\"" |
1110 | 1110 | |
1111 | -#: ex_cmds2.c:4207 | |
1111 | +#: ex_cmds2.c:4212 | |
1112 | 1112 | #, c-format |
1113 | 1113 | msgid "E618: file \"%s\" is not a PostScript resource file" |
1114 | 1114 | msgstr "E618: ôàéë \"%s\" íå ÿâëÿåòñÿ ôàéëîì ðåñóðñîâ PostScript" |
1115 | 1115 | |
1116 | -#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279 | |
1116 | +#: ex_cmds2.c:4227 ex_cmds2.c:4247 ex_cmds2.c:4262 ex_cmds2.c:4284 | |
1117 | 1117 | #, c-format |
1118 | 1118 | msgid "E619: file \"%s\" is not a supported PostScript resource file" |
1119 | 1119 | msgstr "E619: ôàéë \"%s\" íå ÿâëÿåòñÿ äîïóñòèìûì ôàéëîì ðåñóðñîâ PostScript" |
1120 | 1120 | |
1121 | -#: ex_cmds2.c:4309 | |
1121 | +#: ex_cmds2.c:4314 | |
1122 | 1122 | #, c-format |
1123 | 1123 | msgid "E621: \"%s\" resource file has wrong version" |
1124 | 1124 | msgstr "E621: ôàéë ðåñóðñîâ \"%s\" íåèçâåñòíîé âåðñèè" |
1125 | 1125 | |
1126 | -#: ex_cmds2.c:4776 | |
1126 | +#: ex_cmds2.c:4781 | |
1127 | 1127 | msgid "E324: Can't open PostScript output file" |
1128 | 1128 | msgstr "E324: Íåâîçìîæíî îòêðûòü ôàéë PostScript" |
1129 | 1129 | |
1130 | -#: ex_cmds2.c:4809 | |
1130 | +#: ex_cmds2.c:4814 | |
1131 | 1131 | #, c-format |
1132 | 1132 | msgid "E456: Can't open file \"%s\"" |
1133 | 1133 | msgstr "E456: Íåâîçìîæíî îòêðûòü ôàéë \"%s\"" |
1134 | 1134 | |
1135 | -#: ex_cmds2.c:4928 | |
1135 | +#: ex_cmds2.c:4933 | |
1136 | 1136 | msgid "E456: Can't find PostScript resource file \"prolog.ps\"" |
1137 | 1137 | msgstr "E456: Ôàéë ðåñóðñîâ PostScript \"prolog.ps\" íå íàéäåí" |
1138 | 1138 | |
1139 | -#: ex_cmds2.c:4959 | |
1139 | +#: ex_cmds2.c:4964 | |
1140 | 1140 | #, c-format |
1141 | 1141 | msgid "E456: Can't find PostScript resource file \"%s.ps\"" |
1142 | 1142 | msgstr "E456: Ôàéë ðåñóðñîâ PostScript \"%s.ps\" íå íàéäåí" |
1143 | 1143 | |
1144 | -#: ex_cmds2.c:4977 | |
1144 | +#: ex_cmds2.c:4982 | |
1145 | 1145 | #, c-format |
1146 | 1146 | msgid "E620: Unable to convert from multi-byte to \"%s\" encoding" |
1147 | 1147 | msgstr "" |
1148 | 1148 | "E620: Ïðåîáðàçîâàíèå èç ìóëüòèáàéòíûõ ñèìâîëîâ â êîäèðîâêó \"%s\" íåâîçìîæíî" |
1149 | 1149 | |
1150 | -#: ex_cmds2.c:5102 | |
1150 | +#: ex_cmds2.c:5107 | |
1151 | 1151 | msgid "Sending to printer..." |
1152 | 1152 | msgstr "Îòïðàâêà íà ïå÷àòü..." |
1153 | 1153 | |
1154 | -#: ex_cmds2.c:5106 | |
1154 | +#: ex_cmds2.c:5111 | |
1155 | 1155 | msgid "E365: Failed to print PostScript file" |
1156 | 1156 | msgstr "E365: Íå óäàëîñü âûïîëíèòü ïå÷àòü ôàéëà PostScript" |
1157 | 1157 | |
1158 | -#: ex_cmds2.c:5108 | |
1158 | +#: ex_cmds2.c:5113 | |
1159 | 1159 | msgid "Print job sent." |
1160 | 1160 | msgstr "Çàäàíèå íà ïå÷àòü îòïðàâëåíî." |
1161 | 1161 | |
1162 | -#: ex_cmds2.c:5618 | |
1162 | +#: ex_cmds2.c:5623 | |
1163 | 1163 | #, c-format |
1164 | 1164 | msgid "Current %slanguage: \"%s\"" |
1165 | 1165 | msgstr "Àêòèâíûé %sÿçûê: \"%s\"" |
1166 | 1166 | |
1167 | -#: ex_cmds2.c:5629 | |
1167 | +#: ex_cmds2.c:5634 | |
1168 | 1168 | #, c-format |
1169 | 1169 | msgid "E197: Cannot set language to \"%s\"" |
1170 | 1170 | msgstr "E197: Íåâîçìîæíî ñìåíèòü ÿçûê íà \"%s\"" |
@@ -1178,74 +1178,74 @@ | ||
1178 | 1178 | msgid "E501: At end-of-file" |
1179 | 1179 | msgstr "E501: Â êîíöå ôàéëà" |
1180 | 1180 | |
1181 | -#: ex_docmd.c:669 | |
1181 | +#: ex_docmd.c:670 | |
1182 | 1182 | msgid "E169: Command too recursive" |
1183 | 1183 | msgstr "E169: Cëèøêîì ðåêóðñèâíàÿ êîìàíäà" |
1184 | 1184 | |
1185 | -#: ex_docmd.c:1229 | |
1185 | +#: ex_docmd.c:1232 | |
1186 | 1186 | #, c-format |
1187 | 1187 | msgid "E605: Exception not caught: %s" |
1188 | 1188 | msgstr "E605: Èñêëþ÷èòåëüíàÿ ñèòóàöèÿ íå îáðàáîòàíà: %s" |
1189 | 1189 | |
1190 | -#: ex_docmd.c:1317 | |
1190 | +#: ex_docmd.c:1320 | |
1191 | 1191 | msgid "End of sourced file" |
1192 | 1192 | msgstr "Êîíåö ñ÷èòàííîãî ôàéëà" |
1193 | 1193 | |
1194 | -#: ex_docmd.c:1318 | |
1194 | +#: ex_docmd.c:1321 | |
1195 | 1195 | msgid "End of function" |
1196 | 1196 | msgstr "Êîíåö ôóíêöèè" |
1197 | 1197 | |
1198 | -#: ex_docmd.c:1907 | |
1198 | +#: ex_docmd.c:1910 | |
1199 | 1199 | msgid "E464: Ambiguous use of user-defined command" |
1200 | 1200 | msgstr "E464: Íåîäíîçíà÷íîå èñïîëüçîâàíèå êîìàíäû ïîëüçîâàòåëÿ" |
1201 | 1201 | |
1202 | -#: ex_docmd.c:1921 | |
1202 | +#: ex_docmd.c:1924 | |
1203 | 1203 | msgid "E492: Not an editor command" |
1204 | 1204 | msgstr "E492: Ýòî íå êîìàíäà ðåäàêòîðà" |
1205 | 1205 | |
1206 | -#: ex_docmd.c:2028 | |
1206 | +#: ex_docmd.c:2031 | |
1207 | 1207 | msgid "E493: Backwards range given" |
1208 | 1208 | msgstr "E493: Çàäàí îáðàòíûé äèàïàçîí" |
1209 | 1209 | |
1210 | -#: ex_docmd.c:2037 | |
1210 | +#: ex_docmd.c:2040 | |
1211 | 1211 | msgid "Backwards range given, OK to swap" |
1212 | 1212 | msgstr "Çàäàí îáðàòíûé äèàïàçîí, ìåíÿåì ãðàíèöû ìåñòàìè" |
1213 | 1213 | |
1214 | -#: ex_docmd.c:2160 | |
1214 | +#: ex_docmd.c:2163 | |
1215 | 1215 | msgid "E494: Use w or w>>" |
1216 | 1216 | msgstr "E494: Èñïîëüçóéòå w èëè w>>" |
1217 | 1217 | |
1218 | -#: ex_docmd.c:3786 | |
1218 | +#: ex_docmd.c:3789 | |
1219 | 1219 | msgid "E319: Sorry, the command is not available in this version" |
1220 | 1220 | msgstr "E319: Èçâèíèòå, ýòà êîìàíäà íåäîñòóïíà â äàííîé âåðñèè" |
1221 | 1221 | |
1222 | -#: ex_docmd.c:3989 | |
1222 | +#: ex_docmd.c:3992 | |
1223 | 1223 | msgid "E172: Only one file name allowed" |
1224 | 1224 | msgstr "E172: Ðàçðåøåíî èñïîëüçîâàòü òîëüêî îäíî èìÿ ôàéëà" |
1225 | 1225 | |
1226 | -#: ex_docmd.c:4569 | |
1226 | +#: ex_docmd.c:4572 | |
1227 | 1227 | msgid "1 more file to edit. Quit anyway?" |
1228 | 1228 | msgstr "1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ. Âûéòè?" |
1229 | 1229 | |
1230 | -#: ex_docmd.c:4572 | |
1230 | +#: ex_docmd.c:4575 | |
1231 | 1231 | #, c-format |
1232 | 1232 | msgid "%d more files to edit. Quit anyway?" |
1233 | 1233 | msgstr "Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%d). Âûéòè?" |
1234 | 1234 | |
1235 | -#: ex_docmd.c:4579 | |
1235 | +#: ex_docmd.c:4582 | |
1236 | 1236 | msgid "E173: 1 more file to edit" |
1237 | 1237 | msgstr "E173: 1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ." |
1238 | 1238 | |
1239 | -#: ex_docmd.c:4581 | |
1239 | +#: ex_docmd.c:4584 | |
1240 | 1240 | #, c-format |
1241 | 1241 | msgid "E173: %ld more files to edit" |
1242 | 1242 | msgstr "E173: Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%d)." |
1243 | 1243 | |
1244 | -#: ex_docmd.c:4676 | |
1244 | +#: ex_docmd.c:4679 | |
1245 | 1245 | msgid "E174: Command already exists: add ! to replace it" |
1246 | 1246 | msgstr "E174: Êîìàíäà óæå ñóùåñòâóåò. Äîáàâüòå ! äëÿ çàìåíû." |
1247 | 1247 | |
1248 | -#: ex_docmd.c:4787 | |
1248 | +#: ex_docmd.c:4790 | |
1249 | 1249 | msgid "" |
1250 | 1250 | "\n" |
1251 | 1251 | " Name Args Range Complete Definition" |
@@ -1253,177 +1253,177 @@ | ||
1253 | 1253 | "\n" |
1254 | 1254 | " Èìÿ Ïàðàì. Äèàï. Äîïîëí. Îïðåäåëåíèå" |
1255 | 1255 | |
1256 | -#: ex_docmd.c:4876 | |
1256 | +#: ex_docmd.c:4879 | |
1257 | 1257 | msgid "No user-defined commands found" |
1258 | 1258 | msgstr "Êîìàíäû, îïðåäåë¸ííûå ïîëüçîâàòåëåì, íå îáíàðóæåíû." |
1259 | 1259 | |
1260 | -#: ex_docmd.c:4908 | |
1260 | +#: ex_docmd.c:4911 | |
1261 | 1261 | msgid "E175: No attribute specified" |
1262 | 1262 | msgstr "E175: ïàðàìåòð íå çàäàí" |
1263 | 1263 | |
1264 | -#: ex_docmd.c:4960 | |
1264 | +#: ex_docmd.c:4963 | |
1265 | 1265 | msgid "E176: Invalid number of arguments" |
1266 | 1266 | msgstr "E176: Íåïðàâèëüíîå êîëè÷åñòâî ïàðàìåòðîâ" |
1267 | 1267 | |
1268 | -#: ex_docmd.c:4975 | |
1268 | +#: ex_docmd.c:4978 | |
1269 | 1269 | msgid "E177: Count cannot be specified twice" |
1270 | 1270 | msgstr "E177: ×èñëî-ïðèñòàâêó íåëüçÿ óêàçûâàòü äâàæäû" |
1271 | 1271 | |
1272 | -#: ex_docmd.c:4985 | |
1272 | +#: ex_docmd.c:4988 | |
1273 | 1273 | msgid "E178: Invalid default value for count" |
1274 | 1274 | msgstr "E178: Íåïðàâèëüíîå çíà÷åíèå ÷èñëà-ïðèñòàâêè ïî óìîë÷àíèþ" |
1275 | 1275 | |
1276 | -#: ex_docmd.c:5016 | |
1276 | +#: ex_docmd.c:5019 | |
1277 | 1277 | msgid "E179: argument required for complete" |
1278 | 1278 | msgstr "E179: äëÿ çàâåðøåíèÿ òðåáóåòñÿ óêàçàòü ïàðàìåòð" |
1279 | 1279 | |
1280 | -#: ex_docmd.c:5048 | |
1280 | +#: ex_docmd.c:5051 | |
1281 | 1281 | #, c-format |
1282 | 1282 | msgid "E180: Invalid complete value: %s" |
1283 | 1283 | msgstr "E180: Íåïðàâèëüíîå çíà÷åíèå äîïîëíåíèÿ: %s" |
1284 | 1284 | |
1285 | -#: ex_docmd.c:5057 | |
1285 | +#: ex_docmd.c:5060 | |
1286 | 1286 | msgid "E468: Completion argument only allowed for custom completion" |
1287 | 1287 | msgstr "" |
1288 | 1288 | "E468: Ïàðàìåòð àâòîäîïîëíåíèÿ ìîæíî èñïîëüçîâàòü òîëüêî ñ îñîáûì äîïîëíåíèåì" |
1289 | 1289 | |
1290 | -#: ex_docmd.c:5063 | |
1290 | +#: ex_docmd.c:5066 | |
1291 | 1291 | msgid "E467: Custom completion requires a function argument" |
1292 | 1292 | msgstr "E467: Îñîáîå äîïîëíåíèå òðåáóåò óêàçàíèÿ ïàðàìåòðà ôóíêöèè" |
1293 | 1293 | |
1294 | -#: ex_docmd.c:5074 | |
1294 | +#: ex_docmd.c:5077 | |
1295 | 1295 | #, c-format |
1296 | 1296 | msgid "E181: Invalid attribute: %s" |
1297 | 1297 | msgstr "E181: Íåïðàâèëüíûé àòðèáóò: %s" |
1298 | 1298 | |
1299 | -#: ex_docmd.c:5117 | |
1299 | +#: ex_docmd.c:5120 | |
1300 | 1300 | msgid "E182: Invalid command name" |
1301 | 1301 | msgstr "E182: Íåïðàâèëüíîå èìÿ êîìàíäû" |
1302 | 1302 | |
1303 | -#: ex_docmd.c:5132 | |
1303 | +#: ex_docmd.c:5135 | |
1304 | 1304 | msgid "E183: User defined commands must start with an uppercase letter" |
1305 | 1305 | msgstr "E183: Êîìàíäà ïîëüçîâàòåëÿ äîëæíà íà÷èíàòüñÿ ñ çàãëàâíîé áóêâû" |
1306 | 1306 | |
1307 | -#: ex_docmd.c:5203 | |
1307 | +#: ex_docmd.c:5206 | |
1308 | 1308 | #, c-format |
1309 | 1309 | msgid "E184: No such user-defined command: %s" |
1310 | 1310 | msgstr "E184: Íåò òàêîé êîìàíäû ïîëüçîâàòåëÿ: %s" |
1311 | 1311 | |
1312 | -#: ex_docmd.c:5664 | |
1312 | +#: ex_docmd.c:5667 | |
1313 | 1313 | #, c-format |
1314 | 1314 | msgid "E185: Cannot find color scheme %s" |
1315 | 1315 | msgstr "E185: Öâåòîâàÿ ñõåìà %s íå íàéäåíà" |
1316 | 1316 | |
1317 | -#: ex_docmd.c:5672 | |
1317 | +#: ex_docmd.c:5675 | |
1318 | 1318 | msgid "Greetings, Vim user!" |
1319 | 1319 | msgstr "Ïðèâåò, ïîëüçîâàòåëü Vim!" |
1320 | 1320 | |
1321 | -#: ex_docmd.c:6389 | |
1321 | +#: ex_docmd.c:6393 | |
1322 | 1322 | msgid "Edit File in new window" |
1323 | 1323 | msgstr "Ðåäàêòèðîâàòü ôàéë â íîâîì îêíå" |
1324 | 1324 | |
1325 | -#: ex_docmd.c:6684 | |
1325 | +#: ex_docmd.c:6688 | |
1326 | 1326 | msgid "No swap file" |
1327 | 1327 | msgstr "Áåç ñâîï-ôàéëà" |
1328 | 1328 | |
1329 | -#: ex_docmd.c:6788 | |
1329 | +#: ex_docmd.c:6792 | |
1330 | 1330 | msgid "Append File" |
1331 | 1331 | msgstr "Äîáàâèòü ôàéë" |
1332 | 1332 | |
1333 | -#: ex_docmd.c:6852 | |
1333 | +#: ex_docmd.c:6856 | |
1334 | 1334 | msgid "E186: No previous directory" |
1335 | 1335 | msgstr "E186: Íåò ïðåäûäóùåãî êàòàëîãà" |
1336 | 1336 | |
1337 | -#: ex_docmd.c:6934 | |
1337 | +#: ex_docmd.c:6938 | |
1338 | 1338 | msgid "E187: Unknown" |
1339 | 1339 | msgstr "E187: Íåèçâåñòíî" |
1340 | 1340 | |
1341 | -#: ex_docmd.c:7019 | |
1341 | +#: ex_docmd.c:7023 | |
1342 | 1342 | msgid "E465: :winsize requires two number arguments" |
1343 | 1343 | msgstr "E465: êîìàíäà :winsize òðåáóåò óêàçàíèÿ äâóõ ÷èñëîâûõ ïàðàìåòðîâ" |
1344 | 1344 | |
1345 | -#: ex_docmd.c:7075 | |
1345 | +#: ex_docmd.c:7079 | |
1346 | 1346 | #, c-format |
1347 | 1347 | msgid "Window position: X %d, Y %d" |
1348 | 1348 | msgstr "Ïîëîæåíèå îêíà: X %d, Y %d" |
1349 | 1349 | |
1350 | -#: ex_docmd.c:7080 | |
1350 | +#: ex_docmd.c:7084 | |
1351 | 1351 | msgid "E188: Obtaining window position not implemented for this platform" |
1352 | 1352 | msgstr "E188: Â äàííîé ñèñòåìå îïðåäåëåíèå ïîëîæåíèÿ îêíà íå ðàáîòàåò" |
1353 | 1353 | |
1354 | -#: ex_docmd.c:7090 | |
1354 | +#: ex_docmd.c:7094 | |
1355 | 1355 | msgid "E466: :winpos requires two number arguments" |
1356 | 1356 | msgstr "E466: êîìàíäà :winpos òðåáóåò óêàçàíèÿ äâóõ ÷èñëîâûõ ïàðàìåòðîâ" |
1357 | 1357 | |
1358 | -#: ex_docmd.c:7368 | |
1358 | +#: ex_docmd.c:7372 | |
1359 | 1359 | msgid "Save Redirection" |
1360 | 1360 | msgstr "Ïåðåíàïðàâëåíèå çàïèñè" |
1361 | 1361 | |
1362 | -#: ex_docmd.c:7558 | |
1362 | +#: ex_docmd.c:7562 | |
1363 | 1363 | msgid "Save View" |
1364 | 1364 | msgstr "Ñîõðàíåíèå âèäà" |
1365 | 1365 | |
1366 | -#: ex_docmd.c:7559 | |
1366 | +#: ex_docmd.c:7563 | |
1367 | 1367 | msgid "Save Session" |
1368 | 1368 | msgstr "Ñîõðàíåíèå ñåàíñà" |
1369 | 1369 | |
1370 | -#: ex_docmd.c:7561 | |
1370 | +#: ex_docmd.c:7565 | |
1371 | 1371 | msgid "Save Setup" |
1372 | 1372 | msgstr "Ñîõðàíåíèå íàñòðîåê" |
1373 | 1373 | |
1374 | -#: ex_docmd.c:7713 | |
1374 | +#: ex_docmd.c:7717 | |
1375 | 1375 | #, c-format |
1376 | 1376 | msgid "E189: \"%s\" exists (add ! to override)" |
1377 | 1377 | msgstr "E189: \"%s\" ñóùåñòâóåò (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1378 | 1378 | |
1379 | -#: ex_docmd.c:7718 | |
1379 | +#: ex_docmd.c:7722 | |
1380 | 1380 | #, c-format |
1381 | 1381 | msgid "E190: Cannot open \"%s\" for writing" |
1382 | 1382 | msgstr "E190: Íåâîçìîæíî îòêðûòü äëÿ çàïèñè \"%s\"" |
1383 | 1383 | |
1384 | 1384 | #. set mark |
1385 | -#: ex_docmd.c:7742 | |
1385 | +#: ex_docmd.c:7746 | |
1386 | 1386 | msgid "E191: Argument must be a letter or forward/backward quote" |
1387 | 1387 | msgstr "E191: Ïàðàìåòð äîëæåí áûòü ïðÿìîé/îáðàòíîé êàâû÷êîé èëè áóêâîé" |
1388 | 1388 | |
1389 | -#: ex_docmd.c:7784 | |
1389 | +#: ex_docmd.c:7788 | |
1390 | 1390 | msgid "E192: Recursive use of :normal too deep" |
1391 | 1391 | msgstr "E192: Ñëèøêîì ãëóáîêàÿ ðåêóðñèÿ ïðè èñïîëüçîâàíèè êîìàíäû :normal" |
1392 | 1392 | |
1393 | -#: ex_docmd.c:8302 | |
1393 | +#: ex_docmd.c:8306 | |
1394 | 1394 | msgid "E194: No alternate file name to substitute for '#'" |
1395 | 1395 | msgstr "E194: Íåò ñîñåäíåãî èìåíè ôàéëà äëÿ çàìåíû '#'" |
1396 | 1396 | |
1397 | -#: ex_docmd.c:8333 | |
1397 | +#: ex_docmd.c:8337 | |
1398 | 1398 | msgid "E495: no autocommand file name to substitute for \"<afile>\"" |
1399 | 1399 | msgstr "E495: Íåò àâòîêîìàíäíîãî èìåíè ôàéëà äëÿ çàìåíû \"<afile>\"" |
1400 | 1400 | |
1401 | -#: ex_docmd.c:8341 | |
1401 | +#: ex_docmd.c:8345 | |
1402 | 1402 | msgid "E496: no autocommand buffer number to substitute for \"<abuf>\"" |
1403 | 1403 | msgstr "E496: Íåò àâòîêîìàíäíîãî íîìåðà áóôåðà äëÿ çàìåíû \"<abuf>\"" |
1404 | 1404 | |
1405 | -#: ex_docmd.c:8352 | |
1405 | +#: ex_docmd.c:8356 | |
1406 | 1406 | msgid "E497: no autocommand match name to substitute for \"<amatch>\"" |
1407 | 1407 | msgstr "E497: Íåò àâòîêîìàíäíîãî èìåíè ñîîòâåòñòâèÿ äëÿ çàìåíû \"<amatch>\"" |
1408 | 1408 | |
1409 | -#: ex_docmd.c:8362 | |
1409 | +#: ex_docmd.c:8366 | |
1410 | 1410 | msgid "E498: no :source file name to substitute for \"<sfile>\"" |
1411 | 1411 | msgstr "E498: íåò èìåíè ôàéëà :source äëÿ çàìåíû \"<sfile>\"" |
1412 | 1412 | |
1413 | -#: ex_docmd.c:8403 | |
1413 | +#: ex_docmd.c:8407 | |
1414 | 1414 | #, no-c-format |
1415 | 1415 | msgid "E499: Empty file name for '%' or '#', only works with \":p:h\"" |
1416 | 1416 | msgstr "E499: Ïóñòîå èìÿ ôàéëà äëÿ '%' èëè '#', âîçìîæíî òîëüêî c \":p:h\"" |
1417 | 1417 | |
1418 | -#: ex_docmd.c:8405 | |
1418 | +#: ex_docmd.c:8409 | |
1419 | 1419 | msgid "E500: Evaluates to an empty string" |
1420 | 1420 | msgstr "E500: Ðåçóëüòàòîì âûðàæåíèÿ ÿâëÿåòñÿ ïóñòàÿ ñòðîêà" |
1421 | 1421 | |
1422 | -#: ex_docmd.c:9360 | |
1422 | +#: ex_docmd.c:9380 | |
1423 | 1423 | msgid "E195: Cannot open viminfo file for reading" |
1424 | 1424 | msgstr "E195: Íåâîçìîæíî îòêðûòü ôàéë viminfo äëÿ ÷òåíèÿ" |
1425 | 1425 | |
1426 | -#: ex_docmd.c:9533 | |
1426 | +#: ex_docmd.c:9553 | |
1427 | 1427 | msgid "E196: No digraphs in this version" |
1428 | 1428 | msgstr "E196: Â ýòîé âåðñèè äèãðàôû íå ðàáîòàþò" |
1429 | 1429 |
@@ -1482,7 +1482,7 @@ | ||
1482 | 1482 | msgid "Error and interrupt" |
1483 | 1483 | msgstr "Îøèáêà è ïðåðûâàíèå" |
1484 | 1484 | |
1485 | -#: ex_eval.c:754 gui.c:4381 | |
1485 | +#: ex_eval.c:754 gui.c:4384 | |
1486 | 1486 | msgid "Error" |
1487 | 1487 | msgstr "Îøèáêà" |
1488 | 1488 |
@@ -1558,19 +1558,19 @@ | ||
1558 | 1558 | msgid "E193: :endfunction not inside a function" |
1559 | 1559 | msgstr "E193: êîìàíäà :endfunction ìîæåò èñïîëüçîâàòüñÿ òîëüêî âíóòðè ôóíêöèè" |
1560 | 1560 | |
1561 | -#: ex_getln.c:3296 | |
1561 | +#: ex_getln.c:3299 | |
1562 | 1562 | msgid "tagname" |
1563 | 1563 | msgstr "èìÿ ìåòêè" |
1564 | 1564 | |
1565 | -#: ex_getln.c:3299 | |
1565 | +#: ex_getln.c:3302 | |
1566 | 1566 | msgid " kind file\n" |
1567 | 1567 | msgstr " òèï ôàéëà\n" |
1568 | 1568 | |
1569 | -#: ex_getln.c:4752 | |
1569 | +#: ex_getln.c:4768 | |
1570 | 1570 | msgid "'history' option is zero" |
1571 | 1571 | msgstr "çíà÷åíèå îïöèè 'history' ðàâíî íóëþ" |
1572 | 1572 | |
1573 | -#: ex_getln.c:5023 | |
1573 | +#: ex_getln.c:5039 | |
1574 | 1574 | #, c-format |
1575 | 1575 | msgid "" |
1576 | 1576 | "\n" |
@@ -1579,259 +1579,259 @@ | ||
1579 | 1579 | "\n" |
1580 | 1580 | "# %s, èñòîðèÿ (íà÷èíàÿ îò ñâåæåãî ê ñòàðîìó):\n" |
1581 | 1581 | |
1582 | -#: ex_getln.c:5024 | |
1582 | +#: ex_getln.c:5040 | |
1583 | 1583 | msgid "Command Line" |
1584 | 1584 | msgstr "Êîìàíäíàÿ ñòðîêà" |
1585 | 1585 | |
1586 | -#: ex_getln.c:5025 | |
1586 | +#: ex_getln.c:5041 | |
1587 | 1587 | msgid "Search String" |
1588 | 1588 | msgstr "Ñòðîêà ïîèñêà" |
1589 | 1589 | |
1590 | -#: ex_getln.c:5026 | |
1590 | +#: ex_getln.c:5042 | |
1591 | 1591 | msgid "Expression" |
1592 | 1592 | msgstr "Âûðàæåíèå" |
1593 | 1593 | |
1594 | -#: ex_getln.c:5027 | |
1594 | +#: ex_getln.c:5043 | |
1595 | 1595 | msgid "Input Line" |
1596 | 1596 | msgstr "Ñòðîêà ââîäà" |
1597 | 1597 | |
1598 | -#: ex_getln.c:5065 | |
1598 | +#: ex_getln.c:5081 | |
1599 | 1599 | msgid "E198: cmd_pchar beyond the command length" |
1600 | 1600 | msgstr "E198: cmd_pchar áîëüøå äëèíû êîìàíäû" |
1601 | 1601 | |
1602 | -#: ex_getln.c:5242 | |
1602 | +#: ex_getln.c:5258 | |
1603 | 1603 | msgid "E199: Active window or buffer deleted" |
1604 | 1604 | msgstr "E199: Óäàëåíî àêòèâíîå îêíî èëè áóôåð" |
1605 | 1605 | |
1606 | -#: fileio.c:377 | |
1606 | +#: fileio.c:378 | |
1607 | 1607 | msgid "Illegal file name" |
1608 | 1608 | msgstr "Íåäîïóñòèìîå èìÿ ôàéëà" |
1609 | 1609 | |
1610 | -#: fileio.c:401 fileio.c:535 fileio.c:2913 fileio.c:2954 | |
1610 | +#: fileio.c:402 fileio.c:540 fileio.c:2925 fileio.c:2966 | |
1611 | 1611 | msgid "is a directory" |
1612 | 1612 | msgstr "ÿâëÿåòñÿ êàòàëîãîì" |
1613 | 1613 | |
1614 | -#: fileio.c:403 | |
1614 | +#: fileio.c:404 | |
1615 | 1615 | msgid "is not a file" |
1616 | 1616 | msgstr "íå ÿâëÿåòñÿ ôàéëîì" |
1617 | 1617 | |
1618 | -#: fileio.c:557 fileio.c:4131 | |
1618 | +#: fileio.c:562 fileio.c:4143 | |
1619 | 1619 | msgid "[New File]" |
1620 | 1620 | msgstr "[Íîâûé ôàéë]" |
1621 | 1621 | |
1622 | -#: fileio.c:590 | |
1622 | +#: fileio.c:595 | |
1623 | 1623 | msgid "[Permission Denied]" |
1624 | 1624 | msgstr "[Äîñòóï çàïðåù¸í]" |
1625 | 1625 | |
1626 | -#: fileio.c:694 | |
1626 | +#: fileio.c:706 | |
1627 | 1627 | msgid "E200: *ReadPre autocommands made the file unreadable" |
1628 | 1628 | msgstr "E200:  ðåçóëüòàòå âûïîëíåíèÿ àâòîêîìàíä *ReadPre ôàéë ñòàë íå÷èòàåìûì" |
1629 | 1629 | |
1630 | -#: fileio.c:696 | |
1630 | +#: fileio.c:708 | |
1631 | 1631 | msgid "E201: *ReadPre autocommands must not change current buffer" |
1632 | 1632 | msgstr "E201: àâòîêîìàíäû *ReadPre íå äîëæíû èçìåíÿòü àêòèâíûé áóôåð" |
1633 | 1633 | |
1634 | -#: fileio.c:717 | |
1634 | +#: fileio.c:729 | |
1635 | 1635 | msgid "Vim: Reading from stdin...\n" |
1636 | 1636 | msgstr "Vim: âûïîëíÿåòñÿ ÷òåíèå èç ñòàíäàðòíîãî ïîòîêà ââîäà stdin...\n" |
1637 | 1637 | |
1638 | -#: fileio.c:723 | |
1638 | +#: fileio.c:735 | |
1639 | 1639 | msgid "Reading from stdin..." |
1640 | 1640 | msgstr "Âûïîëíÿåòñÿ ÷òåíèå èç ñòàíäàðòíîãî ïîòîêà ââîäà stdin..." |
1641 | 1641 | |
1642 | 1642 | #. Re-opening the original file failed! |
1643 | -#: fileio.c:1000 | |
1643 | +#: fileio.c:1012 | |
1644 | 1644 | msgid "E202: Conversion made file unreadable!" |
1645 | 1645 | msgstr "E202:  ðåçóëüòàòå ïðåîáðàçîâàíèÿ ôàéë ñòàë íå÷èòàåìûì!" |
1646 | 1646 | |
1647 | -#: fileio.c:2090 | |
1647 | +#: fileio.c:2102 | |
1648 | 1648 | msgid "[fifo/socket]" |
1649 | 1649 | msgstr "[fifo/ãíåçäî]" |
1650 | 1650 | |
1651 | -#: fileio.c:2097 | |
1651 | +#: fileio.c:2109 | |
1652 | 1652 | msgid "[fifo]" |
1653 | 1653 | msgstr "[fifo]" |
1654 | 1654 | |
1655 | -#: fileio.c:2104 | |
1655 | +#: fileio.c:2116 | |
1656 | 1656 | msgid "[socket]" |
1657 | 1657 | msgstr "[ãíåçäî]" |
1658 | 1658 | |
1659 | -#: fileio.c:2112 | |
1659 | +#: fileio.c:2124 | |
1660 | 1660 | msgid "[RO]" |
1661 | 1661 | msgstr "[RO]" |
1662 | 1662 | |
1663 | -#: fileio.c:2122 | |
1663 | +#: fileio.c:2134 | |
1664 | 1664 | msgid "[CR missing]" |
1665 | 1665 | msgstr "[ïðîïóùåíû ñèìâîëû CR]" |
1666 | 1666 | |
1667 | -#: fileio.c:2127 | |
1667 | +#: fileio.c:2139 | |
1668 | 1668 | msgid "[NL found]" |
1669 | 1669 | msgstr "[Îáíàðóæåíû ñèìâîëû NL]" |
1670 | 1670 | |
1671 | -#: fileio.c:2132 | |
1671 | +#: fileio.c:2144 | |
1672 | 1672 | msgid "[long lines split]" |
1673 | 1673 | msgstr "[äëèííûå ñòðîêè ðàçáèòû]" |
1674 | 1674 | |
1675 | -#: fileio.c:2138 fileio.c:4115 | |
1675 | +#: fileio.c:2150 fileio.c:4127 | |
1676 | 1676 | msgid "[NOT converted]" |
1677 | 1677 | msgstr "[ÁÅÇ ïðåîáðàçîâàíèé]" |
1678 | 1678 | |
1679 | -#: fileio.c:2143 fileio.c:4120 | |
1679 | +#: fileio.c:2155 fileio.c:4132 | |
1680 | 1680 | msgid "[converted]" |
1681 | 1681 | msgstr "[ïåðåêîäèðîâàíî]" |
1682 | 1682 | |
1683 | -#: fileio.c:2150 fileio.c:4145 | |
1683 | +#: fileio.c:2162 fileio.c:4157 | |
1684 | 1684 | msgid "[crypted]" |
1685 | 1685 | msgstr "[çàøèôðîâàíî]" |
1686 | 1686 | |
1687 | -#: fileio.c:2157 | |
1687 | +#: fileio.c:2169 | |
1688 | 1688 | msgid "[CONVERSION ERROR]" |
1689 | 1689 | msgstr "[ÎØÈÁÊÀ ÏÐÅÎÁÐÀÇÎÂÀÍÈß]" |
1690 | 1690 | |
1691 | -#: fileio.c:2163 | |
1691 | +#: fileio.c:2175 | |
1692 | 1692 | #, c-format |
1693 | 1693 | msgid "[ILLEGAL BYTE in line %ld]" |
1694 | 1694 | msgstr "[ÍÅÄÎÏÓÑÒÈÌÛÉ ÁÀÉÒ â ñòðîêå %ld]" |
1695 | 1695 | |
1696 | -#: fileio.c:2170 | |
1696 | +#: fileio.c:2182 | |
1697 | 1697 | msgid "[READ ERRORS]" |
1698 | 1698 | msgstr "[ÎØÈÁÊÈ ×ÒÅÍÈß]" |
1699 | 1699 | |
1700 | -#: fileio.c:2386 | |
1700 | +#: fileio.c:2398 | |
1701 | 1701 | msgid "Can't find temp file for conversion" |
1702 | 1702 | msgstr "Âðåìåííûé ôàéë äëÿ ïåðåêîäèðîâàíèÿ íå íàéäåí" |
1703 | 1703 | |
1704 | -#: fileio.c:2393 | |
1704 | +#: fileio.c:2405 | |
1705 | 1705 | msgid "Conversion with 'charconvert' failed" |
1706 | 1706 | msgstr "Ïðåîáðàçîâàíèå ñ ïîìîùüþ 'charconvert' íå âûïîëíåíî" |
1707 | 1707 | |
1708 | -#: fileio.c:2396 | |
1708 | +#: fileio.c:2408 | |
1709 | 1709 | msgid "can't read output of 'charconvert'" |
1710 | 1710 | msgstr "íåâîçìîæíî ïðî÷èòàòü âûâîä 'charconvert'" |
1711 | 1711 | |
1712 | -#: fileio.c:2796 | |
1712 | +#: fileio.c:2808 | |
1713 | 1713 | msgid "E203: Autocommands deleted or unloaded buffer to be written" |
1714 | 1714 | msgstr "" |
1715 | 1715 | "E203: Áóôåð, êîòîðûé òðåáîâàëîñü çàïèñàòü, óäàë¸í èëè âûãðóæåí àâòîêîìàíäîé" |
1716 | 1716 | |
1717 | -#: fileio.c:2819 | |
1717 | +#: fileio.c:2831 | |
1718 | 1718 | msgid "E204: Autocommand changed number of lines in unexpected way" |
1719 | 1719 | msgstr "E204: Êîëè÷åñòâî ñòðîê èçìåíåíî àâòîêîìàíäîé íåîæèäàííûì îáðàçîì" |
1720 | 1720 | |
1721 | -#: fileio.c:2857 | |
1721 | +#: fileio.c:2869 | |
1722 | 1722 | msgid "NetBeans dissallows writes of unmodified buffers" |
1723 | 1723 | msgstr "NetBeans íå ïîçâîëÿåò âûïîëíÿòü çàïèñü íåèçìåí¸ííûõ áóôåðîâ" |
1724 | 1724 | |
1725 | -#: fileio.c:2865 | |
1725 | +#: fileio.c:2877 | |
1726 | 1726 | msgid "Partial writes disallowed for NetBeans buffers" |
1727 | 1727 | msgstr "×àñòè÷íàÿ çàïèñü áóôåðîâ NetBeans íå äîïóñêàåòñÿ" |
1728 | 1728 | |
1729 | -#: fileio.c:2919 fileio.c:2937 | |
1729 | +#: fileio.c:2931 fileio.c:2949 | |
1730 | 1730 | msgid "is not a file or writable device" |
1731 | 1731 | msgstr "íå ÿâëÿåòñÿ ôàéëîì èëè óñòðîéñòâîì, äîñòóïíûì äëÿ çàïèñè" |
1732 | 1732 | |
1733 | -#: fileio.c:2989 | |
1733 | +#: fileio.c:3001 | |
1734 | 1734 | msgid "is read-only (add ! to override)" |
1735 | 1735 | msgstr "îòêðûò òîëüêî äëÿ ÷òåíèÿ (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1736 | 1736 | |
1737 | -#: fileio.c:3335 | |
1737 | +#: fileio.c:3347 | |
1738 | 1738 | msgid "E506: Can't write to backup file (add ! to override)" |
1739 | 1739 | msgstr "E506: Çàïèñü â ðåçåðâíûé ôàéë íåâîçìîæíà (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1740 | 1740 | |
1741 | -#: fileio.c:3347 | |
1741 | +#: fileio.c:3359 | |
1742 | 1742 | msgid "E507: Close error for backup file (add ! to override)" |
1743 | 1743 | msgstr "E507: Îøèáêà çàêðûòèÿ ðåçåðâíîãî ôàéëà (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1744 | 1744 | |
1745 | -#: fileio.c:3349 | |
1745 | +#: fileio.c:3361 | |
1746 | 1746 | msgid "E508: Can't read file for backup (add ! to override)" |
1747 | 1747 | msgstr "E508: Íåâîçìîæíî ïðî÷èòàòü ðåçåðâíûé ôàéë (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1748 | 1748 | |
1749 | -#: fileio.c:3365 | |
1749 | +#: fileio.c:3377 | |
1750 | 1750 | msgid "E509: Cannot create backup file (add ! to override)" |
1751 | 1751 | msgstr "E509: Íåâîçìîæíî ñîçäàòü ðåçåðâíûé ôàéë (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1752 | 1752 | |
1753 | -#: fileio.c:3468 | |
1753 | +#: fileio.c:3480 | |
1754 | 1754 | msgid "E510: Can't make backup file (add ! to override)" |
1755 | 1755 | msgstr "E510: Íåâîçìîæíî ñîçäàòü ðåçåðâíûé ôàéë (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1756 | 1756 | |
1757 | -#: fileio.c:3530 | |
1757 | +#: fileio.c:3542 | |
1758 | 1758 | msgid "E460: The resource fork would be lost (add ! to override)" |
1759 | 1759 | msgstr "E460: Âèëêà ðåñóðñà áóäåò ïîòåðÿíà (!, ÷òîáû îáîéòè ïðîâåðêó)" |
1760 | 1760 | |
1761 | -#: fileio.c:3640 | |
1761 | +#: fileio.c:3652 | |
1762 | 1762 | msgid "E214: Can't find temp file for writing" |
1763 | 1763 | msgstr "E214: Âðåìåííûé ôàéë äëÿ çàïèñè íå íàéäåí" |
1764 | 1764 | |
1765 | -#: fileio.c:3658 | |
1765 | +#: fileio.c:3670 | |
1766 | 1766 | msgid "E213: Cannot convert (add ! to write without conversion)" |
1767 | 1767 | msgstr "E213: Ïåðåêîäèðîâêà íåâîçìîæíà (! äëÿ çàïèñè áåç ïåðåêîäèðîâêè)" |
1768 | 1768 | |
1769 | -#: fileio.c:3693 | |
1769 | +#: fileio.c:3705 | |
1770 | 1770 | msgid "E166: Can't open linked file for writing" |
1771 | 1771 | msgstr "E166: Íåâîçìîæíî îòêðûòü ñâÿçàííûé ôàéë äëÿ çàïèñè" |
1772 | 1772 | |
1773 | -#: fileio.c:3697 | |
1773 | +#: fileio.c:3709 | |
1774 | 1774 | msgid "E212: Can't open file for writing" |
1775 | 1775 | msgstr "E212: Íåâîçìîæíî îòêðûòü ôàéë äëÿ çàïèñè" |
1776 | 1776 | |
1777 | -#: fileio.c:3959 | |
1777 | +#: fileio.c:3971 | |
1778 | 1778 | msgid "E667: Fsync failed" |
1779 | 1779 | msgstr "E667: Íå óäàëîñü âûïîëíèòü ôóíêöèþ fsync()" |
1780 | 1780 | |
1781 | -#: fileio.c:3966 | |
1781 | +#: fileio.c:3978 | |
1782 | 1782 | msgid "E512: Close failed" |
1783 | 1783 | msgstr "E512: Îïåðàöèÿ çàêðûòèÿ íå óäàëàñü" |
1784 | 1784 | |
1785 | -#: fileio.c:4037 | |
1785 | +#: fileio.c:4049 | |
1786 | 1786 | msgid "E513: write error, conversion failed" |
1787 | 1787 | msgstr "E513: Îøèáêà çàïèñè, ïðåîáðàçîâàíèå íå óäàëîñü" |
1788 | 1788 | |
1789 | -#: fileio.c:4043 | |
1789 | +#: fileio.c:4055 | |
1790 | 1790 | msgid "E514: write error (file system full?)" |
1791 | 1791 | msgstr "E514: îøèáêà çàïèñè (íåò ñâîáîäíîãî ìåñòà?)" |
1792 | 1792 | |
1793 | -#: fileio.c:4110 | |
1793 | +#: fileio.c:4122 | |
1794 | 1794 | msgid " CONVERSION ERROR" |
1795 | 1795 | msgstr " ÎØÈÁÊÀ ÏÐÅÎÁÐÀÇÎÂÀÍÈß" |
1796 | 1796 | |
1797 | -#: fileio.c:4126 | |
1797 | +#: fileio.c:4138 | |
1798 | 1798 | msgid "[Device]" |
1799 | 1799 | msgstr "[Óñòðîéñòâî]" |
1800 | 1800 | |
1801 | -#: fileio.c:4131 | |
1801 | +#: fileio.c:4143 | |
1802 | 1802 | msgid "[New]" |
1803 | 1803 | msgstr "[Íîâûé]" |
1804 | 1804 | |
1805 | -#: fileio.c:4153 | |
1805 | +#: fileio.c:4165 | |
1806 | 1806 | msgid " [a]" |
1807 | 1807 | msgstr " [a]" |
1808 | 1808 | |
1809 | -#: fileio.c:4153 | |
1809 | +#: fileio.c:4165 | |
1810 | 1810 | msgid " appended" |
1811 | 1811 | msgstr " äîáàâëåíî" |
1812 | 1812 | |
1813 | -#: fileio.c:4155 | |
1813 | +#: fileio.c:4167 | |
1814 | 1814 | msgid " [w]" |
1815 | 1815 | msgstr " [w]" |
1816 | 1816 | |
1817 | -#: fileio.c:4155 | |
1817 | +#: fileio.c:4167 | |
1818 | 1818 | msgid " written" |
1819 | 1819 | msgstr " çàïèñàíî" |
1820 | 1820 | |
1821 | -#: fileio.c:4205 | |
1821 | +#: fileio.c:4217 | |
1822 | 1822 | msgid "E205: Patchmode: can't save original file" |
1823 | 1823 | msgstr "E205: Ðåæèì çàïëàòêè: íåâîçìîæíî ñîõðàíåíèå èñõîäíîãî ôàéëà" |
1824 | 1824 | |
1825 | -#: fileio.c:4227 | |
1825 | +#: fileio.c:4239 | |
1826 | 1826 | msgid "E206: patchmode: can't touch empty original file" |
1827 | 1827 | msgstr "" |
1828 | 1828 | "E206: Ðåæèì çàïëàòêè: íåâîçìîæíî ñìåíèòü ïàðàìåòðû ïóñòîãî èñõîäíîãî ôàéëà" |
1829 | 1829 | |
1830 | -#: fileio.c:4242 | |
1830 | +#: fileio.c:4254 | |
1831 | 1831 | msgid "E207: Can't delete backup file" |
1832 | 1832 | msgstr "E207: Íåâîçìîæíî óäàëèòü ðåçåðâíûé ôàéë" |
1833 | 1833 | |
1834 | -#: fileio.c:4306 | |
1834 | +#: fileio.c:4318 | |
1835 | 1835 | msgid "" |
1836 | 1836 | "\n" |
1837 | 1837 | "WARNING: Original file may be lost or damaged\n" |
@@ -1839,96 +1839,96 @@ | ||
1839 | 1839 | "\n" |
1840 | 1840 | "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ: Èñõîäíûé ôàéë ìîæåò áûòü óòðà÷åí èëè ïîâðåæä¸í\n" |
1841 | 1841 | |
1842 | -#: fileio.c:4308 | |
1842 | +#: fileio.c:4320 | |
1843 | 1843 | msgid "don't quit the editor until the file is successfully written!" |
1844 | 1844 | msgstr "íå âûõîäèòå èç ðåäàêòîðà, ïîêà ôàéë íå áóäåò óñïåøíî çàïèñàí!" |
1845 | 1845 | |
1846 | -#: fileio.c:4397 | |
1846 | +#: fileio.c:4409 | |
1847 | 1847 | msgid "[dos]" |
1848 | 1848 | msgstr "[dos]" |
1849 | 1849 | |
1850 | -#: fileio.c:4397 | |
1850 | +#: fileio.c:4409 | |
1851 | 1851 | msgid "[dos format]" |
1852 | 1852 | msgstr "[ôîðìàò dos]" |
1853 | 1853 | |
1854 | -#: fileio.c:4404 | |
1854 | +#: fileio.c:4416 | |
1855 | 1855 | msgid "[mac]" |
1856 | 1856 | msgstr "[mac]" |
1857 | 1857 | |
1858 | -#: fileio.c:4404 | |
1858 | +#: fileio.c:4416 | |
1859 | 1859 | msgid "[mac format]" |
1860 | 1860 | msgstr "[ôîðìàò mac]" |
1861 | 1861 | |
1862 | -#: fileio.c:4411 | |
1862 | +#: fileio.c:4423 | |
1863 | 1863 | msgid "[unix]" |
1864 | 1864 | msgstr "[unix]" |
1865 | 1865 | |
1866 | -#: fileio.c:4411 | |
1866 | +#: fileio.c:4423 | |
1867 | 1867 | msgid "[unix format]" |
1868 | 1868 | msgstr "[ôîðìàò unix]" |
1869 | 1869 | |
1870 | -#: fileio.c:4438 | |
1870 | +#: fileio.c:4450 | |
1871 | 1871 | msgid "1 line, " |
1872 | 1872 | msgstr "1 ñòðîêà, " |
1873 | 1873 | |
1874 | -#: fileio.c:4440 | |
1874 | +#: fileio.c:4452 | |
1875 | 1875 | #, c-format |
1876 | 1876 | msgid "%ld lines, " |
1877 | 1877 | msgstr "ñòðîê: %ld, " |
1878 | 1878 | |
1879 | -#: fileio.c:4443 | |
1879 | +#: fileio.c:4455 | |
1880 | 1880 | msgid "1 character" |
1881 | 1881 | msgstr "1 ñèìâîë" |
1882 | 1882 | |
1883 | -#: fileio.c:4445 | |
1883 | +#: fileio.c:4457 | |
1884 | 1884 | #, c-format |
1885 | 1885 | msgid "%ld characters" |
1886 | 1886 | msgstr "ñèìâîëîâ: %ld" |
1887 | 1887 | |
1888 | -#: fileio.c:4455 | |
1888 | +#: fileio.c:4467 | |
1889 | 1889 | msgid "[noeol]" |
1890 | 1890 | msgstr "[noeol]" |
1891 | 1891 | |
1892 | -#: fileio.c:4455 | |
1892 | +#: fileio.c:4467 | |
1893 | 1893 | msgid "[Incomplete last line]" |
1894 | 1894 | msgstr "[Íåçàâåðø¸ííàÿ ïîñëåäíÿÿ ñòðîêà]" |
1895 | 1895 | |
1896 | 1896 | #. don't overwrite messages here |
1897 | 1897 | #. must give this prompt |
1898 | 1898 | #. don't use emsg() here, don't want to flush the buffers |
1899 | -#: fileio.c:4474 | |
1899 | +#: fileio.c:4486 | |
1900 | 1900 | msgid "WARNING: The file has been changed since reading it!!!" |
1901 | 1901 | msgstr "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ: Ôàéë èçìåí¸í ñ ìîìåíòà ÷òåíèÿ!!!" |
1902 | 1902 | |
1903 | -#: fileio.c:4476 | |
1903 | +#: fileio.c:4488 | |
1904 | 1904 | msgid "Do you really want to write to it" |
1905 | 1905 | msgstr "Ñåðü¸çíî õîòèòå çàïèñàòü â ýòîò ôàéë" |
1906 | 1906 | |
1907 | -#: fileio.c:5726 | |
1907 | +#: fileio.c:5738 | |
1908 | 1908 | #, c-format |
1909 | 1909 | msgid "E208: Error writing to \"%s\"" |
1910 | 1910 | msgstr "E208: Îøèáêà çàïèñè â \"%s\"" |
1911 | 1911 | |
1912 | -#: fileio.c:5733 | |
1912 | +#: fileio.c:5745 | |
1913 | 1913 | #, c-format |
1914 | 1914 | msgid "E209: Error closing \"%s\"" |
1915 | 1915 | msgstr "E209: Îøèáêà çàêðûòèÿ \"%s\"" |
1916 | 1916 | |
1917 | -#: fileio.c:5736 | |
1917 | +#: fileio.c:5748 | |
1918 | 1918 | #, c-format |
1919 | 1919 | msgid "E210: Error reading \"%s\"" |
1920 | 1920 | msgstr "E210: Îøèáêà ÷òåíèÿ \"%s\"" |
1921 | 1921 | |
1922 | -#: fileio.c:5970 | |
1922 | +#: fileio.c:5982 | |
1923 | 1923 | msgid "E246: FileChangedShell autocommand deleted buffer" |
1924 | 1924 | msgstr "E246: Áóôåð óäàë¸í ïðè âûïîëíåíèè àâòîêîìàíäû FileChangedShell" |
1925 | 1925 | |
1926 | -#: fileio.c:5977 | |
1926 | +#: fileio.c:5989 | |
1927 | 1927 | #, c-format |
1928 | 1928 | msgid "E211: Warning: File \"%s\" no longer available" |
1929 | 1929 | msgstr "E211: Ïðåäóïðåæäåíèå: ôàéë \"%s\" áîëüøå íå äîñòóïåí" |
1930 | 1930 | |
1931 | -#: fileio.c:5991 | |
1931 | +#: fileio.c:6003 | |
1932 | 1932 | #, c-format |
1933 | 1933 | msgid "" |
1934 | 1934 | "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as " |
@@ -1937,34 +1937,34 @@ | ||
1937 | 1937 | "W12: Ïðåäóïðåæäåíèå: ôàéë \"%s\" è áóôåð Vim áûëè èçìåíåíû íåçàâèñèìî äðóã " |
1938 | 1938 | "îò äðóãà" |
1939 | 1939 | |
1940 | -#: fileio.c:5994 | |
1940 | +#: fileio.c:6006 | |
1941 | 1941 | #, c-format |
1942 | 1942 | msgid "W11: Warning: File \"%s\" has changed since editing started" |
1943 | 1943 | msgstr "" |
1944 | 1944 | "W11: Ïðåäóïðåæäåíèå: ôàéë \"%s\" áûë èçìåí¸í ïîñëå íà÷àëà ðåäàêòèðîâàíèÿ" |
1945 | 1945 | |
1946 | -#: fileio.c:5996 | |
1946 | +#: fileio.c:6008 | |
1947 | 1947 | #, c-format |
1948 | 1948 | msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" |
1949 | 1949 | msgstr "" |
1950 | 1950 | "W16: Ïðåäóïðåæäåíèå: ðåæèì äîñòóïà ê ôàéëó \"%s\" áûë èçìåí¸í ïîñëå íà÷àëà " |
1951 | 1951 | "ðåäàêòèðîâàíèÿ" |
1952 | 1952 | |
1953 | -#: fileio.c:6006 | |
1953 | +#: fileio.c:6018 | |
1954 | 1954 | #, c-format |
1955 | 1955 | msgid "W13: Warning: File \"%s\" has been created after editing started" |
1956 | 1956 | msgstr "" |
1957 | 1957 | "W13: Ïðåäóïðåæäåíèå: ôàéë \"%s\" áûë ñîçäàí ïîñëå íà÷àëà ðåäàêòèðîâàíèÿ" |
1958 | 1958 | |
1959 | -#: fileio.c:6019 | |
1959 | +#: fileio.c:6031 | |
1960 | 1960 | msgid "See \":help W11\" for more info." |
1961 | 1961 | msgstr "Ñì. äîïîëíèòåëüíóþ èíôîðìàöèþ â \":help W11\"." |
1962 | 1962 | |
1963 | -#: fileio.c:6033 | |
1963 | +#: fileio.c:6045 | |
1964 | 1964 | msgid "Warning" |
1965 | 1965 | msgstr "Ïðåäóïðåæäåíèå" |
1966 | 1966 | |
1967 | -#: fileio.c:6034 | |
1967 | +#: fileio.c:6046 | |
1968 | 1968 | msgid "" |
1969 | 1969 | "&OK\n" |
1970 | 1970 | "&Load File" |
@@ -1972,43 +1972,43 @@ | ||
1972 | 1972 | "&OK\n" |
1973 | 1973 | "&Çàãðóçèòü ôàéë" |
1974 | 1974 | |
1975 | -#: fileio.c:6140 | |
1975 | +#: fileio.c:6152 | |
1976 | 1976 | #, c-format |
1977 | 1977 | msgid "E462: Could not prepare for reloading \"%s\"" |
1978 | 1978 | msgstr "E462: Íåâîçìîæíî ïîäãîòîâèòüñÿ ê ïåðåçàãðóçêå \"%s\"" |
1979 | 1979 | |
1980 | -#: fileio.c:6159 | |
1980 | +#: fileio.c:6171 | |
1981 | 1981 | #, c-format |
1982 | 1982 | msgid "E321: Could not reload \"%s\"" |
1983 | 1983 | msgstr "E321: Íåâîçìîæíî âûïîëíèòü ïåðåçàãðóçêó \"%s\"" |
1984 | 1984 | |
1985 | -#: fileio.c:6740 | |
1985 | +#: fileio.c:6752 | |
1986 | 1986 | msgid "--Deleted--" |
1987 | 1987 | msgstr "--Óäàëåíî--" |
1988 | 1988 | |
1989 | 1989 | #. the group doesn't exist |
1990 | -#: fileio.c:6900 | |
1990 | +#: fileio.c:6912 | |
1991 | 1991 | #, c-format |
1992 | 1992 | msgid "E367: No such group: \"%s\"" |
1993 | 1993 | msgstr "E367: Ãðóïïà \"%s\" íå ñóùåñòâóåò" |
1994 | 1994 | |
1995 | -#: fileio.c:7026 | |
1995 | +#: fileio.c:7038 | |
1996 | 1996 | #, c-format |
1997 | 1997 | msgid "E215: Illegal character after *: %s" |
1998 | 1998 | msgstr "E215: Íåäîïóñòèìûå ñèìâîëû ïîñëå *: %s" |
1999 | 1999 | |
2000 | -#: fileio.c:7038 | |
2000 | +#: fileio.c:7050 | |
2001 | 2001 | #, c-format |
2002 | 2002 | msgid "E216: No such event: %s" |
2003 | 2003 | msgstr "E216: Íåñóùåñòâóþùåå ñîáûòèå: %s" |
2004 | 2004 | |
2005 | -#: fileio.c:7040 | |
2005 | +#: fileio.c:7052 | |
2006 | 2006 | #, c-format |
2007 | 2007 | msgid "E216: No such group or event: %s" |
2008 | 2008 | msgstr "E216: Íåñóùåñòâóþùàÿ ãðóïïà èëè ñîáûòèå: %s" |
2009 | 2009 | |
2010 | 2010 | #. Highlight title |
2011 | -#: fileio.c:7198 | |
2011 | +#: fileio.c:7210 | |
2012 | 2012 | msgid "" |
2013 | 2013 | "\n" |
2014 | 2014 | "--- Auto-Commands ---" |
@@ -2016,39 +2016,39 @@ | ||
2016 | 2016 | "\n" |
2017 | 2017 | "--- Àâòîêîìàíäû ---" |
2018 | 2018 | |
2019 | -#: fileio.c:7469 | |
2019 | +#: fileio.c:7481 | |
2020 | 2020 | msgid "E217: Can't execute autocommands for ALL events" |
2021 | 2021 | msgstr "E217: Íåâîçìîæíî âûïîëíèòü àâòîêîìàíäû äëÿ ÂÑÅÕ ñîáûòèé" |
2022 | 2022 | |
2023 | -#: fileio.c:7492 | |
2023 | +#: fileio.c:7504 | |
2024 | 2024 | msgid "No matching autocommands" |
2025 | 2025 | msgstr "Íåò ïîäõîäÿùèõ àâòîêîìàíä" |
2026 | 2026 | |
2027 | -#: fileio.c:7813 | |
2027 | +#: fileio.c:7825 | |
2028 | 2028 | msgid "E218: autocommand nesting too deep" |
2029 | 2029 | msgstr "E218: ñëèøêîì ãëóáîêî âëîæåííûå àâòîêîìàíäû" |
2030 | 2030 | |
2031 | -#: fileio.c:8088 | |
2031 | +#: fileio.c:8100 | |
2032 | 2032 | #, c-format |
2033 | 2033 | msgid "%s Auto commands for \"%s\"" |
2034 | 2034 | msgstr "%s Àâòîêîìàíäû äëÿ \"%s\"" |
2035 | 2035 | |
2036 | -#: fileio.c:8096 | |
2036 | +#: fileio.c:8108 | |
2037 | 2037 | #, c-format |
2038 | 2038 | msgid "Executing %s" |
2039 | 2039 | msgstr "Âûïîëíåíèå %s" |
2040 | 2040 | |
2041 | 2041 | #. always scroll up, don't overwrite |
2042 | -#: fileio.c:8164 | |
2042 | +#: fileio.c:8176 | |
2043 | 2043 | #, c-format |
2044 | 2044 | msgid "autocommand %s" |
2045 | 2045 | msgstr "àâòîêîìàíäà %s" |
2046 | 2046 | |
2047 | -#: fileio.c:8731 | |
2047 | +#: fileio.c:8743 | |
2048 | 2048 | msgid "E219: Missing {." |
2049 | 2049 | msgstr "E219: Ïðîïóùåíà {." |
2050 | 2050 | |
2051 | -#: fileio.c:8733 | |
2051 | +#: fileio.c:8745 | |
2052 | 2052 | msgid "E220: Missing }." |
2053 | 2053 | msgstr "E220: Ïðîïóùåíà }." |
2054 | 2054 |
@@ -2070,39 +2070,39 @@ | ||
2070 | 2070 | msgid "E222: Add to read buffer" |
2071 | 2071 | msgstr "E222: Äîáàâëåíèå â áóôåð ÷òåíèÿ" |
2072 | 2072 | |
2073 | -#: getchar.c:2198 | |
2073 | +#: getchar.c:2208 | |
2074 | 2074 | msgid "E223: recursive mapping" |
2075 | 2075 | msgstr "E223: ðåêóðñèâíàÿ ïðèâÿçêà" |
2076 | 2076 | |
2077 | -#: getchar.c:3077 | |
2077 | +#: getchar.c:3087 | |
2078 | 2078 | #, c-format |
2079 | 2079 | msgid "E224: global abbreviation already exists for %s" |
2080 | 2080 | msgstr "E224: óæå åñòü ãëîáàëüíîå ñîêðàùåíèå äëÿ %s" |
2081 | 2081 | |
2082 | -#: getchar.c:3080 | |
2082 | +#: getchar.c:3090 | |
2083 | 2083 | #, c-format |
2084 | 2084 | msgid "E225: global mapping already exists for %s" |
2085 | 2085 | msgstr "E225: óæå åñòü ãëîáàëüíàÿ ïðèâÿçêà äëÿ %s" |
2086 | 2086 | |
2087 | -#: getchar.c:3212 | |
2087 | +#: getchar.c:3222 | |
2088 | 2088 | #, c-format |
2089 | 2089 | msgid "E226: abbreviation already exists for %s" |
2090 | 2090 | msgstr "E226: óæå åñòü ñîêðàùåíèå äëÿ %s" |
2091 | 2091 | |
2092 | -#: getchar.c:3215 | |
2092 | +#: getchar.c:3225 | |
2093 | 2093 | #, c-format |
2094 | 2094 | msgid "E227: mapping already exists for %s" |
2095 | 2095 | msgstr "E227: óæå åñòü ïðèâÿçêà äëÿ %s" |
2096 | 2096 | |
2097 | -#: getchar.c:3279 | |
2097 | +#: getchar.c:3289 | |
2098 | 2098 | msgid "No abbreviation found" |
2099 | 2099 | msgstr "Ñîêðàùåíèÿ íå íàéäåíû" |
2100 | 2100 | |
2101 | -#: getchar.c:3281 | |
2101 | +#: getchar.c:3291 | |
2102 | 2102 | msgid "No mapping found" |
2103 | 2103 | msgstr "Ïðèâÿçêè íå íàéäåíû" |
2104 | 2104 | |
2105 | -#: getchar.c:4173 | |
2105 | +#: getchar.c:4183 | |
2106 | 2106 | msgid "E228: makemap: Illegal mode" |
2107 | 2107 | msgstr "E228: makemap: íåäîïóñòèìûé ðåæèì" |
2108 | 2108 |
@@ -2128,7 +2128,7 @@ | ||
2128 | 2128 | msgid "E599: Value of 'imactivatekey' is invalid" |
2129 | 2129 | msgstr "E599: íåïðàâèëüíîå çíà÷åíèå îïöèè 'imactivatekey'" |
2130 | 2130 | |
2131 | -#: gui.c:4061 | |
2131 | +#: gui.c:4064 | |
2132 | 2132 | #, c-format |
2133 | 2133 | msgid "E254: Cannot allocate color %s" |
2134 | 2134 | msgstr "E254: Íåâîçìîæíî íàçíà÷èòü öâåò %s" |
@@ -2170,7 +2170,7 @@ | ||
2170 | 2170 | msgid "Vim dialog" |
2171 | 2171 | msgstr "Äèàëîãîâîå îêíî Vim" |
2172 | 2172 | |
2173 | -#: gui_beval.c:101 gui_w32.c:3829 | |
2173 | +#: gui_beval.c:101 gui_w32.c:3978 | |
2174 | 2174 | msgid "E232: Cannot create BalloonEval with both message and callback" |
2175 | 2175 | msgstr "" |
2176 | 2176 | "E232: \"Ïóçûðü\" äëÿ âû÷èñëåíèé, âêëþ÷àþùèé è ñîîáùåíèå, è îáðàòíûé âûçîâ, " |
@@ -2180,7 +2180,7 @@ | ||
2180 | 2180 | msgid "Vim dialog..." |
2181 | 2181 | msgstr "Äèàëîãîâîå îêíî Vim..." |
2182 | 2182 | |
2183 | -#: gui_gtk.c:2060 message.c:2993 | |
2183 | +#: gui_gtk.c:2060 message.c:2999 | |
2184 | 2184 | msgid "" |
2185 | 2185 | "&Yes\n" |
2186 | 2186 | "&No\n" |
@@ -2303,16 +2303,24 @@ | ||
2303 | 2303 | "\n" |
2304 | 2304 | "Îòïðàâêà ñîîáùåíèÿ äëÿ óíè÷òîæåíèÿ ïðîöåññà-ïîòîìêà.\n" |
2305 | 2305 | |
2306 | -#: gui_w32.c:829 | |
2306 | +#: gui_w32.c:839 | |
2307 | +msgid "E671: Cannot find window title \"%s\"" | |
2308 | +msgstr "E671: Îêíî ñ çàãîëîâêîì \"%s\" íå îáíàðóæåíî" | |
2309 | + | |
2310 | +#: gui_w32.c:847 | |
2307 | 2311 | #, c-format |
2308 | 2312 | msgid "E243: Argument not supported: \"-%s\"; Use the OLE version." |
2309 | 2313 | msgstr "E243: Ïàðàìåòð íå ïîääåðæèâàåòñÿ: \"-%s\"; èñïîëüçóéòå âåðñèþ OLE." |
2310 | 2314 | |
2311 | -#: gui_w48.c:2090 | |
2315 | +#: gui_w32.c:1100 | |
2316 | +msgid "E672: Unable to open window inside MDI application" | |
2317 | +msgstr "E672: Íåâîçìîæíî îòêðûòü îêíî âíóòðè ïðèëîæåíèÿ MDI" | |
2318 | + | |
2319 | +#: gui_w48.c:2163 | |
2312 | 2320 | msgid "Find string (use '\\\\' to find a '\\')" |
2313 | 2321 | msgstr "Ïîèñê ñòðîêè (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')" |
2314 | 2322 | |
2315 | -#: gui_w48.c:2115 | |
2323 | +#: gui_w48.c:2188 | |
2316 | 2324 | msgid "Find & Replace (use '\\\\' to find a '\\')" |
2317 | 2325 | msgstr "Ïîèñê è çàìåíà (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')" |
2318 | 2326 |
@@ -2353,6 +2361,7 @@ | ||
2353 | 2361 | msgstr "Font1: %s\n" |
2354 | 2362 | |
2355 | 2363 | #: gui_x11.c:2184 |
2364 | +#, c-format | |
2356 | 2365 | msgid "Font%ld width is not twice that of font0\n" |
2357 | 2366 | msgstr "Øèðèíà øðèôòà font%ld äîëæíà áûòü âäâîå áîëüøå øèðèíû øðèôòà font0\n" |
2358 | 2367 |
@@ -2933,47 +2942,47 @@ | ||
2933 | 2942 | msgid "Invalid argument for" |
2934 | 2943 | msgstr "Íåäîïóñòèìûå àðãóìåíòû äëÿ" |
2935 | 2944 | |
2936 | -#: main.c:466 | |
2945 | +#: main.c:469 | |
2937 | 2946 | msgid "This Vim was not compiled with the diff feature." |
2938 | 2947 | msgstr "" |
2939 | 2948 | "Äàííûé Vim áûë ñêîìïèëèðîâàí ñ âûêëþ÷åííîé îñîáåííîñòüþ ïðîñìîòðà îòëè÷èé" |
2940 | 2949 | |
2941 | -#: main.c:932 | |
2950 | +#: main.c:935 | |
2942 | 2951 | msgid "Attempt to open script file again: \"" |
2943 | 2952 | msgstr "Ïîïûòêà ïîâòîðíîãî îòêðûòèÿ ôàéëà ñöåíàðèÿ: \"" |
2944 | 2953 | |
2945 | -#: main.c:941 | |
2954 | +#: main.c:944 | |
2946 | 2955 | msgid "Cannot open for reading: \"" |
2947 | 2956 | msgstr "Íåâîçìîæíî îòêðûòü äëÿ ÷òåíèÿ: \"" |
2948 | 2957 | |
2949 | -#: main.c:985 | |
2958 | +#: main.c:988 | |
2950 | 2959 | msgid "Cannot open for script output: \"" |
2951 | 2960 | msgstr "Íåâîçìîæíî îòêðûòü äëÿ âûâîäà ñöåíàðèÿ: \"" |
2952 | 2961 | |
2953 | -#: main.c:1132 | |
2962 | +#: main.c:1135 | |
2954 | 2963 | #, c-format |
2955 | 2964 | msgid "%d files to edit\n" |
2956 | 2965 | msgstr "Ôàéëîâ äëÿ ðåäàêòèðîâàíèÿ: %d\n" |
2957 | 2966 | |
2958 | -#: main.c:1233 | |
2967 | +#: main.c:1236 | |
2959 | 2968 | msgid "Vim: Warning: Output is not to a terminal\n" |
2960 | 2969 | msgstr "Vim: Ïðåäóïðåæäåíèå: Âûâîä îñóùåñòâëÿåòñÿ íå íà òåðìèíàë\n" |
2961 | 2970 | |
2962 | -#: main.c:1235 | |
2971 | +#: main.c:1238 | |
2963 | 2972 | msgid "Vim: Warning: Input is not from a terminal\n" |
2964 | 2973 | msgstr "Vim: Ïðåäóïðåæäåíèå: Ââîä ïðîèñõîäèò íå ñ òåðìèíàëà\n" |
2965 | 2974 | |
2966 | 2975 | #. just in case.. |
2967 | -#: main.c:1297 | |
2976 | +#: main.c:1306 | |
2968 | 2977 | msgid "pre-vimrc command line" |
2969 | 2978 | msgstr "êîìàíäíàÿ ñòðîêà ïåðåä âûïîëíåíèåì vimrc" |
2970 | 2979 | |
2971 | -#: main.c:1338 | |
2980 | +#: main.c:1347 | |
2972 | 2981 | #, c-format |
2973 | 2982 | msgid "E282: Cannot read from \"%s\"" |
2974 | 2983 | msgstr "E282: Íåâîçìîæíî âûïîëíèòü ÷òåíèå èç \"%s\"" |
2975 | 2984 | |
2976 | -#: main.c:2411 | |
2985 | +#: main.c:2420 | |
2977 | 2986 | msgid "" |
2978 | 2987 | "\n" |
2979 | 2988 | "More info with: \"vim -h\"\n" |
@@ -2981,23 +2990,23 @@ | ||
2981 | 2990 | "\n" |
2982 | 2991 | "Äîïîëíèòåëüíàÿ èíôîðìàöèÿ: \"vim -h\"\n" |
2983 | 2992 | |
2984 | -#: main.c:2444 | |
2993 | +#: main.c:2453 | |
2985 | 2994 | msgid "[file ..] edit specified file(s)" |
2986 | 2995 | msgstr "[ôàéë ..] ðåäàêòèðîâàíèå óêàçàííûõ ôàéëîâ" |
2987 | 2996 | |
2988 | -#: main.c:2445 | |
2997 | +#: main.c:2454 | |
2989 | 2998 | msgid "- read text from stdin" |
2990 | 2999 | msgstr "- ÷òåíèå òåêñòà èç ïîòîêà ââîäà stdin" |
2991 | 3000 | |
2992 | -#: main.c:2446 | |
3001 | +#: main.c:2455 | |
2993 | 3002 | msgid "-t tag edit file where tag is defined" |
2994 | 3003 | msgstr "-t ìåòêà ðåäàêòèðîâàíèå ôàéëà ñ óêàçàííîé ìåòêîé" |
2995 | 3004 | |
2996 | -#: main.c:2448 | |
3005 | +#: main.c:2457 | |
2997 | 3006 | msgid "-q [errorfile] edit file with first error" |
2998 | 3007 | msgstr "-q [ôàéë îøèáîê] ðåäàêòèðîâàíèå ôàéëà ñ ïåðâîé îøèáêîé" |
2999 | 3008 | |
3000 | -#: main.c:2457 | |
3009 | +#: main.c:2466 | |
3001 | 3010 | msgid "" |
3002 | 3011 | "\n" |
3003 | 3012 | "\n" |
@@ -3007,11 +3016,11 @@ | ||
3007 | 3016 | "\n" |
3008 | 3017 | "Èñïîëüçîâàíèå:" |
3009 | 3018 | |
3010 | -#: main.c:2460 | |
3019 | +#: main.c:2469 | |
3011 | 3020 | msgid " vim [arguments] " |
3012 | 3021 | msgstr " vim [àðãóìåíòû] " |
3013 | 3022 | |
3014 | -#: main.c:2464 | |
3023 | +#: main.c:2473 | |
3015 | 3024 | msgid "" |
3016 | 3025 | "\n" |
3017 | 3026 | " or:" |
@@ -3019,7 +3028,7 @@ | ||
3019 | 3028 | "\n" |
3020 | 3029 | " èëè:" |
3021 | 3030 | |
3022 | -#: main.c:2467 | |
3031 | +#: main.c:2476 | |
3023 | 3032 | msgid "" |
3024 | 3033 | "\n" |
3025 | 3034 | "\n" |
@@ -3029,244 +3038,244 @@ | ||
3029 | 3038 | "\n" |
3030 | 3039 | "Àðãóìåíòû:\n" |
3031 | 3040 | |
3032 | -#: main.c:2468 | |
3041 | +#: main.c:2477 | |
3033 | 3042 | msgid "--\t\t\tOnly file names after this" |
3034 | 3043 | msgstr "--\t\t\tÄàëåå óêàçûâàþòñÿ òîëüêî èìåíà ôàéëîâ" |
3035 | 3044 | |
3036 | -#: main.c:2470 | |
3045 | +#: main.c:2479 | |
3037 | 3046 | msgid "--literal\t\tDon't expand wildcards" |
3038 | 3047 | msgstr "--literal\t\tÍå âûïîëíÿòü ïîäñòàíîâêó ïî ìàñêå" |
3039 | 3048 | |
3040 | -#: main.c:2473 | |
3049 | +#: main.c:2482 | |
3041 | 3050 | msgid "-register\t\tRegister this gvim for OLE" |
3042 | 3051 | msgstr "-register\t\tÇàðåãèñòðèðîâàòü ýòîò gvim äëÿ OLE" |
3043 | 3052 | |
3044 | -#: main.c:2474 | |
3053 | +#: main.c:2483 | |
3045 | 3054 | msgid "-unregister\t\tUnregister gvim for OLE" |
3046 | 3055 | msgstr "-unregister\t\tÎòêëþ÷èòü ðåãèñòðàöèþ äàííîãî gvim äëÿ OLE" |
3047 | 3056 | |
3048 | -#: main.c:2477 | |
3057 | +#: main.c:2486 | |
3049 | 3058 | msgid "-g\t\t\tRun using GUI (like \"gvim\")" |
3050 | 3059 | msgstr "-g\t\t\tÇàïóñòèòü ñ ãðàôè÷åñêèì èíòåðôåéñîì (êàê \"gvim\")" |
3051 | 3060 | |
3052 | -#: main.c:2478 | |
3061 | +#: main.c:2487 | |
3053 | 3062 | msgid "-f or --nofork\tForeground: Don't fork when starting GUI" |
3054 | 3063 | msgstr "-f èëè --nofork\t àêòèâíîé çàäà÷å: Íå âûïîëíÿòü fork ïðè çàïóñêå GUI" |
3055 | 3064 | |
3056 | -#: main.c:2480 | |
3065 | +#: main.c:2489 | |
3057 | 3066 | msgid "-v\t\t\tVi mode (like \"vi\")" |
3058 | 3067 | msgstr "-v\t\t\tÐåæèì Vi (êàê \"vi\")" |
3059 | 3068 | |
3060 | -#: main.c:2481 | |
3069 | +#: main.c:2490 | |
3061 | 3070 | msgid "-e\t\t\tEx mode (like \"ex\")" |
3062 | 3071 | msgstr "-e\t\t\tÐåæèì Ex (êàê \"ex\")" |
3063 | 3072 | |
3064 | -#: main.c:2482 | |
3073 | +#: main.c:2491 | |
3065 | 3074 | msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" |
3066 | 3075 | msgstr "-s\t\t\tÒèõèé (ïàêåòíûé) ðåæèì (òîëüêî äëÿ \"ex\")" |
3067 | 3076 | |
3068 | -#: main.c:2484 | |
3077 | +#: main.c:2493 | |
3069 | 3078 | msgid "-d\t\t\tDiff mode (like \"vimdiff\")" |
3070 | 3079 | msgstr "-d\t\t\tÐåæèì îòëè÷èé (êàê \"vimdiff\")" |
3071 | 3080 | |
3072 | -#: main.c:2486 | |
3081 | +#: main.c:2495 | |
3073 | 3082 | msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" |
3074 | 3083 | msgstr "-y\t\t\tÏðîñòîé ðåæèì (êàê \"evim\", áåçðåæèìíûé)" |
3075 | 3084 | |
3076 | -#: main.c:2487 | |
3085 | +#: main.c:2496 | |
3077 | 3086 | msgid "-R\t\t\tReadonly mode (like \"view\")" |
3078 | 3087 | msgstr "-R\t\t\tÒîëüêî äëÿ ÷òåíèÿ (êàê \"view\")" |
3079 | 3088 | |
3080 | -#: main.c:2488 | |
3089 | +#: main.c:2497 | |
3081 | 3090 | msgid "-Z\t\t\tRestricted mode (like \"rvim\")" |
3082 | 3091 | msgstr "-Z\t\t\tÎãðàíè÷åííûé ðåæèì (êàê \"rvim\")" |
3083 | 3092 | |
3084 | -#: main.c:2489 | |
3093 | +#: main.c:2498 | |
3085 | 3094 | msgid "-m\t\t\tModifications (writing files) not allowed" |
3086 | 3095 | msgstr "-m\t\t\tÁåç âîçìîæíîñòè ñîõðàíåíèÿ èçìåíåíèé (çàïèñè ôàéëîâ)" |
3087 | 3096 | |
3088 | -#: main.c:2490 | |
3097 | +#: main.c:2499 | |
3089 | 3098 | msgid "-M\t\t\tModifications in text not allowed" |
3090 | 3099 | msgstr "-M\t\t\tÁåç âîçìîæíîñòè âíåñåíèÿ èçìåíåíèé â òåêñò" |
3091 | 3100 | |
3092 | -#: main.c:2491 | |
3101 | +#: main.c:2500 | |
3093 | 3102 | msgid "-b\t\t\tBinary mode" |
3094 | 3103 | msgstr "-b\t\t\tÁèíàðíûé ðåæèì" |
3095 | 3104 | |
3096 | -#: main.c:2493 | |
3097 | -msgid "-l\t\t\tLisp mode" | |
3098 | -msgstr "-l\t\t\tÐåæèì Lisp" | |
3099 | - | |
3100 | -#: main.c:2495 | |
3101 | -msgid "-C\t\t\tCompatible with Vi: 'compatible'" | |
3102 | -msgstr "-C\t\t\tÐåæèì ñîâìåñòèìîñòè ñ Vi: 'compatible'" | |
3103 | - | |
3104 | -#: main.c:2496 | |
3105 | -msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" | |
3106 | -msgstr "-N\t\t\tÐåæèì íåïîëíîé ñîâìåñòèìîñòè ñ Vi: 'nocompatible'" | |
3107 | - | |
3108 | -#: main.c:2497 | |
3109 | -msgid "-V[N]\t\tVerbose level" | |
3110 | -msgstr "-V[N]\t\tÓðîâåíü ïîäðîáíîñòè ñîîáùåíèé" | |
3111 | - | |
3112 | -#: main.c:2498 | |
3113 | -msgid "-D\t\t\tDebugging mode" | |
3114 | -msgstr "-D\t\t\tÐåæèì îòëàäêè" | |
3115 | - | |
3116 | -#: main.c:2499 | |
3117 | -msgid "-n\t\t\tNo swap file, use memory only" | |
3118 | -msgstr "-n\t\t\tÁåç ñâîï-ôàéëà, èñïîëüçóåòñÿ òîëüêî ïàìÿòü" | |
3119 | - | |
3120 | -#: main.c:2500 | |
3121 | -msgid "-r\t\t\tList swap files and exit" | |
3122 | -msgstr "-r\t\t\tÂûâåñòè ñïèñîê ñâîï-ôàéëîâ è çàâåðøèòü ðàáîòó" | |
3123 | - | |
3124 | -#: main.c:2501 | |
3125 | -msgid "-r (with file name)\tRecover crashed session" | |
3126 | -msgstr "-r (ñ èìåíåì ôàéëà)\tÂîññòàíîâèòü àâàðèéíî çàâåðø¸ííûé ñåàíñ" | |
3127 | - | |
3128 | 3105 | #: main.c:2502 |
3129 | -msgid "-L\t\t\tSame as -r" | |
3130 | -msgstr "-L\t\t\tÒî æå, ÷òî è -r" | |
3106 | +msgid "-l\t\t\tLisp mode" | |
3107 | +msgstr "-l\t\t\tÐåæèì Lisp" | |
3131 | 3108 | |
3132 | 3109 | #: main.c:2504 |
3110 | +msgid "-C\t\t\tCompatible with Vi: 'compatible'" | |
3111 | +msgstr "-C\t\t\tÐåæèì ñîâìåñòèìîñòè ñ Vi: 'compatible'" | |
3112 | + | |
3113 | +#: main.c:2505 | |
3114 | +msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" | |
3115 | +msgstr "-N\t\t\tÐåæèì íåïîëíîé ñîâìåñòèìîñòè ñ Vi: 'nocompatible'" | |
3116 | + | |
3117 | +#: main.c:2506 | |
3118 | +msgid "-V[N]\t\tVerbose level" | |
3119 | +msgstr "-V[N]\t\tÓðîâåíü ïîäðîáíîñòè ñîîáùåíèé" | |
3120 | + | |
3121 | +#: main.c:2507 | |
3122 | +msgid "-D\t\t\tDebugging mode" | |
3123 | +msgstr "-D\t\t\tÐåæèì îòëàäêè" | |
3124 | + | |
3125 | +#: main.c:2508 | |
3126 | +msgid "-n\t\t\tNo swap file, use memory only" | |
3127 | +msgstr "-n\t\t\tÁåç ñâîï-ôàéëà, èñïîëüçóåòñÿ òîëüêî ïàìÿòü" | |
3128 | + | |
3129 | +#: main.c:2509 | |
3130 | +msgid "-r\t\t\tList swap files and exit" | |
3131 | +msgstr "-r\t\t\tÂûâåñòè ñïèñîê ñâîï-ôàéëîâ è çàâåðøèòü ðàáîòó" | |
3132 | + | |
3133 | +#: main.c:2510 | |
3134 | +msgid "-r (with file name)\tRecover crashed session" | |
3135 | +msgstr "-r (ñ èìåíåì ôàéëà)\tÂîññòàíîâèòü àâàðèéíî çàâåðø¸ííûé ñåàíñ" | |
3136 | + | |
3137 | +#: main.c:2511 | |
3138 | +msgid "-L\t\t\tSame as -r" | |
3139 | +msgstr "-L\t\t\tÒî æå, ÷òî è -r" | |
3140 | + | |
3141 | +#: main.c:2513 | |
3133 | 3142 | msgid "-f\t\t\tDon't use newcli to open window" |
3134 | 3143 | msgstr "-f\t\t\tÍå èñïîëüçîâàòü newcli äëÿ îòêðûòèÿ îêíà" |
3135 | 3144 | |
3136 | -#: main.c:2505 | |
3145 | +#: main.c:2514 | |
3137 | 3146 | msgid "-dev <device>\t\tUse <device> for I/O" |
3138 | 3147 | msgstr "-dev <óñòðîéñòâî>\t\tÈñïîëüçîâàòü äëÿ I/O óêàçàííîå <óñòðîéñòâî>" |
3139 | 3148 | |
3140 | -#: main.c:2508 | |
3149 | +#: main.c:2517 | |
3141 | 3150 | msgid "-A\t\t\tstart in Arabic mode" |
3142 | 3151 | msgstr "-A\t\t\tÇàïóñê â Àðàáñêîì ðåæèìå" |
3143 | 3152 | |
3144 | -#: main.c:2511 | |
3153 | +#: main.c:2520 | |
3145 | 3154 | msgid "-H\t\t\tStart in Hebrew mode" |
3146 | 3155 | msgstr "-H\t\t\tÇàïóñê â ðåæèìå \"Èâðèò\"" |
3147 | 3156 | |
3148 | -#: main.c:2514 | |
3157 | +#: main.c:2523 | |
3149 | 3158 | msgid "-F\t\t\tStart in Farsi mode" |
3150 | 3159 | msgstr "-F\t\t\tÇàïóñê â ðåæèìå \"Ôàðñè\"" |
3151 | 3160 | |
3152 | -#: main.c:2516 | |
3161 | +#: main.c:2525 | |
3153 | 3162 | msgid "-T <terminal>\tSet terminal type to <terminal>" |
3154 | 3163 | msgstr "-T <òåðìèíàë>\tÍàçíà÷èòü óêàçàííûé òèï <òåðìèíàëà>" |
3155 | 3164 | |
3156 | -#: main.c:2517 | |
3165 | +#: main.c:2526 | |
3157 | 3166 | msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc" |
3158 | 3167 | msgstr "-u <vimrc>\t\tÈñïîëüçîâàòü <vimrc> âìåñòî ëþáûõ ôàéëîâ .vimrc" |
3159 | 3168 | |
3160 | -#: main.c:2519 | |
3169 | +#: main.c:2528 | |
3161 | 3170 | msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc" |
3162 | 3171 | msgstr "-U <gvimrc>\t\tÈñïîëüçîâàòü <gvimrc> âìåñòî ëþáûõ ôàéëîâ .gvimrc" |
3163 | 3172 | |
3164 | -#: main.c:2521 | |
3173 | +#: main.c:2530 | |
3165 | 3174 | msgid "--noplugin\t\tDon't load plugin scripts" |
3166 | 3175 | msgstr "--noplugin\t\tÍå çàãðóæàòü ñöåíàðèè ìîäóëåé" |
3167 | 3176 | |
3168 | -#: main.c:2522 | |
3177 | +#: main.c:2531 | |
3169 | 3178 | msgid "-o[N]\t\tOpen N windows (default: one for each file)" |
3170 | 3179 | msgstr "-o[N]\t\tÎòêðûòü N îêîí (ïî óìîë÷àíèþ: ïî îäíîìó íà êàæäûé ôàéë)" |
3171 | 3180 | |
3172 | -#: main.c:2523 | |
3181 | +#: main.c:2532 | |
3173 | 3182 | msgid "-O[N]\t\tLike -o but split vertically" |
3174 | 3183 | msgstr "-O[N]\t\tÒî æå, ÷òî è -o, íî ñ âåðòèêàëüíûì ðàçäåëåíèåì îêîí" |
3175 | 3184 | |
3176 | -#: main.c:2524 | |
3185 | +#: main.c:2533 | |
3177 | 3186 | msgid "+\t\t\tStart at end of file" |
3178 | 3187 | msgstr "+\t\t\tÍà÷àòü ðåäàêòèðîâàíèå â êîíöå ôàéëà" |
3179 | 3188 | |
3180 | -#: main.c:2525 | |
3189 | +#: main.c:2534 | |
3181 | 3190 | msgid "+<lnum>\t\tStart at line <lnum>" |
3182 | 3191 | msgstr "+<lnum>\t\tÍà÷àòü ðåäàêòèðîâàíèå â ñòðîêå ñ íîìåðîì <lnum>" |
3183 | 3192 | |
3184 | -#: main.c:2527 | |
3193 | +#: main.c:2536 | |
3185 | 3194 | msgid "--cmd <command>\tExecute <command> before loading any vimrc file" |
3186 | 3195 | msgstr "--cmd <êîìàíäà>\tÂûïîëíèòü <êîìàíäó> ïåðåä çàãðóçêîé ôàéëà vimrc" |
3187 | 3196 | |
3188 | -#: main.c:2529 | |
3197 | +#: main.c:2538 | |
3189 | 3198 | msgid "-c <command>\t\tExecute <command> after loading the first file" |
3190 | 3199 | msgstr "-c <êîìàíäà>\t\tÂûïîëíèòü <êîìàíäó> ïîñëå çàãðóçêè ïåðâîãî ôàéëà" |
3191 | 3200 | |
3192 | -#: main.c:2530 | |
3201 | +#: main.c:2539 | |
3193 | 3202 | msgid "-S <session>\t\tSource file <session> after loading the first file" |
3194 | 3203 | msgstr "-S <ñåàíñ>\t\tÏðî÷èòàòü ñöåíàðèé <ñåàíñà> ïîñëå çàãðóçêè ïåðâîãî ôàéëà" |
3195 | 3204 | |
3196 | -#: main.c:2531 | |
3205 | +#: main.c:2540 | |
3197 | 3206 | msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>" |
3198 | 3207 | msgstr "-s <ñöåíàðèé>\tÏðî÷èòàòü êîìàíäû Îáû÷íîãî ðåæèìà èç ôàéëà <ñöåíàðèÿ>" |
3199 | 3208 | |
3200 | -#: main.c:2532 | |
3209 | +#: main.c:2541 | |
3201 | 3210 | msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>" |
3202 | 3211 | msgstr "-w <ñöåíàðèé>\tÄîáàâëÿòü âñå ââåä¸ííûå êîìàíäû â ôàéë <ñöåíàðèÿ>" |
3203 | 3212 | |
3204 | -#: main.c:2533 | |
3213 | +#: main.c:2542 | |
3205 | 3214 | msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>" |
3206 | 3215 | msgstr "-W <ñöåíàðèé>\tÇàïèñàòü âñå ââåä¸ííûå êîìàíäû â ôàéë <ñöåíàðèÿ>" |
3207 | 3216 | |
3208 | -#: main.c:2535 | |
3217 | +#: main.c:2544 | |
3209 | 3218 | msgid "-x\t\t\tEdit encrypted files" |
3210 | 3219 | msgstr "-x\t\t\tÐåäàêòèðîâàíèå çàøèôðîâàííûõ ôàéëîâ" |
3211 | 3220 | |
3212 | -#: main.c:2539 | |
3221 | +#: main.c:2548 | |
3213 | 3222 | msgid "-display <display>\tConnect vim to this particular X-server" |
3214 | 3223 | msgstr "-display <ýêðàí>\tÏîäñîåäèíèòü vim ê óêàçàííîìó ñåðâåðó X" |
3215 | 3224 | |
3216 | -#: main.c:2541 | |
3225 | +#: main.c:2550 | |
3217 | 3226 | msgid "-X\t\t\tDo not connect to X server" |
3218 | 3227 | msgstr "-X\t\t\tÍå âûïîëíÿòü ñîåäèíåíèå ñ ñåðâåðîì X" |
3219 | 3228 | |
3220 | -#: main.c:2544 | |
3229 | +#: main.c:2553 | |
3221 | 3230 | msgid "--remote <files>\tEdit <files> in a Vim server if possible" |
3222 | 3231 | msgstr "--remote <ôàéëû>\tÏî âîçìîæíîñòè ðåäàêòèðîâàòü <ôàéëû> íà ñåðâåðå Vim" |
3223 | 3232 | |
3224 | -#: main.c:2545 | |
3233 | +#: main.c:2554 | |
3225 | 3234 | msgid "--remote-silent <files> Same, don't complain if there is no server" |
3226 | 3235 | msgstr "--remote-silent <ôàéëû> Òî æå, íî áåç æàëîá íà îòñóòñòâèå ñåðâåðà" |
3227 | 3236 | |
3228 | -#: main.c:2546 | |
3237 | +#: main.c:2555 | |
3229 | 3238 | msgid "" |
3230 | 3239 | "--remote-wait <files> As --remote but wait for files to have been edited" |
3231 | 3240 | msgstr "" |
3232 | 3241 | "--remote-wait <ôàéëû> Òî æå, ÷òî è --remote, íî ñ îæèäàíèåì çàâåðøåíèÿ" |
3233 | 3242 | |
3234 | -#: main.c:2547 | |
3243 | +#: main.c:2556 | |
3235 | 3244 | msgid "" |
3236 | 3245 | "--remote-wait-silent <files> Same, don't complain if there is no server" |
3237 | 3246 | msgstr "" |
3238 | 3247 | "--remote-wait-silent <ôàéëû> Òî æå, íî áåç æàëîá íà îòñóòñòâèå ñåðâåðà" |
3239 | 3248 | |
3240 | -#: main.c:2548 | |
3249 | +#: main.c:2557 | |
3241 | 3250 | msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" |
3242 | 3251 | msgstr "--remote-send <êíîïêè>\tÎòïðàâèòü <êíîïêè> íà ñåðâåð Vim è âûéòè" |
3243 | 3252 | |
3244 | -#: main.c:2549 | |
3253 | +#: main.c:2558 | |
3245 | 3254 | msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result" |
3246 | 3255 | msgstr "--remote-expr <âûðàæ>\tÂû÷èñëèòü <âûðàæ> íà ñåðâåðå Vim è íàïå÷àòàòü" |
3247 | 3256 | |
3248 | -#: main.c:2550 | |
3257 | +#: main.c:2559 | |
3249 | 3258 | msgid "--serverlist\t\tList available Vim server names and exit" |
3250 | 3259 | msgstr "--serverlist\t\tÏîêàçàòü ñïèñîê èì¸í ñåðâåðîâ Vim è çàâåðøèòü ðàáîòó" |
3251 | 3260 | |
3252 | -#: main.c:2551 | |
3261 | +#: main.c:2560 | |
3253 | 3262 | msgid "--servername <name>\tSend to/become the Vim server <name>" |
3254 | 3263 | msgstr "" |
3255 | 3264 | "--servername <èìÿ>\tÎòïðàâèòü íà/ñòàòü ñåðâåðîì Vim ñ óêàçàííûì <èìåíåì>" |
3256 | 3265 | |
3257 | -#: main.c:2554 | |
3266 | +#: main.c:2563 | |
3258 | 3267 | msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo" |
3259 | 3268 | msgstr "-i <viminfo>\t\tÈñïîëüçîâàòü âìåñòî .viminfo ôàéë <viminfo>" |
3260 | 3269 | |
3261 | -#: main.c:2556 | |
3270 | +#: main.c:2565 | |
3262 | 3271 | msgid "-h or --help\tPrint Help (this message) and exit" |
3263 | 3272 | msgstr "-h èëè --help\tÂûâåñòè ñïðàâêó (ýòî ñîîáùåíèå) è çàâåðøèòü ðàáîòó" |
3264 | 3273 | |
3265 | -#: main.c:2557 | |
3274 | +#: main.c:2566 | |
3266 | 3275 | msgid "--version\t\tPrint version information and exit" |
3267 | 3276 | msgstr "--version\t\tÂûâåñòè èíôîðìàöèþ î âåðñèè Vim è çàâåðøèòü ðàáîòó" |
3268 | 3277 | |
3269 | -#: main.c:2561 | |
3278 | +#: main.c:2570 | |
3270 | 3279 | msgid "" |
3271 | 3280 | "\n" |
3272 | 3281 | "Arguments recognised by gvim (Motif version):\n" |
@@ -3274,7 +3283,7 @@ | ||
3274 | 3283 | "\n" |
3275 | 3284 | "Àðãóìåíòû äëÿ gvim (âåðñèÿ Motif):\n" |
3276 | 3285 | |
3277 | -#: main.c:2565 | |
3286 | +#: main.c:2574 | |
3278 | 3287 | msgid "" |
3279 | 3288 | "\n" |
3280 | 3289 | "Arguments recognised by gvim (neXtaw version):\n" |
@@ -3282,7 +3291,7 @@ | ||
3282 | 3291 | "\n" |
3283 | 3292 | "Àðãóìåíòû äëÿ gvim (âåðñèÿ neXtaw):\n" |
3284 | 3293 | |
3285 | -#: main.c:2567 | |
3294 | +#: main.c:2576 | |
3286 | 3295 | msgid "" |
3287 | 3296 | "\n" |
3288 | 3297 | "Arguments recognised by gvim (Athena version):\n" |
@@ -3290,75 +3299,75 @@ | ||
3290 | 3299 | "\n" |
3291 | 3300 | "Àðãóìåíòû äëÿ gvim (âåðñèÿ Athena):\n" |
3292 | 3301 | |
3293 | -#: main.c:2571 | |
3302 | +#: main.c:2580 | |
3294 | 3303 | msgid "-display <display>\tRun vim on <display>" |
3295 | 3304 | msgstr "-display <äèñïëåé>\tÇàïóñòèòü vim íà óêàçàííîì <äèñïëåå>" |
3296 | 3305 | |
3297 | -#: main.c:2572 | |
3306 | +#: main.c:2581 | |
3298 | 3307 | msgid "-iconic\t\tStart vim iconified" |
3299 | 3308 | msgstr "-iconic\t\tÇàïóñòèòü vim â ñâ¸ðíóòîì âèäå" |
3300 | 3309 | |
3301 | -#: main.c:2574 | |
3310 | +#: main.c:2583 | |
3302 | 3311 | msgid "-name <name>\t\tUse resource as if vim was <name>" |
3303 | 3312 | msgstr "-name <èìÿ>\t\tÈñïîëüçîâàòü ðåñóðñ, êàê åñëè áû vim áûë <èìåíåì>" |
3304 | 3313 | |
3305 | -#: main.c:2575 | |
3314 | +#: main.c:2584 | |
3306 | 3315 | msgid "\t\t\t (Unimplemented)\n" |
3307 | 3316 | msgstr "\t\t\t (Íå ðåàëèçîâàíî)\n" |
3308 | 3317 | |
3309 | -#: main.c:2577 | |
3318 | +#: main.c:2586 | |
3310 | 3319 | msgid "-background <color>\tUse <color> for the background (also: -bg)" |
3311 | 3320 | msgstr "" |
3312 | 3321 | "-background <öâåò>\tÈñïîëüçîâàòü óêàçàííûé <öâåò> äëÿ ôîíà (òàêæå: -bg)" |
3313 | 3322 | |
3314 | -#: main.c:2578 | |
3323 | +#: main.c:2587 | |
3315 | 3324 | msgid "-foreground <color>\tUse <color> for normal text (also: -fg)" |
3316 | 3325 | msgstr "" |
3317 | 3326 | "-foreground <öâåò>\tÈñïîëüçîâàòü <öâåò> äëÿ îáû÷íîãî òåêñòà (òàêæå: -fg)" |
3318 | 3327 | |
3319 | -#: main.c:2579 main.c:2599 | |
3328 | +#: main.c:2588 main.c:2608 | |
3320 | 3329 | msgid "-font <font>\t\tUse <font> for normal text (also: -fn)" |
3321 | 3330 | msgstr "-font <øðèôò>\t\tÈñïîëüçîâàòü <øðèôò> äëÿ îáû÷íîãî òåêñòà (òàêæå: -fn)" |
3322 | 3331 | |
3323 | -#: main.c:2580 | |
3332 | +#: main.c:2589 | |
3324 | 3333 | msgid "-boldfont <font>\tUse <font> for bold text" |
3325 | 3334 | msgstr "-boldfont <øðèôò>\tÈñïîëüçîâàòü <øðèôò> äëÿ æèðíîãî òåêñòà" |
3326 | 3335 | |
3327 | -#: main.c:2581 | |
3336 | +#: main.c:2590 | |
3328 | 3337 | msgid "-italicfont <font>\tUse <font> for italic text" |
3329 | 3338 | msgstr "-italicfont <øðèôò>\tÈñïîëüçîâàòü <øðèôò> äëÿ íàêëîííîãî òåêñòà" |
3330 | 3339 | |
3331 | -#: main.c:2582 main.c:2600 | |
3340 | +#: main.c:2591 main.c:2609 | |
3332 | 3341 | msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)" |
3333 | 3342 | msgstr "" |
3334 | 3343 | "-geometry <ãåîìåòðèÿ>\tÈñïîëüçîâàòü íà÷àëüíóþ <ãåîìåòðèþ> (òàêæå: -geom)" |
3335 | 3344 | |
3336 | -#: main.c:2583 | |
3345 | +#: main.c:2592 | |
3337 | 3346 | msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)" |
3338 | 3347 | msgstr "-borderwidth <øèðèíà>\tÈñïîëüçîâàòü <øèðèíó> áîðäþðà (òàêæå: -bw)" |
3339 | 3348 | |
3340 | -#: main.c:2584 | |
3349 | +#: main.c:2593 | |
3341 | 3350 | msgid "-scrollbarwidth <width> Use a scrollbar width of <width> (also: -sw)" |
3342 | 3351 | msgstr "" |
3343 | 3352 | "-scrollbarwidth <øèðèíà> Èñïîëüçîâàòü øèðèíó ïîëîñû ïðîêðóòêè (òàêæå: -sw)" |
3344 | 3353 | |
3345 | -#: main.c:2586 | |
3354 | +#: main.c:2595 | |
3346 | 3355 | msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)" |
3347 | 3356 | msgstr "-menuheight <âûñîòà>\tÈñïîëüçîâàòü <âûñîòó> ìåíþ (òàêæå: -mh)" |
3348 | 3357 | |
3349 | -#: main.c:2588 main.c:2601 | |
3358 | +#: main.c:2597 main.c:2610 | |
3350 | 3359 | msgid "-reverse\t\tUse reverse video (also: -rv)" |
3351 | 3360 | msgstr "-reverse\t\tÈñïîëüçîâàòü èíâåðñíûé âèäåîðåæèì (òàêæå: -rv)" |
3352 | 3361 | |
3353 | -#: main.c:2589 | |
3362 | +#: main.c:2598 | |
3354 | 3363 | msgid "+reverse\t\tDon't use reverse video (also: +rv)" |
3355 | 3364 | msgstr "+reverse\t\tÍå èñïîëüçîâàòü èíâåðñíûé âèäåîðåæèì (òàêæå: +rv)" |
3356 | 3365 | |
3357 | -#: main.c:2590 | |
3366 | +#: main.c:2599 | |
3358 | 3367 | msgid "-xrm <resource>\tSet the specified resource" |
3359 | 3368 | msgstr "-xrm <ðåñóðñ>\tÓñòàíîâèòü óêàçàííûé <ðåñóðñ>" |
3360 | 3369 | |
3361 | -#: main.c:2593 | |
3370 | +#: main.c:2602 | |
3362 | 3371 | msgid "" |
3363 | 3372 | "\n" |
3364 | 3373 | "Arguments recognised by gvim (RISC OS version):\n" |
@@ -3366,15 +3375,15 @@ | ||
3366 | 3375 | "\n" |
3367 | 3376 | "Àðãóìåíòû äëÿ gvim (âåðñèÿ RISC OS):\n" |
3368 | 3377 | |
3369 | -#: main.c:2594 | |
3378 | +#: main.c:2603 | |
3370 | 3379 | msgid "--columns <number>\tInitial width of window in columns" |
3371 | 3380 | msgstr "--columns <÷èñëî>\tÏåðâîíà÷àëüíàÿ øèðèíà îêíà â êîëîíêàõ" |
3372 | 3381 | |
3373 | -#: main.c:2595 | |
3382 | +#: main.c:2604 | |
3374 | 3383 | msgid "--rows <number>\tInitial height of window in rows" |
3375 | 3384 | msgstr "--rows <÷èñëî>\tÏåðâîíà÷àëüíàÿ âûñîòà îêíà â ñòðîêàõ" |
3376 | 3385 | |
3377 | -#: main.c:2598 | |
3386 | +#: main.c:2607 | |
3378 | 3387 | msgid "" |
3379 | 3388 | "\n" |
3380 | 3389 | "Arguments recognised by gvim (GTK+ version):\n" |
@@ -3382,48 +3391,48 @@ | ||
3382 | 3391 | "\n" |
3383 | 3392 | "Àðãóìåíòû äëÿ gvim (âåðñèÿ GTK+):\n" |
3384 | 3393 | |
3385 | -#: main.c:2602 | |
3394 | +#: main.c:2611 | |
3386 | 3395 | msgid "-display <display>\tRun vim on <display> (also: --display)" |
3387 | 3396 | msgstr "" |
3388 | 3397 | "-display <äèñïëåé>\tÇàïóñòèòü vim íà óêàçàííîì <äèñïëåå> (òàêæå: --display)" |
3389 | 3398 | |
3390 | -#: main.c:2604 | |
3399 | +#: main.c:2613 | |
3391 | 3400 | msgid "--role <role>\tSet a unique role to identify the main window" |
3392 | 3401 | msgstr "" |
3393 | 3402 | "--role <ðîëü>\tÓñòàíîâèòü óíèêàëüíóþ <ðîëü> äëÿ èäåíòèôèêàöèè ãëàâíîãî îêíà" |
3394 | 3403 | |
3395 | -#: main.c:2606 | |
3404 | +#: main.c:2615 | |
3396 | 3405 | msgid "--socketid <xid>\tOpen Vim inside another GTK widget" |
3397 | 3406 | msgstr "--socketid <xid>\tÎòêðûòü Vim âíóòðè äðóãîãî êîìïîíåíòà GTK" |
3398 | 3407 | |
3399 | -#: main.c:2609 | |
3408 | +#: main.c:2618 | |
3400 | 3409 | msgid "-P <parent title>\tOpen Vim inside parent application" |
3401 | 3410 | msgstr "-P <çàãîëîâîê ðîäèòåëÿ>\tÎòêðûòü Vim â ðîäèòåëüñêîì ïðèëîæåíèè" |
3402 | 3411 | |
3403 | -#: main.c:2847 | |
3412 | +#: main.c:2856 | |
3404 | 3413 | msgid "No display" |
3405 | 3414 | msgstr "Íåò äèñïëåÿ" |
3406 | 3415 | |
3407 | 3416 | #. Failed to send, abort. |
3408 | -#: main.c:2862 | |
3417 | +#: main.c:2871 | |
3409 | 3418 | msgid ": Send failed.\n" |
3410 | 3419 | msgstr ": Îòïðàâêà íå óäàëàñü.\n" |
3411 | 3420 | |
3412 | 3421 | #. Let vim start normally. |
3413 | -#: main.c:2868 | |
3422 | +#: main.c:2877 | |
3414 | 3423 | msgid ": Send failed. Trying to execute locally\n" |
3415 | 3424 | msgstr ": Îòïðàâêà íå óäàëàñü. Ïîïûòêà ìåñòíîãî âûïîëíåíèÿ\n" |
3416 | 3425 | |
3417 | -#: main.c:2906 main.c:2927 | |
3426 | +#: main.c:2915 main.c:2936 | |
3418 | 3427 | #, c-format |
3419 | 3428 | msgid "%d of %d edited" |
3420 | 3429 | msgstr "îòðåäàêòèðîâàíî %d èç %d" |
3421 | 3430 | |
3422 | -#: main.c:2949 | |
3431 | +#: main.c:2958 | |
3423 | 3432 | msgid "No display: Send expression failed.\n" |
3424 | 3433 | msgstr "Íåò äèñïëåÿ: îòïðàâêà âûðàæåíèÿ íå óäàëàñü.\n" |
3425 | 3434 | |
3426 | -#: main.c:2961 | |
3435 | +#: main.c:2970 | |
3427 | 3436 | msgid ": Send expression failed.\n" |
3428 | 3437 | msgstr ": Îòïðàâêà âûðàæåíèÿ íå óäàëàñü.\n" |
3429 | 3438 |
@@ -3543,23 +3552,23 @@ | ||
3543 | 3552 | msgid "E293: block was not locked" |
3544 | 3553 | msgstr "E293: áëîê íå çàáëîêèðîâàí" |
3545 | 3554 | |
3546 | -#: memfile.c:1005 | |
3555 | +#: memfile.c:1010 | |
3547 | 3556 | msgid "E294: Seek error in swap file read" |
3548 | 3557 | msgstr "E294: Îøèáêà ïîèñêà ïðè ÷òåíèè ñâîï-ôàéëà" |
3549 | 3558 | |
3550 | -#: memfile.c:1010 | |
3559 | +#: memfile.c:1015 | |
3551 | 3560 | msgid "E295: Read error in swap file" |
3552 | 3561 | msgstr "E295: Îøèáêà ÷òåíèÿ ñâîï-ôàéëà" |
3553 | 3562 | |
3554 | -#: memfile.c:1062 | |
3563 | +#: memfile.c:1067 | |
3555 | 3564 | msgid "E296: Seek error in swap file write" |
3556 | 3565 | msgstr "E296: Îøèáêà ïîèñêà ïðè çàïèñè ñâîï-ôàéëà" |
3557 | 3566 | |
3558 | -#: memfile.c:1080 | |
3567 | +#: memfile.c:1085 | |
3559 | 3568 | msgid "E297: Write error in swap file" |
3560 | 3569 | msgstr "E297: Îøèáêà ïðè çàïèñè ñâîï-ôàéëà" |
3561 | 3570 | |
3562 | -#: memfile.c:1277 | |
3571 | +#: memfile.c:1282 | |
3563 | 3572 | msgid "E300: Swap file already exists (symlink attack?)" |
3564 | 3573 | msgstr "" |
3565 | 3574 | "E300: Ñâîï-ôàéë óæå ñóùåñòâóåò (àòàêà ñ èñïîëüçîâàíèåì ñèìâîëüíîé ññûëêè?)" |
@@ -3577,44 +3586,44 @@ | ||
3577 | 3586 | msgstr "E298: Íå ïîëó÷åí áëîê íîìåð 2?" |
3578 | 3587 | |
3579 | 3588 | #. could not (re)open the swap file, what can we do???? |
3580 | -#: memline.c:443 | |
3589 | +#: memline.c:444 | |
3581 | 3590 | msgid "E301: Oops, lost the swap file!!!" |
3582 | 3591 | msgstr "E301: Îé, ïîòåðÿëñÿ ñâîï-ôàéë!!!" |
3583 | 3592 | |
3584 | -#: memline.c:448 | |
3593 | +#: memline.c:449 | |
3585 | 3594 | msgid "E302: Could not rename swap file" |
3586 | 3595 | msgstr "E302: Íåâîçìîæíî ïåðåèìåíîâàòü ñâîï-ôàéë" |
3587 | 3596 | |
3588 | -#: memline.c:518 | |
3597 | +#: memline.c:519 | |
3589 | 3598 | #, c-format |
3590 | 3599 | msgid "E303: Unable to open swap file for \"%s\", recovery impossible" |
3591 | 3600 | msgstr "" |
3592 | 3601 | "E303: Íå óäàëîñü îòêðûòü ñâîï-ôàéë äëÿ \"%s\", âîññòàíîâëåíèå íåâîçìîæíî" |
3593 | 3602 | |
3594 | -#: memline.c:617 | |
3603 | +#: memline.c:618 | |
3595 | 3604 | msgid "E304: ml_timestamp: Didn't get block 0??" |
3596 | 3605 | msgstr "E304: ml_timestamp: Íå ïîëó÷åí áëîê 0??" |
3597 | 3606 | |
3598 | -#: memline.c:757 | |
3607 | +#: memline.c:758 | |
3599 | 3608 | #, c-format |
3600 | 3609 | msgid "E305: No swap file found for %s" |
3601 | 3610 | msgstr "E305: Ñâîï-ôàéë äëÿ %s íå íàéäåí" |
3602 | 3611 | |
3603 | -#: memline.c:767 | |
3612 | +#: memline.c:768 | |
3604 | 3613 | msgid "Enter number of swap file to use (0 to quit): " |
3605 | 3614 | msgstr "" |
3606 | 3615 | "Ââåäèòå íîìåð ñâîï-ôàéëà, êîòîðûé ñëåäóåò èñïîëüçîâàòü (0 äëÿ âûõîäà): " |
3607 | 3616 | |
3608 | -#: memline.c:812 | |
3617 | +#: memline.c:813 | |
3609 | 3618 | #, c-format |
3610 | 3619 | msgid "E306: Cannot open %s" |
3611 | 3620 | msgstr "E306: Íå ìîãó îòêðûòü %s" |
3612 | 3621 | |
3613 | -#: memline.c:834 | |
3622 | +#: memline.c:835 | |
3614 | 3623 | msgid "Unable to read block 0 from " |
3615 | 3624 | msgstr "Íåâîçìîæíî ïðî÷èòàòü áëîê 0 èç " |
3616 | 3625 | |
3617 | -#: memline.c:837 | |
3626 | +#: memline.c:838 | |
3618 | 3627 | msgid "" |
3619 | 3628 | "\n" |
3620 | 3629 | "Maybe no changes were made or Vim did not update the swap file." |
@@ -3622,28 +3631,28 @@ | ||
3622 | 3631 | "\n" |
3623 | 3632 | "Íåò èçìåíåíèé, èëè Vim íå ñìîã îáíîâèòü ñâîï-ôàéë" |
3624 | 3633 | |
3625 | -#: memline.c:847 memline.c:864 | |
3634 | +#: memline.c:848 memline.c:865 | |
3626 | 3635 | msgid " cannot be used with this version of Vim.\n" |
3627 | 3636 | msgstr " íåëüçÿ èñïîëüçîâàòü â äàííîé âåðñèè Vim.\n" |
3628 | 3637 | |
3629 | -#: memline.c:849 | |
3638 | +#: memline.c:850 | |
3630 | 3639 | msgid "Use Vim version 3.0.\n" |
3631 | 3640 | msgstr "Èñïîëüçóéòå Vim âåðñèè 3.0.\n" |
3632 | 3641 | |
3633 | -#: memline.c:855 | |
3642 | +#: memline.c:856 | |
3634 | 3643 | #, c-format |
3635 | 3644 | msgid "E307: %s does not look like a Vim swap file" |
3636 | 3645 | msgstr "E307: %s íå ÿâëÿåòñÿ ñâîï-ôàéëîì Vim" |
3637 | 3646 | |
3638 | -#: memline.c:868 | |
3647 | +#: memline.c:869 | |
3639 | 3648 | msgid " cannot be used on this computer.\n" |
3640 | 3649 | msgstr " íåëüçÿ èñïîëüçîâàòü íà ýòîì êîìïüþòåðå.\n" |
3641 | 3650 | |
3642 | -#: memline.c:870 | |
3651 | +#: memline.c:871 | |
3643 | 3652 | msgid "The file was created on " |
3644 | 3653 | msgstr "Ôàéë áûë ñîçäàí " |
3645 | 3654 | |
3646 | -#: memline.c:874 | |
3655 | +#: memline.c:875 | |
3647 | 3656 | msgid "" |
3648 | 3657 | ",\n" |
3649 | 3658 | "or the file has been damaged." |
@@ -3651,82 +3660,82 @@ | ||
3651 | 3660 | ",\n" |
3652 | 3661 | "ëèáî ôàéë áûë ïîâðåæä¸í." |
3653 | 3662 | |
3654 | -#: memline.c:903 | |
3663 | +#: memline.c:904 | |
3655 | 3664 | #, c-format |
3656 | 3665 | msgid "Using swap file \"%s\"" |
3657 | 3666 | msgstr "Èñïîëüçóåòñÿ ñâîï-ôàéë \"%s\"" |
3658 | 3667 | |
3659 | -#: memline.c:909 | |
3668 | +#: memline.c:910 | |
3660 | 3669 | #, c-format |
3661 | 3670 | msgid "Original file \"%s\"" |
3662 | 3671 | msgstr "Èñõîäíûé ôàéë \"%s\"" |
3663 | 3672 | |
3664 | -#: memline.c:922 | |
3673 | +#: memline.c:923 | |
3665 | 3674 | msgid "E308: Warning: Original file may have been changed" |
3666 | 3675 | msgstr "E308: Ïðåäóïðåæäåíèå: èñõîäíûé ôàéë ìîã áûòü èçìåí¸í" |
3667 | 3676 | |
3668 | -#: memline.c:975 | |
3677 | +#: memline.c:976 | |
3669 | 3678 | #, c-format |
3670 | 3679 | msgid "E309: Unable to read block 1 from %s" |
3671 | 3680 | msgstr "E309: Íåâîçìîæíî ïðî÷èòàòü áëîê 1 èç %s" |
3672 | 3681 | |
3673 | -#: memline.c:979 | |
3682 | +#: memline.c:980 | |
3674 | 3683 | msgid "???MANY LINES MISSING" |
3675 | 3684 | msgstr "???ÎÒÑÓÒÑÒÂÓÅÒ ÌÍÎÃÎ ÑÒÐÎÊ" |
3676 | 3685 | |
3677 | -#: memline.c:995 | |
3686 | +#: memline.c:996 | |
3678 | 3687 | msgid "???LINE COUNT WRONG" |
3679 | 3688 | msgstr "???ÍÅÏÐÀÂÈËÜÍÎÅ ÇÍÀ×ÅÍÈÅ Ñ×ÅÒ×ÈÊÀ ÑÒÐÎÊ" |
3680 | 3689 | |
3681 | -#: memline.c:1002 | |
3690 | +#: memline.c:1003 | |
3682 | 3691 | msgid "???EMPTY BLOCK" |
3683 | 3692 | msgstr "???ÏÓÑÒÎÉ ÁËÎÊ" |
3684 | 3693 | |
3685 | -#: memline.c:1028 | |
3694 | +#: memline.c:1029 | |
3686 | 3695 | msgid "???LINES MISSING" |
3687 | 3696 | msgstr "???ÎÒÑÓÒÑÒÂÓÞÒ ÑÒÐÎÊÈ" |
3688 | 3697 | |
3689 | -#: memline.c:1060 | |
3698 | +#: memline.c:1061 | |
3690 | 3699 | #, c-format |
3691 | 3700 | msgid "E310: Block 1 ID wrong (%s not a .swp file?)" |
3692 | 3701 | msgstr "E310: íåïðàâèëüíûé áëîê 1 ID (%s íå ÿâëÿåòñÿ ôàéëîì .swp?)" |
3693 | 3702 | |
3694 | -#: memline.c:1065 | |
3703 | +#: memline.c:1066 | |
3695 | 3704 | msgid "???BLOCK MISSING" |
3696 | 3705 | msgstr "???ÏÐÎÏÓÙÅÍ ÁËÎÊ" |
3697 | 3706 | |
3698 | -#: memline.c:1081 | |
3707 | +#: memline.c:1082 | |
3699 | 3708 | msgid "??? from here until ???END lines may be messed up" |
3700 | 3709 | msgstr "???ñòðîêè ìîãóò áûòü èñïîð÷åíû îòñþäà äî ???ÊÎÍÖÀ" |
3701 | 3710 | |
3702 | -#: memline.c:1097 | |
3711 | +#: memline.c:1098 | |
3703 | 3712 | msgid "??? from here until ???END lines may have been inserted/deleted" |
3704 | 3713 | msgstr "???ñòðîêè ìîãëè áûòü âñòàâëåíû èëè óäàëåíû îòñþäà äî ???ÊÎÍÖÀ" |
3705 | 3714 | |
3706 | -#: memline.c:1117 | |
3715 | +#: memline.c:1118 | |
3707 | 3716 | msgid "???END" |
3708 | 3717 | msgstr "???ÊÎÍÅÖ" |
3709 | 3718 | |
3710 | -#: memline.c:1143 | |
3719 | +#: memline.c:1144 | |
3711 | 3720 | msgid "E311: Recovery Interrupted" |
3712 | 3721 | msgstr "E311: Âîññòàíîâëåíèå ïðåðâàíî" |
3713 | 3722 | |
3714 | -#: memline.c:1148 | |
3723 | +#: memline.c:1149 | |
3715 | 3724 | msgid "" |
3716 | 3725 | "E312: Errors detected while recovering; look for lines starting with ???" |
3717 | 3726 | msgstr "" |
3718 | 3727 | "E312: Âî âðåìÿ âîññòàíîâëåíèÿ îáíàðóæåíû îøèáêè; ñì. ñòðîêè, íà÷èíàþùèåñÿ " |
3719 | 3728 | "ñ ???" |
3720 | 3729 | |
3721 | -#: memline.c:1150 | |
3730 | +#: memline.c:1151 | |
3722 | 3731 | msgid "See \":help E312\" for more information." |
3723 | 3732 | msgstr "Ñì. äîïîëíèòåëüíóþ èíôîðìàöèþ â ñïðàâî÷íèêå (\":help E312\")" |
3724 | 3733 | |
3725 | -#: memline.c:1155 | |
3734 | +#: memline.c:1156 | |
3726 | 3735 | msgid "Recovery completed. You should check if everything is OK." |
3727 | 3736 | msgstr "Âîññòàíîâëåíèå çàâåðøåíî. Ïðîâåðüòå, âñ¸ ëè â ïîðÿäêå." |
3728 | 3737 | |
3729 | -#: memline.c:1156 | |
3738 | +#: memline.c:1157 | |
3730 | 3739 | msgid "" |
3731 | 3740 | "\n" |
3732 | 3741 | "(You might want to write out this file under another name\n" |
@@ -3734,11 +3743,11 @@ | ||
3734 | 3743 | "\n" |
3735 | 3744 | "(Ìîæåòå çàïèñàòü ôàéë ïîä äðóãèì èìåíåì è ñðàâíèòü åãî ñ èñõîäíûì\n" |
3736 | 3745 | |
3737 | -#: memline.c:1157 | |
3746 | +#: memline.c:1158 | |
3738 | 3747 | msgid "and run diff with the original file to check for changes)\n" |
3739 | 3748 | msgstr "ôàéëîì ïðè ïîìîùè ïðîãðàììû diff).\n" |
3740 | 3749 | |
3741 | -#: memline.c:1158 | |
3750 | +#: memline.c:1159 | |
3742 | 3751 | msgid "" |
3743 | 3752 | "Delete the .swp file afterwards.\n" |
3744 | 3753 | "\n" |
@@ -3747,51 +3756,51 @@ | ||
3747 | 3756 | "\n" |
3748 | 3757 | |
3749 | 3758 | #. use msg() to start the scrolling properly |
3750 | -#: memline.c:1214 | |
3759 | +#: memline.c:1215 | |
3751 | 3760 | msgid "Swap files found:" |
3752 | 3761 | msgstr "Îáíàðóæåíû ñâîï-ôàéëû:" |
3753 | 3762 | |
3754 | -#: memline.c:1392 | |
3763 | +#: memline.c:1393 | |
3755 | 3764 | msgid " In current directory:\n" |
3756 | 3765 | msgstr " Â òåêóùåì êàòàëîãå:\n" |
3757 | 3766 | |
3758 | -#: memline.c:1394 | |
3767 | +#: memline.c:1395 | |
3759 | 3768 | msgid " Using specified name:\n" |
3760 | 3769 | msgstr " Ñ óêàçàííûì èìåíåì:\n" |
3761 | 3770 | |
3762 | -#: memline.c:1398 | |
3771 | +#: memline.c:1399 | |
3763 | 3772 | msgid " In directory " |
3764 | 3773 | msgstr " Â êàòàëîãå " |
3765 | 3774 | |
3766 | -#: memline.c:1416 | |
3775 | +#: memline.c:1417 | |
3767 | 3776 | msgid " -- none --\n" |
3768 | 3777 | msgstr " -- íåò --\n" |
3769 | 3778 | |
3770 | -#: memline.c:1488 | |
3779 | +#: memline.c:1489 | |
3771 | 3780 | msgid " owned by: " |
3772 | 3781 | msgstr " âëàäåëåö: " |
3773 | 3782 | |
3774 | -#: memline.c:1490 | |
3783 | +#: memline.c:1491 | |
3775 | 3784 | msgid " dated: " |
3776 | 3785 | msgstr " äàòà: " |
3777 | 3786 | |
3778 | -#: memline.c:1494 memline.c:3684 | |
3787 | +#: memline.c:1495 memline.c:3685 | |
3779 | 3788 | msgid " dated: " |
3780 | 3789 | msgstr " äàòà: " |
3781 | 3790 | |
3782 | -#: memline.c:1510 | |
3791 | +#: memline.c:1511 | |
3783 | 3792 | msgid " [from Vim version 3.0]" |
3784 | 3793 | msgstr " [îò Vim âåðñèè 3.0]" |
3785 | 3794 | |
3786 | -#: memline.c:1514 | |
3795 | +#: memline.c:1515 | |
3787 | 3796 | msgid " [does not look like a Vim swap file]" |
3788 | 3797 | msgstr " [íå ÿâëÿåòñÿ ñâîï-ôàéëîì Vim]" |
3789 | 3798 | |
3790 | -#: memline.c:1518 | |
3799 | +#: memline.c:1519 | |
3791 | 3800 | msgid " file name: " |
3792 | 3801 | msgstr " èìÿ ôàéëà: " |
3793 | 3802 | |
3794 | -#: memline.c:1524 | |
3803 | +#: memline.c:1525 | |
3795 | 3804 | msgid "" |
3796 | 3805 | "\n" |
3797 | 3806 | " modified: " |
@@ -3799,15 +3808,15 @@ | ||
3799 | 3808 | "\n" |
3800 | 3809 | " èçìåí¸í: " |
3801 | 3810 | |
3802 | -#: memline.c:1525 | |
3811 | +#: memline.c:1526 | |
3803 | 3812 | msgid "YES" |
3804 | 3813 | msgstr "ÄÀ" |
3805 | 3814 | |
3806 | -#: memline.c:1525 | |
3815 | +#: memline.c:1526 | |
3807 | 3816 | msgid "no" |
3808 | 3817 | msgstr "íåò" |
3809 | 3818 | |
3810 | -#: memline.c:1529 | |
3819 | +#: memline.c:1530 | |
3811 | 3820 | msgid "" |
3812 | 3821 | "\n" |
3813 | 3822 | " user name: " |
@@ -3815,11 +3824,11 @@ | ||
3815 | 3824 | "\n" |
3816 | 3825 | " ïîëüçîâàòåëü: " |
3817 | 3826 | |
3818 | -#: memline.c:1536 | |
3827 | +#: memline.c:1537 | |
3819 | 3828 | msgid " host name: " |
3820 | 3829 | msgstr " êîìïüþòåð: " |
3821 | 3830 | |
3822 | -#: memline.c:1538 | |
3831 | +#: memline.c:1539 | |
3823 | 3832 | msgid "" |
3824 | 3833 | "\n" |
3825 | 3834 | " host name: " |
@@ -3827,7 +3836,7 @@ | ||
3827 | 3836 | "\n" |
3828 | 3837 | " êîìïüþòåð: " |
3829 | 3838 | |
3830 | -#: memline.c:1544 | |
3839 | +#: memline.c:1545 | |
3831 | 3840 | msgid "" |
3832 | 3841 | "\n" |
3833 | 3842 | " process ID: " |
@@ -3835,11 +3844,11 @@ | ||
3835 | 3844 | "\n" |
3836 | 3845 | " ïðîöåññ: " |
3837 | 3846 | |
3838 | -#: memline.c:1550 | |
3847 | +#: memline.c:1551 | |
3839 | 3848 | msgid " (still running)" |
3840 | 3849 | msgstr " (åù¸ âûïîëíÿåòñÿ)" |
3841 | 3850 | |
3842 | -#: memline.c:1562 | |
3851 | +#: memline.c:1563 | |
3843 | 3852 | msgid "" |
3844 | 3853 | "\n" |
3845 | 3854 | " [not usable with this version of Vim]" |
@@ -3847,7 +3856,7 @@ | ||
3847 | 3856 | "\n" |
3848 | 3857 | " [íå ïðèãîäåí äëÿ èñïîëüçîâàíèÿ ñ äàííîé âåðñèåé Vim]" |
3849 | 3858 | |
3850 | -#: memline.c:1565 | |
3859 | +#: memline.c:1566 | |
3851 | 3860 | msgid "" |
3852 | 3861 | "\n" |
3853 | 3862 | " [not usable on this computer]" |
@@ -3855,92 +3864,92 @@ | ||
3855 | 3864 | "\n" |
3856 | 3865 | " [íå ïðèãîäåí äëÿ èñïîëüçîâàíèÿ íà ýòîì êîìïüþòåðå]" |
3857 | 3866 | |
3858 | -#: memline.c:1570 | |
3867 | +#: memline.c:1571 | |
3859 | 3868 | msgid " [cannot be read]" |
3860 | 3869 | msgstr " [íå ÷èòàåòñÿ]" |
3861 | 3870 | |
3862 | -#: memline.c:1574 | |
3871 | +#: memline.c:1575 | |
3863 | 3872 | msgid " [cannot be opened]" |
3864 | 3873 | msgstr " [íå îòêðûâàåòñÿ]" |
3865 | 3874 | |
3866 | -#: memline.c:1764 | |
3875 | +#: memline.c:1765 | |
3867 | 3876 | msgid "E313: Cannot preserve, there is no swap file" |
3868 | 3877 | msgstr "E313: Íåâîçìîæíî îáíîâèòü ñâîï-ôàéë, ïîñêîëüêó îí íå îáíàðóæåí" |
3869 | 3878 | |
3870 | -#: memline.c:1817 | |
3879 | +#: memline.c:1818 | |
3871 | 3880 | msgid "File preserved" |
3872 | 3881 | msgstr "Ñâîï-ôàéë îáíîâë¸í" |
3873 | 3882 | |
3874 | -#: memline.c:1819 | |
3883 | +#: memline.c:1820 | |
3875 | 3884 | msgid "E314: Preserve failed" |
3876 | 3885 | msgstr "E314: Íåóäà÷íàÿ ïîïûòêà îáíîâëåíèÿ ñâîï-ôàéëà" |
3877 | 3886 | |
3878 | -#: memline.c:1890 | |
3887 | +#: memline.c:1891 | |
3879 | 3888 | #, c-format |
3880 | 3889 | msgid "E315: ml_get: invalid lnum: %ld" |
3881 | 3890 | msgstr "E315: ml_get: íåïðàâèëüíîå çíà÷åíèå lnum: %ld" |
3882 | 3891 | |
3883 | -#: memline.c:1916 | |
3892 | +#: memline.c:1917 | |
3884 | 3893 | #, c-format |
3885 | 3894 | msgid "E316: ml_get: cannot find line %ld" |
3886 | 3895 | msgstr "E316: ml_get: íåâîçìîæíî íàéòè ñòðîêó %ld" |
3887 | 3896 | |
3888 | -#: memline.c:2306 | |
3897 | +#: memline.c:2307 | |
3889 | 3898 | msgid "E317: pointer block id wrong 3" |
3890 | 3899 | msgstr "íåïðàâèëüíîå çíà÷åíèå óêàçàòåëÿ áëîêà 3" |
3891 | 3900 | |
3892 | -#: memline.c:2386 | |
3901 | +#: memline.c:2387 | |
3893 | 3902 | msgid "stack_idx should be 0" |
3894 | 3903 | msgstr "çíà÷åíèå stack_idx äîëæíî áûòü ðàâíî 0" |
3895 | 3904 | |
3896 | -#: memline.c:2448 | |
3905 | +#: memline.c:2449 | |
3897 | 3906 | msgid "E318: Updated too many blocks?" |
3898 | 3907 | msgstr "E318: Îáíîâëåíî ñëèøêîì ìíîãî áëîêîâ?" |
3899 | 3908 | |
3900 | -#: memline.c:2630 | |
3909 | +#: memline.c:2631 | |
3901 | 3910 | msgid "E317: pointer block id wrong 4" |
3902 | 3911 | msgstr "E317: íåïðàâèëüíîå çíà÷åíèå óêàçàòåëÿ áëîêà 4" |
3903 | 3912 | |
3904 | -#: memline.c:2657 | |
3913 | +#: memline.c:2658 | |
3905 | 3914 | msgid "deleted block 1?" |
3906 | 3915 | msgstr "óäàë¸í áëîê 1?" |
3907 | 3916 | |
3908 | -#: memline.c:2857 | |
3917 | +#: memline.c:2858 | |
3909 | 3918 | #, c-format |
3910 | 3919 | msgid "E320: Cannot find line %ld" |
3911 | 3920 | msgstr "E320: Ñòðîêà %ld íå îáíàðóæåíà" |
3912 | 3921 | |
3913 | -#: memline.c:3100 | |
3922 | +#: memline.c:3101 | |
3914 | 3923 | msgid "E317: pointer block id wrong" |
3915 | 3924 | msgstr "E317: íåïðàâèëüíîå çíà÷åíèå óêàçàòåëÿ áëîêà" |
3916 | 3925 | |
3917 | -#: memline.c:3116 | |
3926 | +#: memline.c:3117 | |
3918 | 3927 | msgid "pe_line_count is zero" |
3919 | 3928 | msgstr "çíà÷åíèå pe_line_count ðàâíî íóëþ" |
3920 | 3929 | |
3921 | -#: memline.c:3145 | |
3930 | +#: memline.c:3146 | |
3922 | 3931 | #, c-format |
3923 | 3932 | msgid "E322: line number out of range: %ld past the end" |
3924 | 3933 | msgstr "E322: íîìåð ñòðîêè çà ïðåäåëàìè äèàïàçîíà: %ld" |
3925 | 3934 | |
3926 | -#: memline.c:3149 | |
3935 | +#: memline.c:3150 | |
3927 | 3936 | #, c-format |
3928 | 3937 | msgid "E323: line count wrong in block %ld" |
3929 | 3938 | msgstr "E323: íåïðàâèëüíîå çíà÷åíèå ñ÷¸ò÷èêà ñòðîê â áëîêå %ld" |
3930 | 3939 | |
3931 | -#: memline.c:3198 | |
3940 | +#: memline.c:3199 | |
3932 | 3941 | msgid "Stack size increases" |
3933 | 3942 | msgstr "Ðàçìåð ñòåêà óâåëè÷åí" |
3934 | 3943 | |
3935 | -#: memline.c:3244 | |
3944 | +#: memline.c:3245 | |
3936 | 3945 | msgid "E317: pointer block id wrong 2" |
3937 | 3946 | msgstr "E317: íåïðàâèëüíîå çíà÷åíèå óêàçàòåëÿ áëîêà 2" |
3938 | 3947 | |
3939 | -#: memline.c:3674 | |
3948 | +#: memline.c:3675 | |
3940 | 3949 | msgid "E325: ATTENTION" |
3941 | 3950 | msgstr "E325: ÂÍÈÌÀÍÈÅ" |
3942 | 3951 | |
3943 | -#: memline.c:3675 | |
3952 | +#: memline.c:3676 | |
3944 | 3953 | msgid "" |
3945 | 3954 | "\n" |
3946 | 3955 | "Found a swap file by the name \"" |
@@ -3948,17 +3957,17 @@ | ||
3948 | 3957 | "\n" |
3949 | 3958 | "Îáíàðóæåí ñâîï-ôàéë ñ èìåíåì \"" |
3950 | 3959 | |
3951 | -#: memline.c:3679 | |
3960 | +#: memline.c:3680 | |
3952 | 3961 | msgid "While opening file \"" |
3953 | 3962 | msgstr "Ïðè îòêðûòèè ôàéëà: \"" |
3954 | 3963 | |
3955 | -#: memline.c:3688 | |
3964 | +#: memline.c:3689 | |
3956 | 3965 | msgid " NEWER than swap file!\n" |
3957 | 3966 | msgstr " Áîëåå ÑÂÅÆÈÉ, ÷åì ñâîï-ôàéë!\n" |
3958 | 3967 | |
3959 | 3968 | #. Some of these messages are long to allow translation to |
3960 | 3969 | #. * other languages. |
3961 | -#: memline.c:3692 | |
3970 | +#: memline.c:3693 | |
3962 | 3971 | msgid "" |
3963 | 3972 | "\n" |
3964 | 3973 | "(1) Another program may be editing the same file.\n" |
@@ -3970,11 +3979,11 @@ | ||
3970 | 3979 | " Åñëè ýòî òàê, òî áóäüòå âíèìàòåëüíû ïðè âíåñåíèè èçìåíåíèé,\n" |
3971 | 3980 | " ÷òîáû ó âàñ íå ïîÿâèëîñü äâà ðàçíûõ âàðèàíòà îäíîãî è òîãî æå ôàéëà.\n" |
3972 | 3981 | |
3973 | -#: memline.c:3693 | |
3982 | +#: memline.c:3694 | |
3974 | 3983 | msgid " Quit, or continue with caution.\n" |
3975 | 3984 | msgstr " Çàâåðøèòå ðàáîòó èëè ïðîäîëæàéòå ñ îñòîðîæíîñòüþ.\n" |
3976 | 3985 | |
3977 | -#: memline.c:3694 | |
3986 | +#: memline.c:3695 | |
3978 | 3987 | msgid "" |
3979 | 3988 | "\n" |
3980 | 3989 | "(2) An edit session for this file crashed.\n" |
@@ -3982,11 +3991,11 @@ | ||
3982 | 3991 | "\n" |
3983 | 3992 | "(2) Ïðåäûäóùèé ñåàíñ ðåäàêòèðîâàíèÿ ýòîãî ôàéëà çàâåðø¸í àâàðèéíî.\n" |
3984 | 3993 | |
3985 | -#: memline.c:3695 | |
3994 | +#: memline.c:3696 | |
3986 | 3995 | msgid " If this is the case, use \":recover\" or \"vim -r " |
3987 | 3996 | msgstr "  ýòîì ñëó÷àå, èñïîëüçóéòå êîìàíäó \":recover\" èëè \"vim -r " |
3988 | 3997 | |
3989 | -#: memline.c:3697 | |
3998 | +#: memline.c:3698 | |
3990 | 3999 | msgid "" |
3991 | 4000 | "\"\n" |
3992 | 4001 | " to recover the changes (see \":help recovery\").\n" |
@@ -3994,11 +4003,11 @@ | ||
3994 | 4003 | "\"\n" |
3995 | 4004 | " äëÿ âîññòàíîâëåíèÿ èçìåíåíèé (ñì. \":help âîññòàíîâëåíèå\").\n" |
3996 | 4005 | |
3997 | -#: memline.c:3698 | |
4006 | +#: memline.c:3699 | |
3998 | 4007 | msgid " If you did this already, delete the swap file \"" |
3999 | 4008 | msgstr " Åñëè âû óæå âûïîëíÿëè ýòó îïåðàöèþ, óäàëèòå ñâîï-ôàéë \"" |
4000 | 4009 | |
4001 | -#: memline.c:3700 | |
4010 | +#: memline.c:3701 | |
4002 | 4011 | msgid "" |
4003 | 4012 | "\"\n" |
4004 | 4013 | " to avoid this message.\n" |
@@ -4006,23 +4015,23 @@ | ||
4006 | 4015 | "\"\n" |
4007 | 4016 | " ÷òîáû èçáåæàòü ïîÿâëåíèÿ ýòîãî ñîîáùåíèÿ â áóäóùåì.\n" |
4008 | 4017 | |
4009 | -#: memline.c:3714 memline.c:3718 | |
4018 | +#: memline.c:3715 memline.c:3719 | |
4010 | 4019 | msgid "Swap file \"" |
4011 | 4020 | msgstr "Ñâîï-ôàéë \"" |
4012 | 4021 | |
4013 | -#: memline.c:3715 memline.c:3721 | |
4022 | +#: memline.c:3716 memline.c:3722 | |
4014 | 4023 | msgid "\" already exists!" |
4015 | 4024 | msgstr "\" óæå ñóùåñòâóåò!" |
4016 | 4025 | |
4017 | -#: memline.c:3724 | |
4026 | +#: memline.c:3725 | |
4018 | 4027 | msgid "VIM - ATTENTION" |
4019 | 4028 | msgstr "VIM - ÂÍÈÌÀÍÈÅ" |
4020 | 4029 | |
4021 | -#: memline.c:3726 | |
4030 | +#: memline.c:3727 | |
4022 | 4031 | msgid "Swap file already exists!" |
4023 | 4032 | msgstr "Ñâîï-ôàéë óæå ñóùåñòâóåò!" |
4024 | 4033 | |
4025 | -#: memline.c:3730 | |
4034 | +#: memline.c:3731 | |
4026 | 4035 | msgid "" |
4027 | 4036 | "&Open Read-Only\n" |
4028 | 4037 | "&Edit anyway\n" |
@@ -4036,7 +4045,7 @@ | ||
4036 | 4045 | "&Q Âûõîä\n" |
4037 | 4046 | "&A Ïðåðâàòü" |
4038 | 4047 | |
4039 | -#: memline.c:3732 | |
4048 | +#: memline.c:3733 | |
4040 | 4049 | msgid "" |
4041 | 4050 | "&Open Read-Only\n" |
4042 | 4051 | "&Edit anyway\n" |
@@ -4052,7 +4061,7 @@ | ||
4052 | 4061 | "&A Ïðåðâàòü\n" |
4053 | 4062 | "&D Óäàëèòü" |
4054 | 4063 | |
4055 | -#: memline.c:3789 | |
4064 | +#: memline.c:3790 | |
4056 | 4065 | msgid "E326: Too many swap files found" |
4057 | 4066 | msgstr "E326: Îáíàðóæåíî ñëèøêîì ìíîãî ñâîï-ôàéëîâ" |
4058 | 4067 |
@@ -4160,11 +4169,11 @@ | ||
4160 | 4169 | msgid " (RET: line, SPACE: page, d: half page, q: quit)" |
4161 | 4170 | msgstr " (RET: ñòðîêà, SPACE: ñòðàíèöà, d: ïîëñòðàíèöû, q: âûõîä)" |
4162 | 4171 | |
4163 | -#: message.c:2976 message.c:2991 | |
4172 | +#: message.c:2982 message.c:2997 | |
4164 | 4173 | msgid "Question" |
4165 | 4174 | msgstr "Âîïðîñ" |
4166 | 4175 | |
4167 | -#: message.c:2978 | |
4176 | +#: message.c:2984 | |
4168 | 4177 | msgid "" |
4169 | 4178 | "&Yes\n" |
4170 | 4179 | "&No" |
@@ -4172,7 +4181,7 @@ | ||
4172 | 4181 | "&Äà\n" |
4173 | 4182 | "&Íåò" |
4174 | 4183 | |
4175 | -#: message.c:3011 | |
4184 | +#: message.c:3017 | |
4176 | 4185 | msgid "" |
4177 | 4186 | "&Yes\n" |
4178 | 4187 | "&No\n" |
@@ -4186,16 +4195,16 @@ | ||
4186 | 4195 | "&Ïîòåðÿòü âñå\n" |
4187 | 4196 | "Î&òìåíà" |
4188 | 4197 | |
4189 | -#: message.c:3052 | |
4198 | +#: message.c:3058 | |
4190 | 4199 | msgid "Save File dialog" |
4191 | 4200 | msgstr "Ñîõðàíåíèå ôàéëà" |
4192 | 4201 | |
4193 | -#: message.c:3054 | |
4202 | +#: message.c:3060 | |
4194 | 4203 | msgid "Open File dialog" |
4195 | 4204 | msgstr "Îòêðûòèå ôàéëà" |
4196 | 4205 | |
4197 | 4206 | #. TODO: non-GUI file selector here |
4198 | -#: message.c:3125 | |
4207 | +#: message.c:3131 | |
4199 | 4208 | msgid "E338: Sorry, no file browser in console mode" |
4200 | 4209 | msgstr "" |
4201 | 4210 | "E338: Èçâèíèòå, íî â êîíñîëüíîì ðåæèìå íåò ïðîâîäíèêà ïî ôàéëîâîé ñèñòåìå" |
@@ -4374,36 +4383,36 @@ | ||
4374 | 4383 | msgid "E658: NetBeans connection lost for buffer %ld" |
4375 | 4384 | msgstr "E658: Ïîòåðÿíî ñîåäèíåíèå ñ NetBeans äëÿ áóôåðà %ld" |
4376 | 4385 | |
4377 | -#: normal.c:2980 | |
4386 | +#: normal.c:2983 | |
4378 | 4387 | msgid "Warning: terminal cannot highlight" |
4379 | 4388 | msgstr "Ïðåäóïðåæäåíèå: òåðìèíàë íå ìîæåò âûïîëíÿòü ïîäñâåòêó" |
4380 | 4389 | |
4381 | -#: normal.c:3276 | |
4390 | +#: normal.c:3279 | |
4382 | 4391 | msgid "E348: No string under cursor" |
4383 | 4392 | msgstr "E348: Íåò ñòðîêè â ïîçèöèè êóðñîðà" |
4384 | 4393 | |
4385 | -#: normal.c:3278 | |
4394 | +#: normal.c:3281 | |
4386 | 4395 | msgid "E349: No identifier under cursor" |
4387 | 4396 | msgstr "E349: Íåò èìåíè â ïîçèöèè êóðñîðà" |
4388 | 4397 | |
4389 | -#: normal.c:4519 | |
4398 | +#: normal.c:4522 | |
4390 | 4399 | msgid "E352: Cannot erase folds with current 'foldmethod'" |
4391 | 4400 | msgstr "" |
4392 | 4401 | "E352: Íåâîçìîæíî ñòåðåòü ñêëàäêè ñ òåêóùèì çíà÷åíèåì îïöèè 'foldmethod'" |
4393 | 4402 | |
4394 | -#: normal.c:6740 | |
4403 | +#: normal.c:6743 | |
4395 | 4404 | msgid "E664: changelist is empty" |
4396 | 4405 | msgstr "E664: ñïèñîê èçìåíåíèé ïóñòîé" |
4397 | 4406 | |
4398 | -#: normal.c:6742 | |
4407 | +#: normal.c:6745 | |
4399 | 4408 | msgid "E662: At start of changelist" |
4400 | 4409 | msgstr "E662:  íà÷àëå ñïèñêà èçìåíåíèé" |
4401 | 4410 | |
4402 | -#: normal.c:6744 | |
4411 | +#: normal.c:6747 | |
4403 | 4412 | msgid "E663: At end of changelist" |
4404 | 4413 | msgstr "E662: Â êîíöå ñïèñêà èçìåíåíèé" |
4405 | 4414 | |
4406 | -#: normal.c:8005 | |
4415 | +#: normal.c:8009 | |
4407 | 4416 | msgid "Type :quit<Enter> to exit Vim" |
4408 | 4417 | msgstr "Ââåäèòå :quit<Enter> äëÿ âûõîäà èç Vim" |
4409 | 4418 |
@@ -4442,40 +4451,40 @@ | ||
4442 | 4451 | msgstr "Èçìåíåíû îòñòóïû â ñòðîêàõ (%ld) " |
4443 | 4452 | |
4444 | 4453 | #. must display the prompt |
4445 | -#: ops.c:1675 | |
4454 | +#: ops.c:1688 | |
4446 | 4455 | msgid "cannot yank; delete anyway" |
4447 | 4456 | msgstr "ñêîïèðîâàòü íå óäàëîñü, óäàëåíèå âûïîëíåíî" |
4448 | 4457 | |
4449 | -#: ops.c:2261 | |
4458 | +#: ops.c:2274 | |
4450 | 4459 | msgid "1 line changed" |
4451 | 4460 | msgstr "èçìåíåíà 1 ñòðîêà" |
4452 | 4461 | |
4453 | -#: ops.c:2263 | |
4462 | +#: ops.c:2276 | |
4454 | 4463 | #, c-format |
4455 | 4464 | msgid "%ld lines changed" |
4456 | 4465 | msgstr "èçìåíåíî ñòðîê: %ld" |
4457 | 4466 | |
4458 | -#: ops.c:2647 | |
4467 | +#: ops.c:2660 | |
4459 | 4468 | #, c-format |
4460 | 4469 | msgid "freeing %ld lines" |
4461 | 4470 | msgstr "î÷èùåíî ñòðîê: %ld" |
4462 | 4471 | |
4463 | -#: ops.c:2928 | |
4472 | +#: ops.c:2941 | |
4464 | 4473 | msgid "1 line yanked" |
4465 | 4474 | msgstr "ñêîïèðîâàíà îäíà ñòðîêà" |
4466 | 4475 | |
4467 | -#: ops.c:2930 | |
4476 | +#: ops.c:2943 | |
4468 | 4477 | #, c-format |
4469 | 4478 | msgid "%ld lines yanked" |
4470 | 4479 | msgstr "ñêîïèðîâàíî ñòðîê: %ld" |
4471 | 4480 | |
4472 | -#: ops.c:3215 | |
4481 | +#: ops.c:3228 | |
4473 | 4482 | #, c-format |
4474 | 4483 | msgid "E353: Nothing in register %s" |
4475 | 4484 | msgstr "E353:  ðåãèñòðå %s íè÷åãî íåò" |
4476 | 4485 | |
4477 | 4486 | #. Highlight title |
4478 | -#: ops.c:3766 | |
4487 | +#: ops.c:3779 | |
4479 | 4488 | msgid "" |
4480 | 4489 | "\n" |
4481 | 4490 | "--- Registers ---" |
@@ -4483,11 +4492,11 @@ | ||
4483 | 4492 | "\n" |
4484 | 4493 | "--- Ðåãèñòðû ---" |
4485 | 4494 | |
4486 | -#: ops.c:5075 | |
4495 | +#: ops.c:5088 | |
4487 | 4496 | msgid "Illegal register name" |
4488 | 4497 | msgstr "Íåäîïóñòèìîå èìÿ ðåãèñòðà" |
4489 | 4498 | |
4490 | -#: ops.c:5163 | |
4499 | +#: ops.c:5176 | |
4491 | 4500 | #, c-format |
4492 | 4501 | msgid "" |
4493 | 4502 | "\n" |
@@ -4496,32 +4505,32 @@ | ||
4496 | 4505 | "\n" |
4497 | 4506 | "# Ðåãèñòðû:\n" |
4498 | 4507 | |
4499 | -#: ops.c:5213 | |
4508 | +#: ops.c:5226 | |
4500 | 4509 | #, c-format |
4501 | 4510 | msgid "E574: Unknown register type %d" |
4502 | 4511 | msgstr "E574: Íåèçâåñòíûé òèï ðåãèñòðà %d" |
4503 | 4512 | |
4504 | -#: ops.c:5698 | |
4513 | +#: ops.c:5711 | |
4505 | 4514 | #, c-format |
4506 | 4515 | msgid "E354: Invalid register name: '%s'" |
4507 | 4516 | msgstr "E354: Íåäîïóñòèìîå èìÿ ðåãèñòðà: '%s'" |
4508 | 4517 | |
4509 | -#: ops.c:6058 | |
4518 | +#: ops.c:6071 | |
4510 | 4519 | #, c-format |
4511 | 4520 | msgid "%ld Cols; " |
4512 | 4521 | msgstr "Êîëîíîê: %ld; " |
4513 | 4522 | |
4514 | -#: ops.c:6065 | |
4523 | +#: ops.c:6078 | |
4515 | 4524 | #, c-format |
4516 | 4525 | msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes" |
4517 | 4526 | msgstr "Âûäåëåíî %s%ld èç %ld ñòðîê; %ld èç %ld ñëîâ; %ld èç %ld áàéò" |
4518 | 4527 | |
4519 | -#: ops.c:6081 | |
4528 | +#: ops.c:6094 | |
4520 | 4529 | #, c-format |
4521 | 4530 | msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld" |
4522 | 4531 | msgstr "Êîë. %s èç %s; ñòð. %ld èç %ld; ñëîâî %ld èç %ld; áàéò %ld èç %ld" |
4523 | 4532 | |
4524 | -#: ops.c:6092 | |
4533 | +#: ops.c:6105 | |
4525 | 4534 | #, c-format |
4526 | 4535 | msgid "(+%ld for BOM)" |
4527 | 4536 | msgstr "(+%ld ñ ó÷¸òîì BOM)" |
@@ -4648,47 +4657,47 @@ | ||
4648 | 4657 | "E537: Çíà÷åíèå îïöèÿ 'commentstring' äîëæíî áûòü ïóñòîé ñòðîêîé èëè " |
4649 | 4658 | "ñîäåðæàòü %s" |
4650 | 4659 | |
4651 | -#: option.c:5679 | |
4660 | +#: option.c:5682 | |
4652 | 4661 | msgid "E538: No mouse support" |
4653 | 4662 | msgstr "E538: Ìûøü íå ïîääåðæèâàåòñÿ" |
4654 | 4663 | |
4655 | -#: option.c:5947 | |
4664 | +#: option.c:5950 | |
4656 | 4665 | msgid "E540: Unclosed expression sequence" |
4657 | 4666 | msgstr "E540: Íåçàêðûòàÿ ïîñëåäîâàòåëüíîñòü âûðàæåíèÿ" |
4658 | 4667 | |
4659 | -#: option.c:5951 | |
4668 | +#: option.c:5954 | |
4660 | 4669 | msgid "E541: too many items" |
4661 | 4670 | msgstr "E541: ñëèøêîì ìíîãî ýëåìåíòîâ" |
4662 | 4671 | |
4663 | -#: option.c:5953 | |
4672 | +#: option.c:5956 | |
4664 | 4673 | msgid "E542: unbalanced groups" |
4665 | 4674 | msgstr "E542: íåñáàëàíñèðîâàííûå ãðóïïû" |
4666 | 4675 | |
4667 | -#: option.c:6193 | |
4676 | +#: option.c:6196 | |
4668 | 4677 | msgid "E590: A preview window already exists" |
4669 | 4678 | msgstr "E590: Îêíî ïðåäïðîñìîòðà óæå åñòü" |
4670 | 4679 | |
4671 | -#: option.c:6450 | |
4680 | +#: option.c:6453 | |
4672 | 4681 | msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'" |
4673 | 4682 | msgstr "" |
4674 | 4683 | "W17: Àðàáñêèé òðåáóåò èñïîëüçîâàíèÿ UTF-8, ââåäèòå ':set encoding=utf-8'" |
4675 | 4684 | |
4676 | -#: option.c:6783 | |
4685 | +#: option.c:6786 | |
4677 | 4686 | #, c-format |
4678 | 4687 | msgid "E593: Need at least %d lines" |
4679 | 4688 | msgstr "E593: Íóæíî õîòÿ áû %d ñòðîê" |
4680 | 4689 | |
4681 | -#: option.c:6793 | |
4690 | +#: option.c:6796 | |
4682 | 4691 | #, c-format |
4683 | 4692 | msgid "E594: Need at least %d columns" |
4684 | 4693 | msgstr "E594: Íóæíî õîòÿ áû %d êîëîíîê" |
4685 | 4694 | |
4686 | -#: option.c:7100 | |
4695 | +#: option.c:7103 | |
4687 | 4696 | #, c-format |
4688 | 4697 | msgid "E355: Unknown option: %s" |
4689 | 4698 | msgstr "E355: Íåèçâåñòíàÿ îïöèÿ: %s" |
4690 | 4699 | |
4691 | -#: option.c:7220 | |
4700 | +#: option.c:7223 | |
4692 | 4701 | msgid "" |
4693 | 4702 | "\n" |
4694 | 4703 | "--- Terminal codes ---" |
@@ -4696,7 +4705,7 @@ | ||
4696 | 4705 | "\n" |
4697 | 4706 | "--- Òåðìèíàëüíûå êîäû ---" |
4698 | 4707 | |
4699 | -#: option.c:7222 | |
4708 | +#: option.c:7225 | |
4700 | 4709 | msgid "" |
4701 | 4710 | "\n" |
4702 | 4711 | "--- Global option values ---" |
@@ -4704,7 +4713,7 @@ | ||
4704 | 4713 | "\n" |
4705 | 4714 | "--- Ãëîáàëüíûå çíà÷åíèÿ îïöèé ---" |
4706 | 4715 | |
4707 | -#: option.c:7224 | |
4716 | +#: option.c:7227 | |
4708 | 4717 | msgid "" |
4709 | 4718 | "\n" |
4710 | 4719 | "--- Local option values ---" |
@@ -4712,7 +4721,7 @@ | ||
4712 | 4721 | "\n" |
4713 | 4722 | "--- Ìåñòíûå çíà÷åíèÿ îïöèé ---" |
4714 | 4723 | |
4715 | -#: option.c:7226 | |
4724 | +#: option.c:7229 | |
4716 | 4725 | msgid "" |
4717 | 4726 | "\n" |
4718 | 4727 | "--- Options ---" |
@@ -4720,16 +4729,16 @@ | ||
4720 | 4729 | "\n" |
4721 | 4730 | "--- Îïöèè ---" |
4722 | 4731 | |
4723 | -#: option.c:7932 | |
4732 | +#: option.c:7935 | |
4724 | 4733 | msgid "E356: get_varp ERROR" |
4725 | 4734 | msgstr "E356: ÎØÈÁÊÀ get_varp" |
4726 | 4735 | |
4727 | -#: option.c:8903 | |
4736 | +#: option.c:8906 | |
4728 | 4737 | #, c-format |
4729 | 4738 | msgid "E357: 'langmap': Matching character missing for %s" |
4730 | 4739 | msgstr "E357: 'langmap': Íåò ñîîòâåòñòâóþùåãî ñèìâîëà äëÿ %s" |
4731 | 4740 | |
4732 | -#: option.c:8937 | |
4741 | +#: option.c:8940 | |
4733 | 4742 | #, c-format |
4734 | 4743 | msgid "E358: 'langmap': Extra characters after semicolon: %s" |
4735 | 4744 | msgstr "E358: 'langmap': Ëèøíèå ñèìâîëû ïîñëå òî÷êè ñ çàïÿòîé: %s" |
@@ -4764,81 +4773,81 @@ | ||
4764 | 4773 | msgid "Vim exiting with %d\n" |
4765 | 4774 | msgstr "Ïðåêðàùåíèå ðàáîòû Vim ñ êîäîì %d\n" |
4766 | 4775 | |
4767 | -#: os_amiga.c:937 | |
4776 | +#: os_amiga.c:941 | |
4768 | 4777 | msgid "cannot change console mode ?!\n" |
4769 | 4778 | msgstr "íåâîçìîæíî ñìåíèòü ðåæèì êîíñîëè?!\n" |
4770 | 4779 | |
4771 | -#: os_amiga.c:1003 | |
4780 | +#: os_amiga.c:1012 | |
4772 | 4781 | msgid "mch_get_shellsize: not a console??\n" |
4773 | 4782 | msgstr "mch_get_shellsize: íå â êîíñîëè??\n" |
4774 | 4783 | |
4775 | 4784 | #. if Vim opened a window: Executing a shell may cause crashes |
4776 | -#: os_amiga.c:1152 | |
4785 | +#: os_amiga.c:1161 | |
4777 | 4786 | msgid "E360: Cannot execute shell with -f option" |
4778 | 4787 | msgstr "E360: Íåâîçìîæíî âûïîëíèòü îáîëî÷êó ñ àðãóìåíòîì -f" |
4779 | 4788 | |
4780 | -#: os_amiga.c:1193 os_amiga.c:1283 | |
4789 | +#: os_amiga.c:1202 os_amiga.c:1292 | |
4781 | 4790 | msgid "Cannot execute " |
4782 | 4791 | msgstr "Íåâîçìîæíî âûïîëíèòü " |
4783 | 4792 | |
4784 | -#: os_amiga.c:1196 os_amiga.c:1293 | |
4793 | +#: os_amiga.c:1205 os_amiga.c:1302 | |
4785 | 4794 | msgid "shell " |
4786 | 4795 | msgstr "îáîëî÷êà " |
4787 | 4796 | |
4788 | -#: os_amiga.c:1216 os_amiga.c:1318 | |
4797 | +#: os_amiga.c:1225 os_amiga.c:1327 | |
4789 | 4798 | msgid " returned\n" |
4790 | 4799 | msgstr " çàâåðøèëà ðàáîòó\n" |
4791 | 4800 | |
4792 | -#: os_amiga.c:1459 | |
4801 | +#: os_amiga.c:1468 | |
4793 | 4802 | msgid "ANCHOR_BUF_SIZE too small." |
4794 | 4803 | msgstr "ñëèøêîì ìàëàÿ âåëè÷èíà ANCHOR_BUF_SIZE." |
4795 | 4804 | |
4796 | -#: os_amiga.c:1463 | |
4805 | +#: os_amiga.c:1472 | |
4797 | 4806 | msgid "I/O ERROR" |
4798 | 4807 | msgstr "ÎØÈÁÊÀ ÂÂÎÄÀ/ÂÛÂÎÄÀ" |
4799 | 4808 | |
4800 | -#: os_mswin.c:539 | |
4809 | +#: os_mswin.c:548 | |
4801 | 4810 | msgid "...(truncated)" |
4802 | 4811 | msgstr "...(îáðåçàíî)" |
4803 | 4812 | |
4804 | -#: os_mswin.c:641 | |
4813 | +#: os_mswin.c:650 | |
4805 | 4814 | msgid "'columns' is not 80, cannot execute external commands" |
4806 | 4815 | msgstr "Çíà÷åíèå îïöèè 'columns' íå ðàâíî 80, âíåøíèå ïðîãðàììû íå âûïîëíÿþòñÿ" |
4807 | 4816 | |
4808 | -#: os_mswin.c:1973 | |
4817 | +#: os_mswin.c:1982 | |
4809 | 4818 | msgid "E237: Printer selection failed" |
4810 | 4819 | msgstr "E327: Íåóäà÷íîå çàâåðøåíèå âûáîðà ïðèíòåðà" |
4811 | 4820 | |
4812 | -#: os_mswin.c:2013 | |
4821 | +#: os_mswin.c:2022 | |
4813 | 4822 | #, c-format |
4814 | 4823 | msgid "to %s on %s" |
4815 | 4824 | msgstr "â %s íà %s" |
4816 | 4825 | |
4817 | -#: os_mswin.c:2028 | |
4826 | +#: os_mswin.c:2037 | |
4818 | 4827 | #, c-format |
4819 | 4828 | msgid "E613: Unknown printer font: %s" |
4820 | 4829 | msgstr "E613: Íåèçâåñòíûé øðèôò ïðèíòåðà: %s" |
4821 | 4830 | |
4822 | -#: os_mswin.c:2077 os_mswin.c:2087 | |
4831 | +#: os_mswin.c:2086 os_mswin.c:2096 | |
4823 | 4832 | #, c-format |
4824 | 4833 | msgid "E238: Print error: %s" |
4825 | 4834 | msgstr "E238: Îøèáêà ïå÷àòè: %s" |
4826 | 4835 | |
4827 | -#: os_mswin.c:2088 | |
4836 | +#: os_mswin.c:2097 | |
4828 | 4837 | msgid "Unknown" |
4829 | 4838 | msgstr "Íåèçâåñòíî" |
4830 | 4839 | |
4831 | -#: os_mswin.c:2115 | |
4840 | +#: os_mswin.c:2124 | |
4832 | 4841 | #, c-format |
4833 | 4842 | msgid "Printing '%s'" |
4834 | 4843 | msgstr "Ïå÷àòü '%s'" |
4835 | 4844 | |
4836 | -#: os_mswin.c:3204 | |
4845 | +#: os_mswin.c:3213 | |
4837 | 4846 | #, c-format |
4838 | 4847 | msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" |
4839 | 4848 | msgstr "E244: Íåäîïóñòèìîå èìÿ êîäèðîâêè \"%s\" â èìåíè øðèôòà \"%s\"" |
4840 | 4849 | |
4841 | -#: os_mswin.c:3212 | |
4850 | +#: os_mswin.c:3221 | |
4842 | 4851 | #, c-format |
4843 | 4852 | msgid "E245: Illegal char '%c' in font name \"%s\"" |
4844 | 4853 | msgstr "E245: Íåäîïóñòèìûé ñèìâîë '%c' â èìåíè øðèôòà \"%s\"" |
@@ -4874,15 +4883,15 @@ | ||
4874 | 4883 | "\n" |
4875 | 4884 | "Vim: Îøèáêà X\n" |
4876 | 4885 | |
4877 | -#: os_unix.c:1334 | |
4886 | +#: os_unix.c:1338 | |
4878 | 4887 | msgid "Testing the X display failed" |
4879 | 4888 | msgstr "Ïðîâåðêà äèñïëåÿ X çàâåðøåíà íåóäà÷íî" |
4880 | 4889 | |
4881 | -#: os_unix.c:1473 | |
4890 | +#: os_unix.c:1477 | |
4882 | 4891 | msgid "Opening the X display timed out" |
4883 | 4892 | msgstr "Îòêðûòèå äèñïëåÿ X íå âûïîëíåíî â îòâåä¸ííîå âðåìÿ" |
4884 | 4893 | |
4885 | -#: os_unix.c:3227 os_unix.c:3907 | |
4894 | +#: os_unix.c:3234 os_unix.c:3914 | |
4886 | 4895 | msgid "" |
4887 | 4896 | "\n" |
4888 | 4897 | "Cannot execute shell " |
@@ -4890,7 +4899,7 @@ | ||
4890 | 4899 | "\n" |
4891 | 4900 | "Íåâîçìîæíî çàïóñòèòü îáîëî÷êó " |
4892 | 4901 | |
4893 | -#: os_unix.c:3275 | |
4902 | +#: os_unix.c:3282 | |
4894 | 4903 | msgid "" |
4895 | 4904 | "\n" |
4896 | 4905 | "Cannot execute shell sh\n" |
@@ -4898,7 +4907,7 @@ | ||
4898 | 4907 | "\n" |
4899 | 4908 | "Íåâîçìîæíî çàïóñòèòü îáîëî÷êó sh\n" |
4900 | 4909 | |
4901 | -#: os_unix.c:3279 os_unix.c:3913 | |
4910 | +#: os_unix.c:3286 os_unix.c:3920 | |
4902 | 4911 | msgid "" |
4903 | 4912 | "\n" |
4904 | 4913 | "shell returned " |
@@ -4906,7 +4915,7 @@ | ||
4906 | 4915 | "\n" |
4907 | 4916 | "Îáîëî÷êà çàâåðøèëà ðàáîòó " |
4908 | 4917 | |
4909 | -#: os_unix.c:3414 | |
4918 | +#: os_unix.c:3421 | |
4910 | 4919 | msgid "" |
4911 | 4920 | "\n" |
4912 | 4921 | "Cannot create pipes\n" |
@@ -4914,7 +4923,7 @@ | ||
4914 | 4923 | "\n" |
4915 | 4924 | "Íåâîçìîæíî ñîçäàòü òðóáû\n" |
4916 | 4925 | |
4917 | -#: os_unix.c:3429 | |
4926 | +#: os_unix.c:3436 | |
4918 | 4927 | msgid "" |
4919 | 4928 | "\n" |
4920 | 4929 | "Cannot fork\n" |
@@ -4922,7 +4931,7 @@ | ||
4922 | 4931 | "\n" |
4923 | 4932 | "Íåâîçìîæíî âûïîëíèòü fork()\n" |
4924 | 4933 | |
4925 | -#: os_unix.c:3920 | |
4934 | +#: os_unix.c:3927 | |
4926 | 4935 | msgid "" |
4927 | 4936 | "\n" |
4928 | 4937 | "Command terminated\n" |
@@ -4930,27 +4939,27 @@ | ||
4930 | 4939 | "\n" |
4931 | 4940 | "Âûïîëíåíèå êîìàíäû ïðåðâàíî\n" |
4932 | 4941 | |
4933 | -#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975 | |
4942 | +#: os_unix.c:4191 os_unix.c:4316 os_unix.c:5982 | |
4934 | 4943 | msgid "XSMP lost ICE connection" |
4935 | 4944 | msgstr "XSMP óòåðÿíî ñîåäèíåíèå ICE" |
4936 | 4945 | |
4937 | -#: os_unix.c:5558 | |
4946 | +#: os_unix.c:5565 | |
4938 | 4947 | msgid "Opening the X display failed" |
4939 | 4948 | msgstr "Íåóäà÷íîå îòêðûòèå äèñïëåÿ X" |
4940 | 4949 | |
4941 | -#: os_unix.c:5880 | |
4950 | +#: os_unix.c:5887 | |
4942 | 4951 | msgid "XSMP handling save-yourself request" |
4943 | 4952 | msgstr "XSMP îáðàáàòûâàåò çàïðîñ ñàìîñîõðàíåíèÿ" |
4944 | 4953 | |
4945 | -#: os_unix.c:5999 | |
4954 | +#: os_unix.c:6006 | |
4946 | 4955 | msgid "XSMP opening connection" |
4947 | 4956 | msgstr "XSMP îòêðûâàåò ñîåäèíåíèå" |
4948 | 4957 | |
4949 | -#: os_unix.c:6018 | |
4958 | +#: os_unix.c:6025 | |
4950 | 4959 | msgid "XSMP ICE connection watch failed" |
4951 | 4960 | msgstr "XSMP ïîòåðÿíî ñëåæåíèå çà ñîåäèíåíèåì ICE" |
4952 | 4961 | |
4953 | -#: os_unix.c:6038 | |
4962 | +#: os_unix.c:6045 | |
4954 | 4963 | #, c-format |
4955 | 4964 | msgid "XSMP SmcOpenConnection failed: %s" |
4956 | 4965 | msgstr "XSMP íåóäà÷íî âûïîëíåíî SmcOpenConnection: %s" |
@@ -4975,33 +4984,33 @@ | ||
4975 | 4984 | msgid "Could not fix up function pointers to the DLL!" |
4976 | 4985 | msgstr "Íåâîçìîæíî èñïðàâèòü óêàçàòåëè ôóíêöèé äëÿ DLL!" |
4977 | 4986 | |
4978 | -#: os_win16.c:342 os_win32.c:3216 | |
4987 | +#: os_win16.c:342 os_win32.c:3248 | |
4979 | 4988 | #, c-format |
4980 | 4989 | msgid "shell returned %d" |
4981 | 4990 | msgstr "çàâåðøåíèå ðàáîòû îáîëî÷êè ñ êîäîì %d" |
4982 | 4991 | |
4983 | -#: os_win32.c:2674 | |
4992 | +#: os_win32.c:2706 | |
4984 | 4993 | #, c-format |
4985 | 4994 | msgid "Vim: Caught %s event\n" |
4986 | 4995 | msgstr "Vim: Ïåðåõâà÷åíî ñîáûòèå %s\n" |
4987 | 4996 | |
4988 | -#: os_win32.c:2676 | |
4997 | +#: os_win32.c:2708 | |
4989 | 4998 | msgid "close" |
4990 | 4999 | msgstr "çàêðûòèå" |
4991 | 5000 | |
4992 | -#: os_win32.c:2678 | |
5001 | +#: os_win32.c:2710 | |
4993 | 5002 | msgid "logoff" |
4994 | 5003 | msgstr "îòêëþ÷åíèå" |
4995 | 5004 | |
4996 | -#: os_win32.c:2679 | |
5005 | +#: os_win32.c:2711 | |
4997 | 5006 | msgid "shutdown" |
4998 | 5007 | msgstr "çàâåðøåíèå" |
4999 | 5008 | |
5000 | -#: os_win32.c:3169 | |
5009 | +#: os_win32.c:3201 | |
5001 | 5010 | msgid "E371: Command not found" |
5002 | 5011 | msgstr "E371: Êîìàíäà íå íàéäåíà" |
5003 | 5012 | |
5004 | -#: os_win32.c:3182 | |
5013 | +#: os_win32.c:3214 | |
5005 | 5014 | msgid "" |
5006 | 5015 | "VIMRUN.EXE not found in your $PATH.\n" |
5007 | 5016 | "External commands will not pause after completion.\n" |
@@ -5011,7 +5020,7 @@ | ||
5011 | 5020 | "Âíåøíèå êîìàíäû íå áóäóò îñòàíàâëèâàòüñÿ ïîñëå âûïîëíåíèÿ.\n" |
5012 | 5021 | "Äîïîëíèòåëüíàÿ èíôîðìàöèÿ â :help win32-vimrun" |
5013 | 5022 | |
5014 | -#: os_win32.c:3185 | |
5023 | +#: os_win32.c:3217 | |
5015 | 5024 | msgid "Vim Warning" |
5016 | 5025 | msgstr "Ïðåäóïðåæäåíèå Vim" |
5017 | 5026 |
@@ -5219,75 +5228,75 @@ | ||
5219 | 5228 | msgid "+--%3ld lines folded " |
5220 | 5229 | msgstr "+--%3ld ñòðîê â ñêëàäêå" |
5221 | 5230 | |
5222 | -#: screen.c:7996 | |
5231 | +#: screen.c:8000 | |
5223 | 5232 | msgid " VREPLACE" |
5224 | 5233 | msgstr " ÂÈÐÒÓÀËÜÍÀß ÇÀÌÅÍÀ" |
5225 | 5234 | |
5226 | -#: screen.c:8000 | |
5235 | +#: screen.c:8004 | |
5227 | 5236 | msgid " REPLACE" |
5228 | 5237 | msgstr " ÇÀÌÅÍÀ" |
5229 | 5238 | |
5230 | -#: screen.c:8005 | |
5239 | +#: screen.c:8009 | |
5231 | 5240 | msgid " REVERSE" |
5232 | 5241 | msgstr " ÎÁÐÀÒÍÀß" |
5233 | 5242 | |
5234 | -#: screen.c:8007 | |
5243 | +#: screen.c:8011 | |
5235 | 5244 | msgid " INSERT" |
5236 | 5245 | msgstr " ÂÑÒÀÂÊÀ" |
5237 | 5246 | |
5238 | -#: screen.c:8010 | |
5247 | +#: screen.c:8014 | |
5239 | 5248 | msgid " (insert)" |
5240 | 5249 | msgstr " (âñòàâêà)" |
5241 | 5250 | |
5242 | -#: screen.c:8012 | |
5251 | +#: screen.c:8016 | |
5243 | 5252 | msgid " (replace)" |
5244 | 5253 | msgstr " (çàìåíà)" |
5245 | 5254 | |
5246 | -#: screen.c:8014 | |
5255 | +#: screen.c:8018 | |
5247 | 5256 | msgid " (vreplace)" |
5248 | 5257 | msgstr " (âèðòóàëüíàÿ çàìåíà)" |
5249 | 5258 | |
5250 | -#: screen.c:8017 | |
5259 | +#: screen.c:8021 | |
5251 | 5260 | msgid " Hebrew" |
5252 | 5261 | msgstr " Èâðèò" |
5253 | 5262 | |
5254 | -#: screen.c:8028 | |
5263 | +#: screen.c:8032 | |
5255 | 5264 | msgid " Arabic" |
5256 | 5265 | msgstr " Àðàáñêèé" |
5257 | 5266 | |
5258 | -#: screen.c:8031 | |
5267 | +#: screen.c:8035 | |
5259 | 5268 | msgid " (lang)" |
5260 | 5269 | msgstr " (ÿçûê)" |
5261 | 5270 | |
5262 | -#: screen.c:8035 | |
5271 | +#: screen.c:8039 | |
5263 | 5272 | msgid " (paste)" |
5264 | 5273 | msgstr " (âêëåéêà)" |
5265 | 5274 | |
5266 | -#: screen.c:8048 | |
5275 | +#: screen.c:8052 | |
5267 | 5276 | msgid " VISUAL" |
5268 | 5277 | msgstr " ÂÈÇÓÀËÜÍÛÉ ÐÅÆÈÌ" |
5269 | 5278 | |
5270 | -#: screen.c:8049 | |
5279 | +#: screen.c:8053 | |
5271 | 5280 | msgid " VISUAL LINE" |
5272 | 5281 | msgstr " ÂÈÇÓÀËÜÍÀß ÑÒÐÎÊÀ" |
5273 | 5282 | |
5274 | -#: screen.c:8050 | |
5283 | +#: screen.c:8054 | |
5275 | 5284 | msgid " VISUAL BLOCK" |
5276 | 5285 | msgstr " ÂÈÇÓÀËÜÍÛÉ ÁËÎÊ" |
5277 | 5286 | |
5278 | -#: screen.c:8051 | |
5287 | +#: screen.c:8055 | |
5279 | 5288 | msgid " SELECT" |
5280 | 5289 | msgstr " ÂÛÄÅËÅÍÈÅ" |
5281 | 5290 | |
5282 | -#: screen.c:8052 | |
5291 | +#: screen.c:8056 | |
5283 | 5292 | msgid " SELECT LINE" |
5284 | 5293 | msgstr " ÂÛÄÅËÅÍÈÅ ÑÒÐÎÊÈ" |
5285 | 5294 | |
5286 | -#: screen.c:8053 | |
5295 | +#: screen.c:8057 | |
5287 | 5296 | msgid " SELECT BLOCK" |
5288 | 5297 | msgstr " ÂÛÄÅËÅÍÈÅ ÁËÎÊÀ" |
5289 | 5298 | |
5290 | -#: screen.c:8068 screen.c:8131 | |
5299 | +#: screen.c:8072 screen.c:8135 | |
5291 | 5300 | msgid "recording" |
5292 | 5301 | msgstr "çàïèñü" |
5293 | 5302 |
@@ -5318,53 +5327,53 @@ | ||
5318 | 5327 | msgid "E386: Expected '?' or '/' after ';'" |
5319 | 5328 | msgstr "E386: Ïîñëå ';' îæèäàåòñÿ ââîä '?' èëè '/'" |
5320 | 5329 | |
5321 | -#: search.c:3759 | |
5330 | +#: search.c:3768 | |
5322 | 5331 | msgid " (includes previously listed match)" |
5323 | 5332 | msgstr " (âêëþ÷àåò ðàííåå ïîêàçàííûå ñîîòâåòñòâèÿ)" |
5324 | 5333 | |
5325 | 5334 | #. cursor at status line |
5326 | -#: search.c:3779 | |
5335 | +#: search.c:3788 | |
5327 | 5336 | msgid "--- Included files " |
5328 | 5337 | msgstr "--- Âêëþ÷¸ííûå ôàéëû " |
5329 | 5338 | |
5330 | -#: search.c:3781 | |
5339 | +#: search.c:3790 | |
5331 | 5340 | msgid "not found " |
5332 | 5341 | msgstr "íå íàéäåíî " |
5333 | 5342 | |
5334 | -#: search.c:3782 | |
5343 | +#: search.c:3791 | |
5335 | 5344 | msgid "in path ---\n" |
5336 | 5345 | msgstr "ïî ïóòè ---\n" |
5337 | 5346 | |
5338 | -#: search.c:3839 | |
5347 | +#: search.c:3848 | |
5339 | 5348 | msgid " (Already listed)" |
5340 | 5349 | msgstr " (Óæå ïîêàçàíî)" |
5341 | 5350 | |
5342 | -#: search.c:3841 | |
5351 | +#: search.c:3850 | |
5343 | 5352 | msgid " NOT FOUND" |
5344 | 5353 | msgstr " ÍÅ ÍÀÉÄÅÍÎ" |
5345 | 5354 | |
5346 | -#: search.c:3893 | |
5355 | +#: search.c:3902 | |
5347 | 5356 | #, c-format |
5348 | 5357 | msgid "Scanning included file: %s" |
5349 | 5358 | msgstr "Ïðîñìîòð âêëþ÷¸ííûõ ôàéëîâ: %s" |
5350 | 5359 | |
5351 | -#: search.c:4111 | |
5360 | +#: search.c:4120 | |
5352 | 5361 | msgid "E387: Match is on current line" |
5353 | 5362 | msgstr "E387: Ñîîòâåòñòâèå â òåêóùåé ñòðîêå" |
5354 | 5363 | |
5355 | -#: search.c:4254 | |
5364 | +#: search.c:4263 | |
5356 | 5365 | msgid "All included files were found" |
5357 | 5366 | msgstr "Íàéäåíû âñå âêëþ÷¸ííûå ôàéëû" |
5358 | 5367 | |
5359 | -#: search.c:4256 | |
5368 | +#: search.c:4265 | |
5360 | 5369 | msgid "No included files" |
5361 | 5370 | msgstr "Âêëþ÷¸ííûõ ôàéëîâ íåò" |
5362 | 5371 | |
5363 | -#: search.c:4272 | |
5372 | +#: search.c:4281 | |
5364 | 5373 | msgid "E388: Couldn't find definition" |
5365 | 5374 | msgstr "E388: Îïðåäåëåíèå íå íàéäåíî" |
5366 | 5375 | |
5367 | -#: search.c:4274 | |
5376 | +#: search.c:4283 | |
5368 | 5377 | msgid "E389: Couldn't find pattern" |
5369 | 5378 | msgstr "E389: Øàáëîí íå íàéäåí" |
5370 | 5379 |
@@ -5789,7 +5798,7 @@ | ||
5789 | 5798 | msgstr "E440: ïîòåðÿíà ñòðîêà îòìåíû" |
5790 | 5799 | |
5791 | 5800 | #. Only MS VC 4.1 and earlier can do Win32s |
5792 | -#: version.c:721 | |
5801 | +#: version.c:707 | |
5793 | 5802 | msgid "" |
5794 | 5803 | "\n" |
5795 | 5804 | "MS-Windows 16/32 bit GUI version" |
@@ -5797,7 +5806,7 @@ | ||
5797 | 5806 | "\n" |
5798 | 5807 | "Âåðñèÿ ñ ãðàôè÷åñêèì èíòåðôåéñîì äëÿ MS-Windows 16/32 áèò" |
5799 | 5808 | |
5800 | -#: version.c:723 | |
5809 | +#: version.c:709 | |
5801 | 5810 | msgid "" |
5802 | 5811 | "\n" |
5803 | 5812 | "MS-Windows 32 bit GUI version" |
@@ -5805,15 +5814,15 @@ | ||
5805 | 5814 | "\n" |
5806 | 5815 | "Âåðñèÿ ñ ãðàôè÷åñêèì èíòåðôåéñîì äëÿ MS-Windows 32 áèò" |
5807 | 5816 | |
5808 | -#: version.c:726 | |
5817 | +#: version.c:712 | |
5809 | 5818 | msgid " in Win32s mode" |
5810 | 5819 | msgstr " â ðåæèìå Win32s" |
5811 | 5820 | |
5812 | -#: version.c:728 | |
5821 | +#: version.c:714 | |
5813 | 5822 | msgid " with OLE support" |
5814 | 5823 | msgstr " ñ ïîääåðæêîé OLE" |
5815 | 5824 | |
5816 | -#: version.c:731 | |
5825 | +#: version.c:717 | |
5817 | 5826 | msgid "" |
5818 | 5827 | "\n" |
5819 | 5828 | "MS-Windows 32 bit console version" |
@@ -5821,7 +5830,7 @@ | ||
5821 | 5830 | "\n" |
5822 | 5831 | "Êîíñîëüíàÿ âåðñèÿ äëÿ MS-Windows 32 áèò" |
5823 | 5832 | |
5824 | -#: version.c:735 | |
5833 | +#: version.c:721 | |
5825 | 5834 | msgid "" |
5826 | 5835 | "\n" |
5827 | 5836 | "MS-Windows 16 bit version" |
@@ -5829,7 +5838,7 @@ | ||
5829 | 5838 | "\n" |
5830 | 5839 | "Âåðñèÿ äëÿ MS-Windows 16 áèò" |
5831 | 5840 | |
5832 | -#: version.c:739 | |
5841 | +#: version.c:725 | |
5833 | 5842 | msgid "" |
5834 | 5843 | "\n" |
5835 | 5844 | "32 bit MS-DOS version" |
@@ -5837,7 +5846,7 @@ | ||
5837 | 5846 | "\n" |
5838 | 5847 | "Âåðñèÿ äëÿ MS-DOS 32 áèò" |
5839 | 5848 | |
5840 | -#: version.c:741 | |
5849 | +#: version.c:727 | |
5841 | 5850 | msgid "" |
5842 | 5851 | "\n" |
5843 | 5852 | "16 bit MS-DOS version" |
@@ -5845,7 +5854,7 @@ | ||
5845 | 5854 | "\n" |
5846 | 5855 | "Âåðñèÿ äëÿ MS-DOS 16 áèò" |
5847 | 5856 | |
5848 | -#: version.c:747 | |
5857 | +#: version.c:733 | |
5849 | 5858 | msgid "" |
5850 | 5859 | "\n" |
5851 | 5860 | "MacOS X (unix) version" |
@@ -5853,7 +5862,7 @@ | ||
5853 | 5862 | "\n" |
5854 | 5863 | "Âåðñèÿ äëÿ MacOS X (unix)" |
5855 | 5864 | |
5856 | -#: version.c:749 | |
5865 | +#: version.c:735 | |
5857 | 5866 | msgid "" |
5858 | 5867 | "\n" |
5859 | 5868 | "MacOS X version" |
@@ -5861,7 +5870,7 @@ | ||
5861 | 5870 | "\n" |
5862 | 5871 | "Âåðñèÿ äëÿ MacOS X" |
5863 | 5872 | |
5864 | -#: version.c:752 | |
5873 | +#: version.c:738 | |
5865 | 5874 | msgid "" |
5866 | 5875 | "\n" |
5867 | 5876 | "MacOS version" |
@@ -5869,7 +5878,7 @@ | ||
5869 | 5878 | "\n" |
5870 | 5879 | "Âåðñèÿ äëÿ MacOS" |
5871 | 5880 | |
5872 | -#: version.c:757 | |
5881 | +#: version.c:743 | |
5873 | 5882 | msgid "" |
5874 | 5883 | "\n" |
5875 | 5884 | "RISC OS version" |
@@ -5877,7 +5886,7 @@ | ||
5877 | 5886 | "\n" |
5878 | 5887 | "Âåðñèÿ äëÿ RISC OS" |
5879 | 5888 | |
5880 | -#: version.c:767 | |
5889 | +#: version.c:753 | |
5881 | 5890 | msgid "" |
5882 | 5891 | "\n" |
5883 | 5892 | "Included patches: " |
@@ -5885,11 +5894,11 @@ | ||
5885 | 5894 | "\n" |
5886 | 5895 | "Çàïëàòêè: " |
5887 | 5896 | |
5888 | -#: version.c:793 version.c:1161 | |
5897 | +#: version.c:779 version.c:1147 | |
5889 | 5898 | msgid "Modified by " |
5890 | 5899 | msgstr "Ñ èçìåíåíèÿìè, âíåñ¸ííûìè " |
5891 | 5900 | |
5892 | -#: version.c:800 | |
5901 | +#: version.c:786 | |
5893 | 5902 | msgid "" |
5894 | 5903 | "\n" |
5895 | 5904 | "Compiled " |
@@ -5897,11 +5906,11 @@ | ||
5897 | 5906 | "\n" |
5898 | 5907 | "Ñêîìïèëèðîâàí " |
5899 | 5908 | |
5900 | -#: version.c:803 | |
5909 | +#: version.c:789 | |
5901 | 5910 | msgid "by " |
5902 | 5911 | msgstr " " |
5903 | 5912 | |
5904 | -#: version.c:815 | |
5913 | +#: version.c:801 | |
5905 | 5914 | msgid "" |
5906 | 5915 | "\n" |
5907 | 5916 | "Huge version " |
@@ -5909,7 +5918,7 @@ | ||
5909 | 5918 | "\n" |
5910 | 5919 | "Îãðîìíàÿ âåðñèÿ " |
5911 | 5920 | |
5912 | -#: version.c:818 | |
5921 | +#: version.c:804 | |
5913 | 5922 | msgid "" |
5914 | 5923 | "\n" |
5915 | 5924 | "Big version " |
@@ -5917,7 +5926,7 @@ | ||
5917 | 5926 | "\n" |
5918 | 5927 | "Áîëüøàÿ âåðñèÿ " |
5919 | 5928 | |
5920 | -#: version.c:821 | |
5929 | +#: version.c:807 | |
5921 | 5930 | msgid "" |
5922 | 5931 | "\n" |
5923 | 5932 | "Normal version " |
@@ -5925,7 +5934,7 @@ | ||
5925 | 5934 | "\n" |
5926 | 5935 | "Îáû÷íàÿ âåðñèÿ " |
5927 | 5936 | |
5928 | -#: version.c:824 | |
5937 | +#: version.c:810 | |
5929 | 5938 | msgid "" |
5930 | 5939 | "\n" |
5931 | 5940 | "Small version " |
@@ -5933,7 +5942,7 @@ | ||
5933 | 5942 | "\n" |
5934 | 5943 | "Ìàëàÿ âåðñèÿ " |
5935 | 5944 | |
5936 | -#: version.c:826 | |
5945 | +#: version.c:812 | |
5937 | 5946 | msgid "" |
5938 | 5947 | "\n" |
5939 | 5948 | "Tiny version " |
@@ -5941,231 +5950,231 @@ | ||
5941 | 5950 | "\n" |
5942 | 5951 | "Âåðñèÿ \"Êðîõà\" " |
5943 | 5952 | |
5944 | -#: version.c:832 | |
5953 | +#: version.c:818 | |
5945 | 5954 | msgid "without GUI." |
5946 | 5955 | msgstr "áåç ãðàôè÷åñêîãî èíòåðôåéñà." |
5947 | 5956 | |
5948 | -#: version.c:837 | |
5957 | +#: version.c:823 | |
5949 | 5958 | msgid "with GTK2-GNOME GUI." |
5950 | 5959 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì GTK2-GNOME." |
5951 | 5960 | |
5952 | -#: version.c:839 | |
5961 | +#: version.c:825 | |
5953 | 5962 | msgid "with GTK-GNOME GUI." |
5954 | 5963 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì GTK-GNOME." |
5955 | 5964 | |
5956 | -#: version.c:843 | |
5965 | +#: version.c:829 | |
5957 | 5966 | msgid "with GTK2 GUI." |
5958 | 5967 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì GTK2." |
5959 | 5968 | |
5960 | -#: version.c:845 | |
5969 | +#: version.c:831 | |
5961 | 5970 | msgid "with GTK GUI." |
5962 | 5971 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì GTK." |
5963 | 5972 | |
5964 | -#: version.c:850 | |
5973 | +#: version.c:836 | |
5965 | 5974 | msgid "with X11-Motif GUI." |
5966 | 5975 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì X11-Motif." |
5967 | 5976 | |
5968 | -#: version.c:854 | |
5977 | +#: version.c:840 | |
5969 | 5978 | msgid "with X11-neXtaw GUI." |
5970 | 5979 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì X11-neXtaw." |
5971 | 5980 | |
5972 | -#: version.c:856 | |
5981 | +#: version.c:842 | |
5973 | 5982 | msgid "with X11-Athena GUI." |
5974 | 5983 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì X11-Athena." |
5975 | 5984 | |
5976 | -#: version.c:860 | |
5985 | +#: version.c:846 | |
5977 | 5986 | msgid "with BeOS GUI." |
5978 | 5987 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì BeOS." |
5979 | 5988 | |
5980 | -#: version.c:863 | |
5989 | +#: version.c:849 | |
5981 | 5990 | msgid "with Photon GUI." |
5982 | 5991 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì Photon." |
5983 | 5992 | |
5984 | -#: version.c:866 | |
5993 | +#: version.c:852 | |
5985 | 5994 | msgid "with GUI." |
5986 | 5995 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì." |
5987 | 5996 | |
5988 | -#: version.c:869 | |
5997 | +#: version.c:855 | |
5989 | 5998 | msgid "with Carbon GUI." |
5990 | 5999 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì Carbon." |
5991 | 6000 | |
5992 | -#: version.c:872 | |
6001 | +#: version.c:858 | |
5993 | 6002 | msgid "with Cocoa GUI." |
5994 | 6003 | msgstr "ñ ãðàôè÷åñêèì èíòåðôåéñîì Cocoa." |
5995 | 6004 | |
5996 | -#: version.c:875 | |
6005 | +#: version.c:861 | |
5997 | 6006 | msgid "with (classic) GUI." |
5998 | 6007 | msgstr "ñ êëàññè÷åñêèì ãðàôè÷åñêèì èíòåðôåéñîì." |
5999 | 6008 | |
6000 | -#: version.c:886 | |
6009 | +#: version.c:872 | |
6001 | 6010 | msgid " Features included (+) or not (-):\n" |
6002 | 6011 | msgstr " Âêëþ÷¸ííûå (+) è îòêëþ÷¸ííûå (-) îñîáåííîñòè:\n" |
6003 | 6012 | |
6004 | -#: version.c:898 | |
6013 | +#: version.c:884 | |
6005 | 6014 | msgid " system vimrc file: \"" |
6006 | 6015 | msgstr " îáùåñèñòåìíûé ôàéë vimrc: \"" |
6007 | 6016 | |
6008 | -#: version.c:903 | |
6017 | +#: version.c:889 | |
6009 | 6018 | msgid " user vimrc file: \"" |
6010 | 6019 | msgstr " ïîëüçîâàòåëüñêèé ôàéë vimrc: \"" |
6011 | 6020 | |
6012 | -#: version.c:908 | |
6021 | +#: version.c:894 | |
6013 | 6022 | msgid " 2nd user vimrc file: \"" |
6014 | 6023 | msgstr " âòîðîé ïîëüçîâàòåëüñêèé ôàéë vimrc: \"" |
6015 | 6024 | |
6016 | -#: version.c:913 | |
6025 | +#: version.c:899 | |
6017 | 6026 | msgid " 3rd user vimrc file: \"" |
6018 | 6027 | msgstr " òðåòèé ïîëüçîâàòåëüñêèé ôàéë vimrc: \"" |
6019 | 6028 | |
6020 | -#: version.c:918 | |
6029 | +#: version.c:904 | |
6021 | 6030 | msgid " user exrc file: \"" |
6022 | 6031 | msgstr " ïîëüçîâàòåëüñêèé ôàéë exrc: \"" |
6023 | 6032 | |
6024 | -#: version.c:923 | |
6033 | +#: version.c:909 | |
6025 | 6034 | msgid " 2nd user exrc file: \"" |
6026 | 6035 | msgstr " âòîðîé ïîëüçîâàòåëüñêèé ôàéë exrc: \"" |
6027 | 6036 | |
6028 | -#: version.c:929 | |
6037 | +#: version.c:915 | |
6029 | 6038 | msgid " system gvimrc file: \"" |
6030 | 6039 | msgstr " îáùåñèñòåìíûé ôàéë gvimrc: \"" |
6031 | 6040 | |
6032 | -#: version.c:933 | |
6041 | +#: version.c:919 | |
6033 | 6042 | msgid " user gvimrc file: \"" |
6034 | 6043 | msgstr " ïîëüçîâàòåëüñêèé ôàéë gvimrc: \"" |
6035 | 6044 | |
6036 | -#: version.c:937 | |
6045 | +#: version.c:923 | |
6037 | 6046 | msgid "2nd user gvimrc file: \"" |
6038 | 6047 | msgstr " âòîðîé ïîëüçîâàòåëüñêèé ôàéë gvimrc: \"" |
6039 | 6048 | |
6040 | -#: version.c:942 | |
6049 | +#: version.c:928 | |
6041 | 6050 | msgid "3rd user gvimrc file: \"" |
6042 | 6051 | msgstr " òðåòèé ïîëüçîâàòåëüñêèé ôàéë gvimrc: \"" |
6043 | 6052 | |
6044 | -#: version.c:949 | |
6053 | +#: version.c:935 | |
6045 | 6054 | msgid " system menu file: \"" |
6046 | 6055 | msgstr " îáùåñèñòåìíûé ôàéë ìåíþ: \"" |
6047 | 6056 | |
6048 | -#: version.c:957 | |
6057 | +#: version.c:943 | |
6049 | 6058 | msgid " fall-back for $VIM: \"" |
6050 | 6059 | msgstr " çíà÷åíèå $VIM ïî óìîë÷àíèþ: \"" |
6051 | 6060 | |
6052 | -#: version.c:963 | |
6061 | +#: version.c:949 | |
6053 | 6062 | msgid " f-b for $VIMRUNTIME: \"" |
6054 | 6063 | msgstr " çíà÷åíèå $VIMRUNTIME ïî óìîë÷àíèþ: \"" |
6055 | 6064 | |
6056 | -#: version.c:967 | |
6065 | +#: version.c:953 | |
6057 | 6066 | msgid "Compilation: " |
6058 | 6067 | msgstr "Ïàðàìåòðû êîìïèëÿöèè: " |
6059 | 6068 | |
6060 | -#: version.c:973 | |
6069 | +#: version.c:959 | |
6061 | 6070 | msgid "Compiler: " |
6062 | 6071 | msgstr "Êîìïèëÿòîð: " |
6063 | 6072 | |
6064 | -#: version.c:978 | |
6073 | +#: version.c:964 | |
6065 | 6074 | msgid "Linking: " |
6066 | 6075 | msgstr "Ñáîðêà: " |
6067 | 6076 | |
6068 | -#: version.c:983 | |
6077 | +#: version.c:969 | |
6069 | 6078 | msgid " DEBUG BUILD" |
6070 | 6079 | msgstr " ÎÒËÀÄÎ×ÍÀß ÑÁÎÐÊÀ" |
6071 | 6080 | |
6081 | +#: version.c:1008 | |
6082 | +msgid "VIM - Vi IMproved" | |
6083 | +msgstr "VIM ::: Vi IMproved (Óëó÷øåííûé Vi) ::: Ðóññêàÿ âåðñèÿ" | |
6084 | + | |
6085 | +#: version.c:1010 | |
6086 | +msgid "version " | |
6087 | +msgstr "âåðñèÿ " | |
6088 | + | |
6089 | +#: version.c:1011 | |
6090 | +msgid "by Bram Moolenaar et al." | |
6091 | +msgstr "Áðàì Ìîîëåíààð è äðóãèå" | |
6092 | + | |
6093 | +#: version.c:1015 | |
6094 | +msgid "Vim is open source and freely distributable" | |
6095 | +msgstr "Vim ýòî ñâîáîäíî ðàñïðîñòðàíÿåìàÿ ïðîãðàììà ñ îòêðûòûì êîäîì" | |
6096 | + | |
6097 | +#: version.c:1017 | |
6098 | +msgid "Help poor children in Uganda!" | |
6099 | +msgstr "Áåäíûì äåòÿì â Óãàíäå íóæíà âàøà ïîìîùü!" | |
6100 | + | |
6101 | +#: version.c:1018 | |
6102 | +msgid "type :help iccf<Enter> for information " | |
6103 | +msgstr "íàáåðèòå :help iccf<Enter> äëÿ äîïîëíèòåëüíîé èíôîðìàöèè" | |
6104 | + | |
6105 | +#: version.c:1020 | |
6106 | +msgid "type :q<Enter> to exit " | |
6107 | +msgstr "íàáåðèòå :q<Enter> ÷òîáû âûéòè èç ïðîãðàììû " | |
6108 | + | |
6109 | +#: version.c:1021 | |
6110 | +msgid "type :help<Enter> or <F1> for on-line help" | |
6111 | +msgstr "íàáåðèòå :help<Enter> èëè <F1> äëÿ ïîëó÷åíèÿ ñïðàâêè " | |
6112 | + | |
6072 | 6113 | #: version.c:1022 |
6073 | -msgid "VIM - Vi IMproved" | |
6074 | -msgstr "VIM ::: Vi IMproved (Óëó÷øåííûé Vi) ::: Ðóññêàÿ âåðñèÿ" | |
6075 | - | |
6076 | -#: version.c:1024 | |
6077 | -msgid "version " | |
6078 | -msgstr "âåðñèÿ " | |
6114 | +msgid "type :help version6<Enter> for version info" | |
6115 | +msgstr "íàáåðèòå :help version6<Enter> ÷òîáû óçíàòü îá ýòîé âåðñèè " | |
6079 | 6116 | |
6080 | 6117 | #: version.c:1025 |
6081 | -msgid "by Bram Moolenaar et al." | |
6082 | -msgstr "Áðàì Ìîîëåíààð è äðóãèå" | |
6083 | - | |
6084 | -#: version.c:1029 | |
6085 | -msgid "Vim is open source and freely distributable" | |
6086 | -msgstr "Vim ýòî ñâîáîäíî ðàñïðîñòðàíÿåìàÿ ïðîãðàììà ñ îòêðûòûì êîäîì" | |
6087 | - | |
6088 | -#: version.c:1031 | |
6089 | -msgid "Help poor children in Uganda!" | |
6090 | -msgstr "Áåäíûì äåòÿì â Óãàíäå íóæíà âàøà ïîìîùü!" | |
6091 | - | |
6092 | -#: version.c:1032 | |
6093 | -msgid "type :help iccf<Enter> for information " | |
6094 | -msgstr "íàáåðèòå :help iccf<Enter> äëÿ äîïîëíèòåëüíîé èíôîðìàöèè" | |
6095 | - | |
6096 | -#: version.c:1034 | |
6097 | -msgid "type :q<Enter> to exit " | |
6098 | -msgstr "íàáåðèòå :q<Enter> ÷òîáû âûéòè èç ïðîãðàììû " | |
6099 | - | |
6100 | -#: version.c:1035 | |
6101 | -msgid "type :help<Enter> or <F1> for on-line help" | |
6102 | -msgstr "íàáåðèòå :help<Enter> èëè <F1> äëÿ ïîëó÷åíèÿ ñïðàâêè " | |
6103 | - | |
6104 | -#: version.c:1036 | |
6105 | -msgid "type :help version6<Enter> for version info" | |
6106 | -msgstr "íàáåðèòå :help version6<Enter> ÷òîáû óçíàòü îá ýòîé âåðñèè " | |
6107 | - | |
6108 | -#: version.c:1039 | |
6109 | 6118 | msgid "Running in Vi compatible mode" |
6110 | 6119 | msgstr "Ðàáîòà â Vi-ñîâìåñòèìîì ðåæèìå" |
6111 | 6120 | |
6112 | -#: version.c:1040 | |
6121 | +#: version.c:1026 | |
6113 | 6122 | msgid "type :set nocp<Enter> for Vim defaults" |
6114 | 6123 | msgstr "íàáåðèòå :set nocp<Enter> äëÿ ïåðåõîäà â ðåæèì Vim " |
6115 | 6124 | |
6116 | -#: version.c:1041 | |
6125 | +#: version.c:1027 | |
6117 | 6126 | msgid "type :help cp-default<Enter> for info on this" |
6118 | 6127 | msgstr "íàáåðèòå :help cp-default<Enter> äëÿ äîïîëíèòåëüíîé èíôîðìàöèè" |
6119 | 6128 | |
6120 | -#: version.c:1056 | |
6129 | +#: version.c:1042 | |
6121 | 6130 | msgid "menu Help->Orphans for information " |
6122 | 6131 | msgstr "ìåíþ Ñïðàâêà->Ñèðîòû äëÿ ïîëó÷åíèÿ èíôîðìàöèè " |
6123 | 6132 | |
6124 | -#: version.c:1058 | |
6133 | +#: version.c:1044 | |
6125 | 6134 | msgid "Running modeless, typed text is inserted" |
6126 | 6135 | msgstr "Áåçðåæèìíàÿ ðàáîòû, âñòàâêà ââåä¸ííîãî òåêñòà" |
6127 | 6136 | |
6128 | -#: version.c:1059 | |
6137 | +#: version.c:1045 | |
6129 | 6138 | msgid "menu Edit->Global Settings->Toggle Insert Mode " |
6130 | 6139 | msgstr "ìåíþ Ïðàâêà->Îáùèå Íàñòðîéêè->Ðåæèì Âñòàâêè " |
6131 | 6140 | |
6132 | -#: version.c:1060 | |
6141 | +#: version.c:1046 | |
6133 | 6142 | msgid " for two modes " |
6134 | 6143 | msgstr " äëÿ äâóõ ðåæèìîâ " |
6135 | 6144 | |
6136 | -#: version.c:1064 | |
6145 | +#: version.c:1050 | |
6137 | 6146 | msgid "menu Edit->Global Settings->Toggle Vi Compatible" |
6138 | 6147 | msgstr "ìåíþ Ïðàâêà->Îáùèå Íàñòðîéêè->Ñîâìåñòèìîñòü ñ Vi " |
6139 | 6148 | |
6140 | -#: version.c:1065 | |
6149 | +#: version.c:1051 | |
6141 | 6150 | msgid " for Vim defaults " |
6142 | 6151 | msgstr " äëÿ ïåðåõîäà â ðåæèì Vim " |
6143 | 6152 | |
6144 | -#: version.c:1112 | |
6153 | +#: version.c:1098 | |
6145 | 6154 | msgid "Sponsor Vim development!" |
6146 | 6155 | msgstr "Ïîìîãèòå â ðàçðàáîòêå Vim!" |
6147 | 6156 | |
6148 | -#: version.c:1113 | |
6157 | +#: version.c:1099 | |
6149 | 6158 | msgid "Become a registered Vim user!" |
6150 | 6159 | msgstr "Ñòàíüòå çàðåãèñòðèðîâàííûì ïîëüçîâàòåëåì Vim!" |
6151 | 6160 | |
6152 | -#: version.c:1116 | |
6161 | +#: version.c:1102 | |
6153 | 6162 | msgid "type :help sponsor<Enter> for information " |
6154 | 6163 | msgstr "íàáåðèòå :help sponsor<Enter> äëÿ ïîëó÷åíèÿ èíôîðìàöèè " |
6155 | 6164 | |
6156 | -#: version.c:1117 | |
6165 | +#: version.c:1103 | |
6157 | 6166 | msgid "type :help register<Enter> for information " |
6158 | 6167 | msgstr "íàáåðèòå :help register<Enter> äëÿ ïîëó÷åíèÿ èíôîðìàöèè " |
6159 | 6168 | |
6160 | -#: version.c:1119 | |
6169 | +#: version.c:1105 | |
6161 | 6170 | msgid "menu Help->Sponsor/Register for information " |
6162 | 6171 | msgstr "ìåíþ Ñïðàâêà->Ïîìîùü/Ðåãèñòðàöèÿ äëÿ ïîëó÷åíèÿ èíôîðìàöèè " |
6163 | 6172 | |
6164 | -#: version.c:1129 | |
6173 | +#: version.c:1115 | |
6165 | 6174 | msgid "WARNING: Windows 95/98/ME detected" |
6166 | 6175 | msgstr "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ: îáíàðóæåíà Windows 95/98/ME" |
6167 | 6176 | |
6168 | -#: version.c:1132 | |
6177 | +#: version.c:1118 | |
6169 | 6178 | msgid "type :help windows95<Enter> for info on this" |
6170 | 6179 | msgstr "íàáåðèòå :help windows95<Enter> äëÿ ïîëó÷åíèÿ èíôîðìàöèè " |
6171 | 6180 |
@@ -6202,7 +6211,7 @@ | ||
6202 | 6211 | msgid "E447: Can't find file \"%s\" in path" |
6203 | 6212 | msgstr "E447: Ôàéë \"%s\" íå íàéäåí ïî èçâåñòíûì ïóòÿì" |
6204 | 6213 | |
6205 | -#: if_perl.xs:326 globals.h:1232 | |
6214 | +#: if_perl.xs:326 globals.h:1241 | |
6206 | 6215 | #, c-format |
6207 | 6216 | msgid "E370: Could not load library %s" |
6208 | 6217 | msgstr "E370: Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó %s" |
@@ -6254,7 +6263,7 @@ | ||
6254 | 6263 | msgid "Path length too long!" |
6255 | 6264 | msgstr "Ñëèøêîì äëèííûé ïóòü!" |
6256 | 6265 | |
6257 | -#: globals.h:1022 | |
6266 | +#: globals.h:1031 | |
6258 | 6267 | msgid "--No lines in buffer--" |
6259 | 6268 | msgstr "-- Íåò ñòðîê â áóôåðå --" |
6260 | 6269 |
@@ -6262,397 +6271,395 @@ | ||
6262 | 6271 | #. * The error messages that can be shared are included here. |
6263 | 6272 | #. * Excluded are errors that are only used once and debugging messages. |
6264 | 6273 | #. |
6265 | -#: globals.h:1185 | |
6274 | +#: globals.h:1194 | |
6266 | 6275 | msgid "E470: Command aborted" |
6267 | 6276 | msgstr "E470: Âûïîëíåíèå êîìàíäû ïðåðâàíî" |
6268 | 6277 | |
6269 | -#: globals.h:1186 | |
6278 | +#: globals.h:1195 | |
6270 | 6279 | msgid "E471: Argument required" |
6271 | 6280 | msgstr "E471: Òðåáóåòñÿ óêàçàòü ïàðàìåòð" |
6272 | 6281 | |
6273 | -#: globals.h:1187 | |
6282 | +#: globals.h:1196 | |
6274 | 6283 | msgid "E10: \\ should be followed by /, ? or &" |
6275 | 6284 | msgstr "E10: Ïîñëå \\ äîëæåí èäòè ñèìâîë /, ? èëè &" |
6276 | 6285 | |
6277 | -#: globals.h:1189 | |
6286 | +#: globals.h:1198 | |
6278 | 6287 | msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits" |
6279 | 6288 | msgstr "" |
6280 | 6289 | "E11: Íåäîïóñòèìî â îêíå êîìàíäíîé ñòðîêè; <CR> âûïîëíåíèå, CTRL-C âûõîä" |
6281 | 6290 | |
6282 | -#: globals.h:1191 | |
6291 | +#: globals.h:1200 | |
6283 | 6292 | msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" |
6284 | 6293 | msgstr "" |
6285 | 6294 | "E12: Êîìàíäà íå äîïóñêàåòñÿ â exrc/vimrc â òåêóùåì êàòàëîãå èëè ïîèñêå ìåòîê" |
6286 | 6295 | |
6287 | -#: globals.h:1193 | |
6296 | +#: globals.h:1202 | |
6288 | 6297 | msgid "E171: Missing :endif" |
6289 | 6298 | msgstr "E171: Îòñóòñòâóåò êîìàíäà :endif" |
6290 | 6299 | |
6291 | -#: globals.h:1194 | |
6300 | +#: globals.h:1203 | |
6292 | 6301 | msgid "E600: Missing :endtry" |
6293 | 6302 | msgstr "E600: Îòñóòñòâóåò êîìàíäà :endtry" |
6294 | 6303 | |
6295 | -#: globals.h:1195 | |
6304 | +#: globals.h:1204 | |
6296 | 6305 | msgid "E170: Missing :endwhile" |
6297 | 6306 | msgstr "E170: Îòñóòñòâóåò êîìàíäà :endwhile" |
6298 | 6307 | |
6299 | -#: globals.h:1196 | |
6308 | +#: globals.h:1205 | |
6300 | 6309 | msgid "E588: :endwhile without :while" |
6301 | 6310 | msgstr "E588: Êîìàíäà :endwhile áåç ïàðíîé êîìàíäû :while" |
6302 | 6311 | |
6303 | -#: globals.h:1198 | |
6312 | +#: globals.h:1207 | |
6304 | 6313 | msgid "E13: File exists (add ! to override)" |
6305 | 6314 | msgstr "E13: Ôàéë ñóùåñòâóåò (äëÿ ïåðåçàïèñè äîáàâüòå !)" |
6306 | 6315 | |
6307 | -#: globals.h:1199 | |
6316 | +#: globals.h:1208 | |
6308 | 6317 | msgid "E472: Command failed" |
6309 | 6318 | msgstr "E472: Íå óäàëîñü âûïîëíèòü êîìàíäó" |
6310 | 6319 | |
6311 | -#: globals.h:1201 | |
6320 | +#: globals.h:1210 | |
6312 | 6321 | #, c-format |
6313 | 6322 | msgid "E234: Unknown fontset: %s" |
6314 | 6323 | msgstr "E234: Íåèçâåñòíûé øðèôòîâîé íàáîð: %s" |
6315 | 6324 | |
6316 | -#: globals.h:1205 | |
6325 | +#: globals.h:1214 | |
6317 | 6326 | #, c-format |
6318 | 6327 | msgid "E235: Unknown font: %s" |
6319 | 6328 | msgstr "E235: Íåèçâåñòíûé øðèôò: %s" |
6320 | 6329 | |
6321 | -#: globals.h:1208 | |
6330 | +#: globals.h:1217 | |
6322 | 6331 | #, c-format |
6323 | 6332 | msgid "E236: Font \"%s\" is not fixed-width" |
6324 | 6333 | msgstr "E236: Øðèôò \"%s\" íå ÿâëÿåòñÿ ìîíîøèðèííûì øðèôòîì" |
6325 | 6334 | |
6326 | -#: globals.h:1210 | |
6335 | +#: globals.h:1219 | |
6327 | 6336 | msgid "E473: Internal error" |
6328 | 6337 | msgstr "E473: Âíóòðåííÿÿ îøèáêà" |
6329 | 6338 | |
6330 | -#: globals.h:1211 | |
6339 | +#: globals.h:1220 | |
6331 | 6340 | msgid "Interrupted" |
6332 | 6341 | msgstr "Ïðåðâàíî" |
6333 | 6342 | |
6334 | -#: globals.h:1212 | |
6343 | +#: globals.h:1221 | |
6335 | 6344 | msgid "E14: Invalid address" |
6336 | 6345 | msgstr "E14: Íåäîïóñòèìûé àäðåñ" |
6337 | 6346 | |
6338 | -#: globals.h:1213 | |
6347 | +#: globals.h:1222 | |
6339 | 6348 | msgid "E474: Invalid argument" |
6340 | 6349 | msgstr "E474: Íåäîïóñòèìûé àðãóìåíò" |
6341 | 6350 | |
6342 | -#: globals.h:1214 | |
6351 | +#: globals.h:1223 | |
6343 | 6352 | #, c-format |
6344 | 6353 | msgid "E475: Invalid argument: %s" |
6345 | 6354 | msgstr "E475: Íåäîïóñòèìûé àðãóìåíò: %s" |
6346 | 6355 | |
6347 | -#: globals.h:1216 | |
6356 | +#: globals.h:1225 | |
6348 | 6357 | #, c-format |
6349 | 6358 | msgid "E15: Invalid expression: %s" |
6350 | 6359 | msgstr "E15: Íåäîïóñòèìîå âûðàæåíèå: %s" |
6351 | 6360 | |
6352 | -#: globals.h:1218 | |
6361 | +#: globals.h:1227 | |
6353 | 6362 | msgid "E16: Invalid range" |
6354 | 6363 | msgstr "E16: Íåäîïóñòèìûé äèàïàçîí" |
6355 | 6364 | |
6356 | -#: globals.h:1219 | |
6365 | +#: globals.h:1228 | |
6357 | 6366 | msgid "E476: Invalid command" |
6358 | 6367 | msgstr "E476: Íåäîïóñòèìàÿ êîìàíäà" |
6359 | 6368 | |
6360 | -#: globals.h:1221 | |
6369 | +#: globals.h:1230 | |
6361 | 6370 | #, c-format |
6362 | 6371 | msgid "E17: \"%s\" is a directory" |
6363 | 6372 | msgstr "E17: \"%s\" ÿâëÿåòñÿ êàòàëîãîì" |
6364 | 6373 | |
6365 | -#: globals.h:1224 | |
6374 | +#: globals.h:1233 | |
6366 | 6375 | msgid "E18: Unexpected characters before '='" |
6367 | 6376 | msgstr "E18: Ïåðåä '=' îáíàðóæåíû íåîæèäàííûå ñèìâîëû" |
6368 | 6377 | |
6369 | -#: globals.h:1227 | |
6378 | +#: globals.h:1236 | |
6370 | 6379 | #, c-format |
6371 | 6380 | msgid "E364: Library call failed for \"%s()\"" |
6372 | 6381 | msgstr "E364: Íåóäà÷íûé âûçîâ ôóíêöèè \"%s()\" èç áèáëèîòåêè" |
6373 | 6382 | |
6374 | -#: globals.h:1233 | |
6383 | +#: globals.h:1242 | |
6375 | 6384 | #, c-format |
6376 | 6385 | msgid "E448: Could not load library function %s" |
6377 | 6386 | msgstr "E448: Íå óäàëîñü çàãðóçèòü ôóíêöèþ %s èç áèáëèîòåêè" |
6378 | 6387 | |
6379 | -#: globals.h:1235 | |
6388 | +#: globals.h:1244 | |
6380 | 6389 | msgid "E19: Mark has invalid line number" |
6381 | 6390 | msgstr "E19: Îòìåòêà óêàçûâàåò íà íåïðàâèëüíûé íîìåð ñòðîêè" |
6382 | 6391 | |
6383 | -#: globals.h:1236 | |
6392 | +#: globals.h:1245 | |
6384 | 6393 | msgid "E20: Mark not set" |
6385 | 6394 | msgstr "Îòìåòêà íå îïðåäåëåíà" |
6386 | 6395 | |
6387 | -#: globals.h:1237 | |
6396 | +#: globals.h:1246 | |
6388 | 6397 | msgid "E21: Cannot make changes, 'modifiable' is off" |
6389 | 6398 | msgstr "E21: Èçìåíåíèÿ íåâîçìîæíû, òàê êàê îòêëþ÷åíà îïöèÿ 'modifiable'" |
6390 | 6399 | |
6391 | -#: globals.h:1238 | |
6400 | +#: globals.h:1247 | |
6392 | 6401 | msgid "E22: Scripts nested too deep" |
6393 | 6402 | msgstr "E22: Ñëèøêîì ãëóáîêî âëîæåííûå ñöåíàðèè" |
6394 | 6403 | |
6395 | -#: globals.h:1239 | |
6404 | +#: globals.h:1248 | |
6396 | 6405 | msgid "E23: No alternate file" |
6397 | 6406 | msgstr "E23: Ñîñåäíèé ôàéë íå ñóùåñòâóåò" |
6398 | 6407 | |
6399 | -#: globals.h:1240 | |
6408 | +#: globals.h:1249 | |
6400 | 6409 | msgid "E24: No such abbreviation" |
6401 | 6410 | msgstr "E24: Íåò òàêîãî ñîêðàùåíèÿ" |
6402 | 6411 | |
6403 | -#: globals.h:1241 | |
6412 | +#: globals.h:1250 | |
6404 | 6413 | msgid "E477: No ! allowed" |
6405 | 6414 | msgstr "E477: ! íå äîïóñêàåòñÿ" |
6406 | 6415 | |
6407 | -#: globals.h:1243 | |
6416 | +#: globals.h:1252 | |
6408 | 6417 | msgid "E25: GUI cannot be used: Not enabled at compile time" |
6409 | 6418 | msgstr "" |
6410 | 6419 | "E25: Âîçìîæíîñòü èñïîëüçîâàíèÿ ãðàôè÷åñêîãî èíòåðôåéñà âûêëþ÷åíà ïðè " |
6411 | 6420 | "êîìïèëÿöèè" |
6412 | 6421 | |
6413 | -#: globals.h:1246 | |
6422 | +#: globals.h:1255 | |
6414 | 6423 | msgid "E26: Hebrew cannot be used: Not enabled at compile time\n" |
6415 | 6424 | msgstr "E26: Èâðèò âûêëþ÷åí ïðè êîìïèëÿöèè\n" |
6416 | 6425 | |
6417 | -#: globals.h:1249 | |
6426 | +#: globals.h:1258 | |
6418 | 6427 | msgid "E27: Farsi cannot be used: Not enabled at compile time\n" |
6419 | 6428 | msgstr "E27: Ôàðñè âûêëþ÷åíî ïðè êîìïèëÿöèè\n" |
6420 | 6429 | |
6421 | -#: globals.h:1252 | |
6430 | +#: globals.h:1261 | |
6422 | 6431 | msgid "E800: Arabic cannot be used: Not enabled at compile time\n" |
6423 | 6432 | msgstr "E800: Àðàáñêèé âûêëþ÷åí ïðè êîìïèëÿöèè\n" |
6424 | 6433 | |
6425 | -#: globals.h:1255 | |
6434 | +#: globals.h:1264 | |
6426 | 6435 | #, c-format |
6427 | 6436 | msgid "E28: No such highlight group name: %s" |
6428 | 6437 | msgstr "E28: Ãðóïïà ïîäñâåòêè ñèíòàêñèñà %s íå ñóùåñòâóåò" |
6429 | 6438 | |
6430 | -#: globals.h:1257 | |
6439 | +#: globals.h:1266 | |
6431 | 6440 | msgid "E29: No inserted text yet" |
6432 | 6441 | msgstr "E29: Ïîêà íåò âñòàâëåííîãî òåêñòà" |
6433 | 6442 | |
6434 | -#: globals.h:1258 | |
6443 | +#: globals.h:1267 | |
6435 | 6444 | msgid "E30: No previous command line" |
6436 | 6445 | msgstr "E30: Ïðåäûäóùåé êîìàíäíîé ñòðîêè íåò" |
6437 | 6446 | |
6438 | -#: globals.h:1259 | |
6447 | +#: globals.h:1268 | |
6439 | 6448 | msgid "E31: No such mapping" |
6440 | 6449 | msgstr "E31: Òàêîé ïðèâÿçêè íå ñóùåñòâóåò" |
6441 | 6450 | |
6442 | -#: globals.h:1260 | |
6451 | +#: globals.h:1269 | |
6443 | 6452 | msgid "E479: No match" |
6444 | 6453 | msgstr "E479: Íåò ñîîòâåòñòâèÿ" |
6445 | 6454 | |
6446 | -#: globals.h:1261 | |
6455 | +#: globals.h:1270 | |
6447 | 6456 | #, c-format |
6448 | 6457 | msgid "E480: No match: %s" |
6449 | 6458 | msgstr "E480: Íåò ñîîòâåòñòâèÿ: %s" |
6450 | 6459 | |
6451 | -#: globals.h:1262 | |
6460 | +#: globals.h:1271 | |
6452 | 6461 | msgid "E32: No file name" |
6453 | 6462 | msgstr "E32: Íåò èìåíè ôàéëà" |
6454 | 6463 | |
6455 | -#: globals.h:1263 | |
6464 | +#: globals.h:1272 | |
6456 | 6465 | msgid "E33: No previous substitute regular expression" |
6457 | 6466 | msgstr "E33: Íåò ïðåäûäóùåãî ðåãóëÿðíîãî âûðàæåíèÿ äëÿ çàìåíû" |
6458 | 6467 | |
6459 | -#: globals.h:1264 | |
6468 | +#: globals.h:1273 | |
6460 | 6469 | msgid "E34: No previous command" |
6461 | 6470 | msgstr "E34: Íåò ïðåäûäóùåé êîìàíäû" |
6462 | 6471 | |
6463 | -#: globals.h:1265 | |
6472 | +#: globals.h:1274 | |
6464 | 6473 | msgid "E35: No previous regular expression" |
6465 | 6474 | msgstr "E35: Íåò ïðåäûäóùåãî ðåãóëÿðíîãî âûðàæåíèÿ" |
6466 | 6475 | |
6467 | -#: globals.h:1266 | |
6476 | +#: globals.h:1275 | |
6468 | 6477 | msgid "E481: No range allowed" |
6469 | 6478 | msgstr "E481: Èñïîëüçîâàíèå äèàïàçîíà íå äîïóñêàåòñÿ" |
6470 | 6479 | |
6471 | -#: globals.h:1268 | |
6480 | +#: globals.h:1277 | |
6472 | 6481 | msgid "E36: Not enough room" |
6473 | 6482 | msgstr "E36: Íåäîñòàòî÷íî ìåñòà" |
6474 | 6483 | |
6475 | -#: globals.h:1271 | |
6484 | +#: globals.h:1280 | |
6476 | 6485 | #, c-format |
6477 | 6486 | msgid "E247: no registered server named \"%s\"" |
6478 | 6487 | msgstr "E247: ñåðâåð \"%s\" íå çàðåãèñòðèðîâàí" |
6479 | 6488 | |
6480 | -#: globals.h:1273 | |
6489 | +#: globals.h:1282 | |
6481 | 6490 | #, c-format |
6482 | 6491 | msgid "E482: Can't create file %s" |
6483 | 6492 | msgstr "E482: Íåâîçìîæíî ñîçäàòü ôàéë %s" |
6484 | 6493 | |
6485 | -#: globals.h:1274 | |
6494 | +#: globals.h:1283 | |
6486 | 6495 | msgid "E483: Can't get temp file name" |
6487 | 6496 | msgstr "E483: Íåâîçìîæíî ïîëó÷èòü èìÿ âðåìåííîãî ôàéëà" |
6488 | 6497 | |
6489 | -#: globals.h:1275 | |
6498 | +#: globals.h:1284 | |
6490 | 6499 | #, c-format |
6491 | 6500 | msgid "E484: Can't open file %s" |
6492 | 6501 | msgstr "E484: Íåâîçìîæíî îòêðûòü ôàéë %s" |
6493 | 6502 | |
6494 | -#: globals.h:1276 | |
6503 | +#: globals.h:1285 | |
6495 | 6504 | #, c-format |
6496 | 6505 | msgid "E485: Can't read file %s" |
6497 | 6506 | msgstr "E485: Íåâîçìîæíî ïðî÷èòàòü ôàéë %s" |
6498 | 6507 | |
6499 | -#: globals.h:1277 | |
6508 | +#: globals.h:1286 | |
6500 | 6509 | msgid "E37: No write since last change (add ! to override)" |
6501 | 6510 | msgstr "E37: Èçìåíåíèÿ íå ñîõðàíåíû (äîáàâüòå !, ÷òîáû îáîéòè ïðîâåðêó)" |
6502 | 6511 | |
6503 | -#: globals.h:1278 | |
6512 | +#: globals.h:1287 | |
6504 | 6513 | msgid "E38: Null argument" |
6505 | 6514 | msgstr "E38: Íóëåâîé àðãóìåíò" |
6506 | 6515 | |
6507 | -#: globals.h:1280 | |
6516 | +#: globals.h:1289 | |
6508 | 6517 | msgid "E39: Number expected" |
6509 | 6518 | msgstr "E39: Òðåáóåòñÿ ÷èñëî" |
6510 | 6519 | |
6511 | -#: globals.h:1283 | |
6520 | +#: globals.h:1292 | |
6512 | 6521 | #, c-format |
6513 | 6522 | msgid "E40: Can't open errorfile %s" |
6514 | 6523 | msgstr "E40: Íå óäàëîñü îòêðûòü ôàéë îøèáîê %s" |
6515 | 6524 | |
6516 | -#: globals.h:1286 | |
6525 | +#: globals.h:1295 | |
6517 | 6526 | msgid "E233: cannot open display" |
6518 | 6527 | msgstr "E233: íåâîçìîæíî îòêðûòü äèñïëåé" |
6519 | 6528 | |
6520 | -#: globals.h:1288 | |
6529 | +#: globals.h:1297 | |
6521 | 6530 | msgid "E41: Out of memory!" |
6522 | 6531 | msgstr "E41: Íå õâàòàåò ïàìÿòè!" |
6523 | 6532 | |
6524 | -#: globals.h:1290 | |
6533 | +#: globals.h:1299 | |
6525 | 6534 | msgid "Pattern not found" |
6526 | 6535 | msgstr "Øàáëîí íå íàéäåí" |
6527 | 6536 | |
6528 | -#: globals.h:1292 | |
6537 | +#: globals.h:1301 | |
6529 | 6538 | #, c-format |
6530 | 6539 | msgid "E486: Pattern not found: %s" |
6531 | 6540 | msgstr "E486: Øàáëîí íå íàéäåí: %s" |
6532 | 6541 | |
6533 | -#: globals.h:1293 | |
6542 | +#: globals.h:1302 | |
6534 | 6543 | msgid "E487: Argument must be positive" |
6535 | 6544 | msgstr "E487: Ïàðàìåòð äîëæåí áûòü ïîëîæèòåëüíûì ÷èñëîì" |
6536 | 6545 | |
6537 | -#: globals.h:1295 | |
6546 | +#: globals.h:1304 | |
6538 | 6547 | msgid "E459: Cannot go back to previous directory" |
6539 | 6548 | msgstr "E459: Âîçâðàò â ïðåäûäóùèé êàòàëîã íåâîçìîæåí" |
6540 | 6549 | |
6541 | -#: globals.h:1299 | |
6550 | +#: globals.h:1308 | |
6542 | 6551 | msgid "E42: No Errors" |
6543 | 6552 | msgstr "E42: Îøèáîê íåò" |
6544 | 6553 | |
6545 | -#: globals.h:1301 | |
6554 | +#: globals.h:1310 | |
6546 | 6555 | msgid "E43: Damaged match string" |
6547 | 6556 | msgstr "E43: Ïîâðåæäåíà ñòðîêà ñîîòâåòñòâèÿ" |
6548 | 6557 | |
6549 | -#: globals.h:1302 | |
6558 | +#: globals.h:1311 | |
6550 | 6559 | msgid "E44: Corrupted regexp program" |
6551 | 6560 | msgstr "E44: Ïðîãðàììà îáðàáîòêè ðåãóëÿðíûõ âûðàæåíèé ïîâðåæäåíà" |
6552 | 6561 | |
6553 | -#: globals.h:1303 | |
6562 | +#: globals.h:1312 | |
6554 | 6563 | msgid "E45: 'readonly' option is set (add ! to override)" |
6555 | 6564 | msgstr "" |
6556 | 6565 | "E45: Âêëþ÷åíà îïöèÿ 'readonly' (äîáàâüòå !, ÷òîáû íå îáðàùàòü âíèìàíèÿ)" |
6557 | 6566 | |
6558 | -#: globals.h:1305 | |
6567 | +#: globals.h:1314 | |
6559 | 6568 | #, c-format |
6560 | 6569 | msgid "E46: Cannot set read-only variable \"%s\"" |
6561 | 6570 | msgstr "E46: Íåâîçìîæíî èçìåíèòü äîñòóïíóþ òîëüêî äëÿ ÷òåíèÿ ïåðåìåííóþ \"%s\"" |
6562 | 6571 | |
6563 | -#: globals.h:1308 | |
6572 | +#: globals.h:1317 | |
6564 | 6573 | msgid "E47: Error while reading errorfile" |
6565 | 6574 | msgstr "E47: Îøèáêà ïðè ÷òåíèè ôàéëà îøèáîê" |
6566 | 6575 | |
6567 | -#: globals.h:1311 | |
6576 | +#: globals.h:1320 | |
6568 | 6577 | msgid "E48: Not allowed in sandbox" |
6569 | 6578 | msgstr "E48: Íå äîïóñêàåòñÿ â ïåñî÷íèöå" |
6570 | 6579 | |
6571 | -#: globals.h:1313 | |
6580 | +#: globals.h:1322 | |
6572 | 6581 | msgid "E523: Not allowed here" |
6573 | 6582 | msgstr "E523: Çäåñü íå ðàçðåøåíî" |
6574 | 6583 | |
6575 | -#: globals.h:1316 | |
6584 | +#: globals.h:1325 | |
6576 | 6585 | msgid "E359: Screen mode setting not supported" |
6577 | 6586 | msgstr "E359: Äàííûé ðåæèì ýêðàíà íå ïîääåðæèâàåòñÿ" |
6578 | 6587 | |
6579 | -#: globals.h:1318 | |
6588 | +#: globals.h:1327 | |
6580 | 6589 | msgid "E49: Invalid scroll size" |
6581 | 6590 | msgstr "E49: Íåäîïóñòèìûé ðàçìåð ïðîêðóòêè" |
6582 | 6591 | |
6583 | -#: globals.h:1319 | |
6592 | +#: globals.h:1328 | |
6584 | 6593 | msgid "E91: 'shell' option is empty" |
6585 | 6594 | msgstr "E91: Çíà÷åíèåì îïöèè 'shell' ÿâëÿåòñÿ ïóñòàÿ ñòðîêà" |
6586 | 6595 | |
6587 | -#: globals.h:1321 | |
6596 | +#: globals.h:1330 | |
6588 | 6597 | msgid "E255: Couldn't read in sign data!" |
6589 | 6598 | msgstr "E255: Íåâîçìîæíî ïðî÷èòàòü äàííûå î çíà÷êàõ!" |
6590 | 6599 | |
6591 | -#: globals.h:1323 | |
6600 | +#: globals.h:1332 | |
6592 | 6601 | msgid "E72: Close error on swap file" |
6593 | 6602 | msgstr "E72: Îøèáêà çàêðûòèÿ ñâîï-ôàéëà" |
6594 | 6603 | |
6595 | -#: globals.h:1324 | |
6604 | +#: globals.h:1333 | |
6596 | 6605 | msgid "E73: tag stack empty" |
6597 | 6606 | msgstr "E73: Ñòåê ìåòîê ïóñòîé" |
6598 | 6607 | |
6599 | -#: globals.h:1325 | |
6608 | +#: globals.h:1334 | |
6600 | 6609 | msgid "E74: Command too complex" |
6601 | 6610 | msgstr "E74: Ñëèøêîì ñëîæíàÿ êîìàíäà" |
6602 | 6611 | |
6603 | -#: globals.h:1326 | |
6612 | +#: globals.h:1335 | |
6604 | 6613 | msgid "E75: Name too long" |
6605 | 6614 | msgstr "E75: Ñëèøêîì äëèííîå èìÿ" |
6606 | 6615 | |
6607 | -#: globals.h:1327 | |
6616 | +#: globals.h:1336 | |
6608 | 6617 | msgid "E76: Too many [" |
6609 | 6618 | msgstr "E76: Ñëèøêîì ìíîãî ñèìâîëîâ [" |
6610 | 6619 | |
6611 | -#: globals.h:1328 | |
6620 | +#: globals.h:1337 | |
6612 | 6621 | msgid "E77: Too many file names" |
6613 | 6622 | msgstr "E77: Ñëèøêîì ìíîãî èì¸í ôàéëîâ" |
6614 | 6623 | |
6615 | -#: globals.h:1329 | |
6624 | +#: globals.h:1338 | |
6616 | 6625 | msgid "E488: Trailing characters" |
6617 | 6626 | msgstr "E488: Ëèøíèå ñèìâîëû íà õâîñòå" |
6618 | 6627 | |
6619 | -#: globals.h:1330 | |
6628 | +#: globals.h:1339 | |
6620 | 6629 | msgid "E78: Unknown mark" |
6621 | 6630 | msgstr "E78: Íåèçâåñòíàÿ îòìåòêà" |
6622 | 6631 | |
6623 | -#: globals.h:1331 | |
6632 | +#: globals.h:1340 | |
6624 | 6633 | msgid "E79: Cannot expand wildcards" |
6625 | 6634 | msgstr "E79: Íåâîçìîæíî âûïîëíèòü ïîäñòàíîâêó ïî ìàñêå" |
6626 | 6635 | |
6627 | -#: globals.h:1333 | |
6636 | +#: globals.h:1342 | |
6628 | 6637 | msgid "E591: 'winheight' cannot be smaller than 'winminheight'" |
6629 | 6638 | msgstr "" |
6630 | 6639 | "E591: Çíà÷åíèå îïöèè 'winheight' íå ìîæåò áûòü ìåíüøå çíà÷åíèÿ 'winminheight'" |
6631 | 6640 | |
6632 | -#: globals.h:1335 | |
6641 | +#: globals.h:1344 | |
6633 | 6642 | msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'" |
6634 | 6643 | msgstr "" |
6635 | 6644 | "E592: Çíà÷åíèå îïöèè 'winwidth' íå ìîæåò áûòü ìåíüøå çíà÷åíèÿ 'winminwidth'" |
6636 | 6645 | |
6637 | -#: globals.h:1338 | |
6646 | +#: globals.h:1347 | |
6638 | 6647 | msgid "E80: Error while writing" |
6639 | 6648 | msgstr "E80: Îøèáêà ïðè çàïèñè" |
6640 | 6649 | |
6641 | -#: globals.h:1339 | |
6650 | +#: globals.h:1348 | |
6642 | 6651 | msgid "Zero count" |
6643 | 6652 | msgstr "Íóëåâîå çíà÷åíèå ñ÷¸ò÷èêà" |
6644 | 6653 | |
6645 | -#: globals.h:1341 | |
6654 | +#: globals.h:1350 | |
6646 | 6655 | msgid "E81: Using <SID> not in a script context" |
6647 | 6656 | msgstr "E81: Èñïîëüçîâàíèå <SID> âíå êîíòåêñòà ñöåíàðèÿ" |
6648 | 6657 | |
6649 | -#: globals.h:1344 | |
6658 | +#: globals.h:1353 | |
6650 | 6659 | msgid "E449: Invalid expression received" |
6651 | 6660 | msgstr "E449: Ïîëó÷åíî íåäîïóñòèìîå âûðàæåíèå" |
6652 | 6661 | |
6653 | -#: globals.h:1347 | |
6662 | +#: globals.h:1356 | |
6654 | 6663 | msgid "E463: Region is guarded, cannot modify" |
6655 | 6664 | msgstr "E463: Íåâîçìîæíî èçìåíèòü îõðàíÿåìóþ îáëàñòü" |
6656 | 6665 | |
6657 | -#~ msgid "\"\n" | |
6658 | -#~ msgstr "\"\n" |
@@ -11,6 +11,7 @@ | ||
11 | 11 | void eval_patch __ARGS((char_u *origfile, char_u *difffile, char_u *outfile)); |
12 | 12 | int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip)); |
13 | 13 | char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip)); |
14 | +int skip_expr __ARGS((char_u **pp)); | |
14 | 15 | char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd)); |
15 | 16 | char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd)); |
16 | 17 | int eval_to_number __ARGS((char_u *expr)); |
@@ -38,6 +38,7 @@ | ||
38 | 38 | void write_viminfo_sub_string __ARGS((FILE *fp)); |
39 | 39 | void prepare_tagpreview __ARGS((void)); |
40 | 40 | void ex_help __ARGS((exarg_T *eap)); |
41 | +char_u *check_help_lang __ARGS((char_u *arg)); | |
41 | 42 | int help_heuristic __ARGS((char_u *matched_string, int offset, int wrong_case)); |
42 | 43 | int find_help_tags __ARGS((char_u *arg, int *num_matches, char_u ***matches, int keep_lang)); |
43 | 44 | void fix_help_buffer __ARGS((void)); |
@@ -1006,6 +1006,7 @@ | ||
1006 | 1006 | #ifdef FEAT_FOLDING |
1007 | 1007 | int old_KeyTyped = KeyTyped; /* getting file may reset it */ |
1008 | 1008 | #endif |
1009 | + int ok = OK; | |
1009 | 1010 | |
1010 | 1011 | if (qf_curlist >= qf_listcount || qf_lists[qf_curlist].qf_count == 0) |
1011 | 1012 | { |
@@ -1097,6 +1098,42 @@ | ||
1097 | 1098 | print_message = FALSE; |
1098 | 1099 | |
1099 | 1100 | /* |
1101 | + * For ":helpgrep" find a help window or open one. | |
1102 | + */ | |
1103 | + if (qf_ptr->qf_type == 1 && !curwin->w_buffer->b_help) | |
1104 | + { | |
1105 | + win_T *wp; | |
1106 | + int n; | |
1107 | + | |
1108 | + for (wp = firstwin; wp != NULL; wp = wp->w_next) | |
1109 | + if (wp->w_buffer != NULL && wp->w_buffer->b_help) | |
1110 | + break; | |
1111 | + if (wp != NULL && wp->w_buffer->b_nwindows > 0) | |
1112 | + win_enter(wp, TRUE); | |
1113 | + else | |
1114 | + { | |
1115 | + /* | |
1116 | + * Split off help window; put it at far top if no position | |
1117 | + * specified, the current window is vertically split and narrow. | |
1118 | + */ | |
1119 | + n = WSP_HELP; | |
1120 | +# ifdef FEAT_VERTSPLIT | |
1121 | + if (cmdmod.split == 0 && curwin->w_width != Columns | |
1122 | + && curwin->w_width < 80) | |
1123 | + n |= WSP_TOP; | |
1124 | +# endif | |
1125 | + if (win_split(0, n) == FAIL) | |
1126 | + goto theend; | |
1127 | + | |
1128 | + if (curwin->w_height < p_hh) | |
1129 | + win_setheight((int)p_hh); | |
1130 | + } | |
1131 | + | |
1132 | + if (!p_im) | |
1133 | + restart_edit = 0; /* don't want insert mode in help file */ | |
1134 | + } | |
1135 | + | |
1136 | + /* | |
1100 | 1137 | * If currently in the quickfix window, find another window to show the |
1101 | 1138 | * file in. |
1102 | 1139 | */ |
@@ -1170,8 +1207,28 @@ | ||
1170 | 1207 | */ |
1171 | 1208 | old_curbuf = curbuf; |
1172 | 1209 | old_lnum = curwin->w_cursor.lnum; |
1173 | - if (qf_ptr->qf_fnum == 0 || buflist_getfile(qf_ptr->qf_fnum, | |
1174 | - (linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit) == OK) | |
1210 | + | |
1211 | + if (qf_ptr->qf_fnum != 0) | |
1212 | + { | |
1213 | + if (qf_ptr->qf_type == 1) | |
1214 | + { | |
1215 | + /* Open help file (do_ecmd() will set b_help flag, readfile() will | |
1216 | + * set b_p_ro flag). */ | |
1217 | + if (!can_abandon(curbuf, forceit)) | |
1218 | + { | |
1219 | + EMSG(_(e_nowrtmsg)); | |
1220 | + ok = FALSE; | |
1221 | + } | |
1222 | + else | |
1223 | + ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1, | |
1224 | + ECMD_HIDE + ECMD_SET_HELP); | |
1225 | + } | |
1226 | + else | |
1227 | + ok = buflist_getfile(qf_ptr->qf_fnum, | |
1228 | + (linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit); | |
1229 | + } | |
1230 | + | |
1231 | + if (ok == OK) | |
1175 | 1232 | { |
1176 | 1233 | /* When not switched to another buffer, still need to set pc mark */ |
1177 | 1234 | if (curbuf == old_curbuf) |
@@ -2145,11 +2202,19 @@ | ||
2145 | 2202 | int fi; |
2146 | 2203 | struct qf_line *prevp = NULL; |
2147 | 2204 | long lnum; |
2205 | +#ifdef FEAT_MULTI_LANG | |
2206 | + char_u *lang; | |
2207 | +#endif | |
2148 | 2208 | |
2149 | 2209 | /* Make 'cpoptions' empty, the 'l' flag should not be used here. */ |
2150 | 2210 | save_cpo = p_cpo; |
2151 | 2211 | p_cpo = (char_u *)""; |
2152 | 2212 | |
2213 | +#ifdef FEAT_MULTI_LANG | |
2214 | + /* Check for a specified language */ | |
2215 | + lang = check_help_lang(eap->arg); | |
2216 | +#endif | |
2217 | + | |
2153 | 2218 | regmatch.regprog = vim_regcomp(eap->arg, RE_MAGIC + RE_STRING); |
2154 | 2219 | regmatch.rm_ic = FALSE; |
2155 | 2220 | if (regmatch.regprog != NULL) |
@@ -2172,6 +2237,16 @@ | ||
2172 | 2237 | { |
2173 | 2238 | for (fi = 0; fi < fcount && !got_int; ++fi) |
2174 | 2239 | { |
2240 | +#ifdef FEAT_MULTI_LANG | |
2241 | + /* Skip files for a different language. */ | |
2242 | + if (lang != NULL | |
2243 | + && STRNICMP(lang, fnames[fi] | |
2244 | + + STRLEN(fnames[fi]) - 3, 2) != 0 | |
2245 | + && !(STRNICMP(lang, "en", 2) == 0 | |
2246 | + && STRNICMP("txt", fnames[fi] | |
2247 | + + STRLEN(fnames[fi]) - 3, 3) == 0)) | |
2248 | + continue; | |
2249 | +#endif | |
2175 | 2250 | fd = fopen((char *)fnames[fi], "r"); |
2176 | 2251 | if (fd != NULL) |
2177 | 2252 | { |
@@ -2227,6 +2302,8 @@ | ||
2227 | 2302 | /* Jump to first match. */ |
2228 | 2303 | if (qf_lists[qf_curlist].qf_count > 0) |
2229 | 2304 | qf_jump(0, 0, FALSE); |
2305 | + else | |
2306 | + EMSG2(_(e_nomatch2), eap->arg); | |
2230 | 2307 | } |
2231 | 2308 | |
2232 | 2309 | #endif /* FEAT_QUICKFIX */ |
@@ -3052,13 +3052,16 @@ | ||
3052 | 3052 | --count; |
3053 | 3053 | } |
3054 | 3054 | |
3055 | - if (include_white && cls() != 0) | |
3055 | + if (include_white && (cls() != 0 | |
3056 | + || (curwin->w_cursor.col == 0 && !inclusive))) | |
3056 | 3057 | { |
3057 | 3058 | /* |
3058 | 3059 | * If we don't include white space at the end, move the start |
3059 | 3060 | * to include some white space there. This makes "daw" work |
3060 | 3061 | * better on the last word in a sentence (and "2daw" on last-but-one |
3061 | - * word). But don't delete white space at start of line (indent). | |
3062 | + * word). Also when "2daw" deletes "word." at the end of the line | |
3063 | + * (cursor is at start of next line). | |
3064 | + * But don't delete white space at start of line (indent). | |
3062 | 3065 | */ |
3063 | 3066 | pos = curwin->w_cursor; /* save cursor position */ |
3064 | 3067 | curwin->w_cursor = start_pos; |