]>
Commit | Line | Data |
---|---|---|
51f9884c AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.403 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 6.2.403 | |
11 | Problem: ":@y" checks stdin if there are more commands to execute. This | |
12 | fails if stdin is not connected, e.g., when starting the GUI from | |
13 | KDE. (Ned Konz) | |
14 | Solution: Only check for a next command if there still is typeahead. | |
15 | Files: src/ex_docmd.c | |
16 | ||
17 | ||
18 | *** ../vim-6.2.402/src/ex_docmd.c Sat Mar 20 17:45:15 2004 | |
19 | --- src/ex_docmd.c Sat Mar 20 17:45:21 2004 | |
20 | *************** | |
21 | *** 7223,7238 **** | |
22 | int save_efr = exec_from_reg; | |
23 | ||
24 | exec_from_reg = TRUE; | |
25 | ! /* execute from the mapbuf */ | |
26 | ! while (vpeekc() == ':') | |
27 | ! { | |
28 | (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE); | |
29 | - /* In Ex mode need to quit when the typeahead is exhausted, | |
30 | - * otherwise input unexpectedly goes to the typeahead buffer and | |
31 | - * getexmodeline() can't get it with inchar(). */ | |
32 | - if (exmode_active && stuff_empty() && typebuf.tb_len == 0) | |
33 | - break; | |
34 | - } | |
35 | ||
36 | exec_from_reg = save_efr; | |
37 | } | |
38 | --- 7221,7235 ---- | |
39 | int save_efr = exec_from_reg; | |
40 | ||
41 | exec_from_reg = TRUE; | |
42 | ! | |
43 | ! /* | |
44 | ! * Execute from the typeahead buffer. | |
45 | ! * Originally this didn't check for the typeahead buffer to be empty, | |
46 | ! * thus could read more Ex commands from stdin. It's not clear why, | |
47 | ! * it is certainly unexpected. | |
48 | ! */ | |
49 | ! while ((!stuff_empty() || typebuf.tb_len > 0) && vpeekc() == ':') | |
50 | (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE); | |
51 | ||
52 | exec_from_reg = save_efr; | |
53 | } | |
54 | *** ../vim-6.2.402/src/version.c Thu Mar 25 19:29:55 2004 | |
55 | --- src/version.c Fri Mar 26 10:35:56 2004 | |
56 | *************** | |
57 | *** 639,640 **** | |
58 | --- 639,642 ---- | |
59 | { /* Add new patch number below this line */ | |
60 | + /**/ | |
61 | + 403, | |
62 | /**/ | |
63 | ||
64 | -- | |
65 | hundred-and-one symptoms of being an internet addict: | |
66 | 144. You eagerly await the update of the "Cool Site of the Day." | |
67 | ||
68 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
69 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
70 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
71 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |