4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: ":verbose set ts" doesn't say an option was set with a "-c" or
13 Solution: Remember the option was set from a Vim argument.
14 Files: src/main.c, src/ex_cmds2.c, src/vim.h
17 *** ../vim-6.2.084/src/main.c Mon Jun 2 22:26:17 2003
18 --- src/main.c Mon Sep 1 22:48:42 2003
23 curwin->w_cursor.lnum = 0; /* just in case.. */
24 sourcing_name = (char_u *)_("pre-vimrc command line");
26 + current_SID = SID_CMDARG;
28 for (i = 0; i < p_commands; ++i)
29 do_cmdline_cmd(pre_commands[i]);
41 curwin->w_cursor.lnum = 0;
42 sourcing_name = (char_u *)"command line";
44 + current_SID = SID_CARG;
46 for (i = 0; i < n_commands; ++i)
47 do_cmdline_cmd(commands[i]);
52 if (curwin->w_cursor.lnum == 0)
53 curwin->w_cursor.lnum = 1;
59 char_u *save_sourcing_name;
60 linenr_T save_sourcing_lnum;
65 if ((initstr = mch_getenv(env)) != NULL && *initstr != NUL)
70 save_sourcing_lnum = sourcing_lnum;
74 + save_sid = current_SID;
75 + current_SID = SID_ENV;
77 do_cmdline_cmd(initstr);
78 sourcing_name = save_sourcing_name;
79 sourcing_lnum = save_sourcing_lnum;
81 + current_SID = save_sid;;
86 *** ../vim-6.2.084/src/ex_cmds2.c Sun Aug 10 22:34:58 2003
87 --- src/ex_cmds2.c Sun Sep 7 23:19:35 2003
92 if (id == SID_MODELINE)
93 return (char_u *)"modeline";
94 + if (id == SID_CMDARG)
95 + return (char_u *)"--cmd argument";
97 + return (char_u *)"-c argument";
99 + return (char_u *)"environment variable";
100 return SCRIPT_NAME(id);
103 *** ../vim-6.2.084/src/vim.h Tue Aug 12 20:01:59 2003
104 --- src/vim.h Sun Sep 7 23:53:24 2003
107 #define MIN_SWAP_PAGE_SIZE 1048
108 #define MAX_SWAP_PAGE_SIZE 50000
110 ! #define SID_MODELINE -1 /* script ID when using a modeline */
113 * Events for autocommands.
115 #define MIN_SWAP_PAGE_SIZE 1048
116 #define MAX_SWAP_PAGE_SIZE 50000
118 ! /* Special values for current_SID. */
119 ! #define SID_MODELINE -1 /* when using a modeline */
120 ! #define SID_CMDARG -2 /* for "--cmd" argument */
121 ! #define SID_CARG -3 /* for "-c" argument */
122 ! #define SID_ENV -4 /* for sourcing environment variable */
125 * Events for autocommands.
126 *** ../vim-6.2.084/src/version.c Thu Sep 11 21:21:21 2003
127 --- src/version.c Thu Sep 11 21:23:06 2003
131 { /* Add new patch number below this line */
137 Snoring is prohibited unless all bedroom windows are closed and securely
139 [real standing law in Massachusetts, United States of America]
141 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
142 /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
143 \\\ Project leader for A-A-P -- http://www.A-A-P.org ///
144 \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///