]>
Commit | Line | Data |
---|---|---|
f3c378e8 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.0.098 | |
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 7.0.098 | |
11 | Problem: Redirecting command output in a cmdline completion function | |
12 | doesn't work. (Hari Krishna Dara) | |
13 | Solution: Enable redirection when redirection is started. | |
14 | Files: src/ex_docmd.c, src/ex_getln.c | |
15 | ||
16 | ||
17 | *** ../vim-7.0.097/src/ex_docmd.c Sun Sep 10 15:50:32 2006 | |
18 | --- src/ex_docmd.c Sun Sep 10 20:59:46 2006 | |
19 | *************** | |
20 | *** 8422,8427 **** | |
21 | --- 8422,8436 ---- | |
22 | else | |
23 | EMSG2(_(e_invarg2), eap->arg); | |
24 | } | |
25 | + | |
26 | + /* Make sure redirection is not off. Can happen for cmdline completion | |
27 | + * that indirectly invokes a command to catch its output. */ | |
28 | + if (redir_fd != NULL | |
29 | + #ifdef FEAT_EVAL | |
30 | + || redir_reg || redir_vname | |
31 | + #endif | |
32 | + ) | |
33 | + redir_off = FALSE; | |
34 | } | |
35 | ||
36 | /* | |
37 | *** ../vim-7.0.097/src/ex_getln.c Sat Sep 2 17:58:36 2006 | |
38 | --- src/ex_getln.c Sun Sep 10 21:04:57 2006 | |
39 | *************** | |
40 | *** 324,329 **** | |
41 | --- 324,332 ---- | |
42 | */ | |
43 | for (;;) | |
44 | { | |
45 | + redir_off = TRUE; /* Don't redirect the typed command. | |
46 | + Repeated, because a ":redir" inside | |
47 | + completion may switch it on. */ | |
48 | #ifdef USE_ON_FLY_SCROLL | |
49 | dont_scroll = FALSE; /* allow scrolling here */ | |
50 | #endif | |
51 | *** ../vim-7.0.097/src/version.c Sun Sep 10 15:50:32 2006 | |
52 | --- src/version.c Sun Sep 10 20:58:17 2006 | |
53 | *************** | |
54 | *** 668,669 **** | |
55 | --- 668,671 ---- | |
56 | { /* Add new patch number below this line */ | |
57 | + /**/ | |
58 | + 98, | |
59 | /**/ | |
60 | ||
61 | -- | |
62 | GUEST: He's killed the best man! | |
63 | SECOND GUEST: (holding a limp WOMAN) He's killed my auntie. | |
64 | FATHER: No, please! This is supposed to be a happy occasion! Let's | |
65 | not bicker and argue about who killed who ... | |
66 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
67 | ||
68 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
69 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
70 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
71 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |