]>
Commit | Line | Data |
---|---|---|
03d4279c AM |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.423 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.423 | |
11 | Problem: Small mistakes in comments, proto and indent. | |
12 | Solution: Fix the mistakes. | |
13 | Files: src/ex_cmds2.c, src/structs.h, src/ui.c, src/proto/ex_docmd.pro | |
14 | ||
15 | ||
16 | *** ../vim-7.3.422/src/ex_cmds2.c 2011-10-20 21:38:37.000000000 +0200 | |
17 | --- src/ex_cmds2.c 2011-11-30 11:02:20.000000000 +0100 | |
18 | *************** | |
19 | *** 1939,1945 **** | |
20 | } | |
21 | ||
22 | /* | |
23 | ! * Return TRUE if window "win" is editing then file at the current argument | |
24 | * index. | |
25 | */ | |
26 | static int | |
27 | --- 1939,1945 ---- | |
28 | } | |
29 | ||
30 | /* | |
31 | ! * Return TRUE if window "win" is editing the file at the current argument | |
32 | * index. | |
33 | */ | |
34 | static int | |
35 | *** ../vim-7.3.422/src/structs.h 2011-05-19 13:40:47.000000000 +0200 | |
36 | --- src/structs.h 2011-09-10 13:48:53.000000000 +0200 | |
37 | *************** | |
38 | *** 1846,1852 **** | |
39 | often, keep it the first item!) */ | |
40 | ||
41 | #if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) | |
42 | ! synblock_T *w_s; | |
43 | #endif | |
44 | ||
45 | #ifdef FEAT_WINDOWS | |
46 | --- 1846,1852 ---- | |
47 | often, keep it the first item!) */ | |
48 | ||
49 | #if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) | |
50 | ! synblock_T *w_s; /* for :ownsyntax */ | |
51 | #endif | |
52 | ||
53 | #ifdef FEAT_WINDOWS | |
54 | *** ../vim-7.3.422/src/ui.c 2011-07-07 16:20:45.000000000 +0200 | |
55 | --- src/ui.c 2012-01-21 14:03:42.000000000 +0100 | |
56 | *************** | |
57 | *** 2363,2376 **** | |
58 | XtLastTimestampProcessed(XtDisplay(myShell)), | |
59 | clip_x11_convert_selection_cb, clip_x11_lose_ownership_cb, | |
60 | NULL) == False) | |
61 | ! return FAIL; | |
62 | } | |
63 | else | |
64 | #endif | |
65 | { | |
66 | if (!XChangeProperty(XtDisplay(myShell), XtWindow(myShell), | |
67 | cbd->sel_atom, timestamp_atom, 32, PropModeAppend, NULL, 0)) | |
68 | ! return FAIL; | |
69 | } | |
70 | /* Flush is required in a terminal as nothing else is doing it. */ | |
71 | XFlush(XtDisplay(myShell)); | |
72 | --- 2363,2376 ---- | |
73 | XtLastTimestampProcessed(XtDisplay(myShell)), | |
74 | clip_x11_convert_selection_cb, clip_x11_lose_ownership_cb, | |
75 | NULL) == False) | |
76 | ! return FAIL; | |
77 | } | |
78 | else | |
79 | #endif | |
80 | { | |
81 | if (!XChangeProperty(XtDisplay(myShell), XtWindow(myShell), | |
82 | cbd->sel_atom, timestamp_atom, 32, PropModeAppend, NULL, 0)) | |
83 | ! return FAIL; | |
84 | } | |
85 | /* Flush is required in a terminal as nothing else is doing it. */ | |
86 | XFlush(XtDisplay(myShell)); | |
87 | *** ../vim-7.3.422/src/proto/ex_docmd.pro 2010-08-15 21:57:28.000000000 +0200 | |
88 | --- src/proto/ex_docmd.pro 2011-01-16 00:22:21.000000000 +0100 | |
89 | *************** | |
90 | *** 1,7 **** | |
91 | /* ex_docmd.c */ | |
92 | void do_exmode __ARGS((int improved)); | |
93 | int do_cmdline_cmd __ARGS((char_u *cmd)); | |
94 | ! int do_cmdline __ARGS((char_u *cmdline, char_u *(*getline)(int, void *, int), void *cookie, int flags)); | |
95 | int getline_equal __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie, char_u *(*func)(int, void *, int))); | |
96 | void *getline_cookie __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie)); | |
97 | int checkforcmd __ARGS((char_u **pp, char *cmd, int len)); | |
98 | --- 1,7 ---- | |
99 | /* ex_docmd.c */ | |
100 | void do_exmode __ARGS((int improved)); | |
101 | int do_cmdline_cmd __ARGS((char_u *cmd)); | |
102 | ! int do_cmdline __ARGS((char_u *cmdline, char_u *(*fgetline)(int, void *, int), void *cookie, int flags)); | |
103 | int getline_equal __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie, char_u *(*func)(int, void *, int))); | |
104 | void *getline_cookie __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie)); | |
105 | int checkforcmd __ARGS((char_u **pp, char *cmd, int len)); | |
106 | *** ../vim-7.3.422/src/version.c 2012-02-04 20:17:21.000000000 +0100 | |
107 | --- src/version.c 2012-02-04 21:56:43.000000000 +0100 | |
108 | *************** | |
109 | *** 716,717 **** | |
110 | --- 716,719 ---- | |
111 | { /* Add new patch number below this line */ | |
112 | + /**/ | |
113 | + 423, | |
114 | /**/ | |
115 | ||
116 | -- | |
117 | In many of the more relaxed civilizations on the Outer Eastern Rim of the | |
118 | Galaxy, "The Hitchhiker's Guide to the Galaxy" has already supplanted the | |
119 | great "Encyclopedia Galactica" as the standard repository of all knowledge | |
120 | and wisdom, for though it has many omissions and contains much that is | |
121 | apocryphal, or at least wildly inaccurate, it scores over the older, more | |
122 | pedestrian work in two important respects. | |
123 | First, it is slightly cheaper; and second, it has the words "DON'T PANIC" | |
124 | inscribed in large friendly letters on its cover. | |
125 | -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" | |
126 | ||
127 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
128 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
129 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
130 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |