--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.254
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.254
+Problem: May run out of space for error messages.
+Solution: Keep room for two more bytes.
+Files: src/quickfix.c
+
+
+*** ../vim-6.2.253/src/quickfix.c Tue Feb 10 19:35:15 2004
+--- src/quickfix.c Tue Feb 10 15:24:52 2004
+***************
+*** 405,413 ****
+ * Read the lines in the error file one by one.
+ * Try to recognize one of the error formats in each line.
+ */
+! while (fgets((char *)IObuff, CMDBUFFSIZE, fd) != NULL && !got_int)
+ {
+! IObuff[CMDBUFFSIZE] = NUL; /* for very long lines */
+ if ((efmp = vim_strrchr(IObuff, '\n')) != NULL)
+ *efmp = NUL;
+ #ifdef USE_CRNL
+--- 405,413 ----
+ * Read the lines in the error file one by one.
+ * Try to recognize one of the error formats in each line.
+ */
+! while (fgets((char *)IObuff, CMDBUFFSIZE - 2, fd) != NULL && !got_int)
+ {
+! IObuff[CMDBUFFSIZE - 2] = NUL; /* for very long lines */
+ if ((efmp = vim_strrchr(IObuff, '\n')) != NULL)
+ *efmp = NUL;
+ #ifdef USE_CRNL
+*** ../vim-6.2.253/src/version.c Wed Feb 11 14:40:25 2004
+--- src/version.c Sun Feb 15 13:00:44 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 254,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+142. You dream about creating the world's greatest web site.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.255
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.255
+Problem: GTK: A new item in the popup menu is put just after instead of
+ just before the right item. (Gabriel Zachmann)
+Solution: Don't increment the menu item index.
+Files: src/gui_gtk.c
+
+
+*** ../vim-6.2.254/src/gui_gtk.c Tue Feb 10 19:41:59 2004
+--- src/gui_gtk.c Thu Feb 12 12:46:10 2004
+***************
+*** 805,811 ****
+ return;
+
+ /* make place for the possible tearoff handle item */
+! ++idx;
+ if (menu_is_separator(menu->name))
+ {
+ /* Separator: Just add it */
+--- 805,813 ----
+ return;
+
+ /* make place for the possible tearoff handle item */
+! /* ++idx; Don't understand why this was here; makes adding an item to
+! * the popup menu appear after instead of before an existing item. */
+!
+ if (menu_is_separator(menu->name))
+ {
+ /* Separator: Just add it */
+*** ../vim-6.2.254/src/version.c Sun Feb 15 13:04:14 2004
+--- src/version.c Sun Feb 15 13:06:27 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 255,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+143. You dream in pallettes of 216 websafe colors.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.256
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.256
+Problem: Mac: "macroman" encoding isn't recognized, need to use
+ "8bit-macroman.
+Solution: Recognize "macroman" with an alias "mac". (Eckehard Berns)
+Files: src/mbyte.c
+
+
+*** ../vim-6.2.255/src/mbyte.c Mon Feb 9 18:45:58 2004
+--- src/mbyte.c Sat Feb 14 19:46:21 2004
+***************
+*** 216,222 ****
+ {"big5", ENC_DBCS, DBCS_CHT},
+ #define IDX_CP1251 35
+ {"cp1251", ENC_8BIT, 1251},
+! #define IDX_COUNT 36
+ };
+
+ /*
+--- 216,224 ----
+ {"big5", ENC_DBCS, DBCS_CHT},
+ #define IDX_CP1251 35
+ {"cp1251", ENC_8BIT, 1251},
+! #define IDX_MACROMAN 36
+! {"macroman", ENC_8BIT, 0},
+! #define IDX_COUNT 37
+ };
+
+ /*
+***************
+*** 290,295 ****
+--- 292,298 ----
+ {"cp950", IDX_BIG5},
+ {"950", IDX_BIG5},
+ #endif
++ {"mac", IDX_MACROMAN},
+ {NULL, 0}
+ };
+
+***************
+*** 523,529 ****
+ */
+ for (i = 0; i < 256; ++i)
+ {
+! /* Our own function to reliably check the lenght of UTF-8 characters,
+ * independent of mblen(). */
+ if (enc_utf8)
+ n = utf8len_tab[i];
+--- 526,532 ----
+ */
+ for (i = 0; i < 256; ++i)
+ {
+! /* Our own function to reliably check the length of UTF-8 characters,
+ * independent of mblen(). */
+ if (enc_utf8)
+ n = utf8len_tab[i];
+*** ../vim-6.2.255/src/version.c Sun Feb 15 13:08:28 2004
+--- src/version.c Sun Feb 15 13:10:13 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 256,
+ /**/
+
+--
+Drink wet cement and get really stoned.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.257
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.257 (after 6.2.250)
+Problem: Signs are deleted for ":bdel", but they could still be useful.
+Solution: Delete signs only for ":bwipe".
+Files: src/buffer.c
+
+
+*** ../vim-6.2.256/src/buffer.c Tue Feb 10 19:38:20 2004
+--- src/buffer.c Fri Feb 13 11:02:10 2004
+***************
+*** 564,572 ****
+ #ifdef FEAT_SYN_HL
+ syntax_clear(buf); /* reset syntax info */
+ #endif
+- #ifdef FEAT_SIGNS
+- buf_delete_signs(buf); /* delete any signs */
+- #endif
+ }
+
+ /*
+--- 564,569 ----
+***************
+*** 608,613 ****
+--- 605,613 ----
+ #endif
+ #ifdef FEAT_USR_CMDS
+ uc_clear(&buf->b_ucmds); /* clear local user commands */
++ #endif
++ #ifdef FEAT_SIGNS
++ buf_delete_signs(buf); /* delete any signs */
+ #endif
+ #ifdef FEAT_LOCALMAP
+ map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */
+*** ../vim-6.2.256/src/version.c Sun Feb 15 13:26:35 2004
+--- src/version.c Sun Feb 15 13:28:24 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 257,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+144. You eagerly await the update of the "Cool Site of the Day."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.258
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.258
+Problem: GUI: can't disable (grey-out) a popup menu item. (Ajit Thakkar)
+Solution: Loop over the popup menus for all modes.
+Files: src/menu.c
+
+
+*** ../vim-6.2.257/src/menu.c Sun Oct 12 16:42:14 2003
+--- src/menu.c Sun Feb 15 13:32:48 2004
+***************
+*** 331,340 ****
+--- 331,356 ----
+ {
+ /*
+ * Change sensitivity of the menu.
++ * For the PopUp menu, remove a menu for each mode separately.
+ * Careful: menu_nable_recurse() changes menu_path.
+ */
+ if (STRCMP(menu_path, "*") == 0) /* meaning: do all menus */
+ menu_path = (char_u *)"";
++
++ if (menu_is_popup(menu_path))
++ {
++ for (i = 0; i < MENU_INDEX_TIP; ++i)
++ if (modes & (1 << i))
++ {
++ p = popup_mode_name(menu_path, i);
++ if (p != NULL)
++ {
++ menu_nable_recurse(root_menu, p, MENU_ALL_MODES,
++ enable);
++ vim_free(p);
++ }
++ }
++ }
+ menu_nable_recurse(root_menu, menu_path, modes, enable);
+ }
+ else if (unmenu)
+***************
+*** 1629,1637 ****
+ return (STRNCMP(name, "PopUp", 5) == 0);
+ }
+
+! #if defined(FEAT_GUI_MOTIF) || defined(PROTO)
+ /*
+! * Return TRUE if "name" is part of a poup menu.
+ */
+ int
+ menu_is_child_of_popup(menu)
+--- 1645,1653 ----
+ return (STRNCMP(name, "PopUp", 5) == 0);
+ }
+
+! #if (defined(FEAT_GUI_MOTIF) && (XmVersion <= 1002)) || defined(PROTO)
+ /*
+! * Return TRUE if "name" is part of a popup menu.
+ */
+ int
+ menu_is_child_of_popup(menu)
+*** ../vim-6.2.257/src/version.c Sun Feb 15 13:29:04 2004
+--- src/version.c Sun Feb 15 13:31:40 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 258,
+ /**/
+
+--
+Fingers not found - Pound head on keyboard to continue.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.259
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.259
+Problem: If there are messages when exiting, on the console there is a
+ hit-enter prompt while the message can be read; in the GUI the
+ message may not be visible.
+Solution: Use the hit-enter prompt when there is an error message from
+ writing the viminfo file or autocommands, or when there is any
+ output in the GUI and 'verbose' is set. Don't use a hit-enter
+ prompt for the non-GUI version unless there is an error message.
+Files: src/main.c
+
+
+*** ../vim-6.2.258/src/main.c Sun Feb 8 17:09:51 2004
+--- src/main.c Thu Feb 12 15:23:40 2004
+***************
+*** 2185,2190 ****
+--- 2193,2202 ----
+ #endif
+ windgoto((int)Rows - 1, 0);
+
++ #ifdef FEAT_GUI
++ msg_didany = FALSE;
++ #endif
++
+ #ifdef FEAT_AUTOCMD
+ /* Trigger BufWinLeave for all windows, but only once per buffer. */
+ for (wp = firstwin; wp != NULL; )
+***************
+*** 2214,2234 ****
+
+ #ifdef FEAT_VIMINFO
+ if (*p_viminfo != NUL)
+- {
+ /* Write out the registers, history, marks etc, to the viminfo file */
+- msg_didany = FALSE;
+ write_viminfo(NULL, FALSE);
+! if (msg_didany) /* make the user read the error message */
+! {
+! no_wait_return = FALSE;
+! wait_return(FALSE);
+! }
+! }
+! #endif /* FEAT_VIMINFO */
+
+ #ifdef FEAT_AUTOCMD
+ apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, FALSE, curbuf);
+
+ /* Position the cursor again, the autocommands may have moved it */
+ # ifdef FEAT_GUI
+ if (!gui.in_use)
+--- 2226,2251 ----
+
+ #ifdef FEAT_VIMINFO
+ if (*p_viminfo != NUL)
+ /* Write out the registers, history, marks etc, to the viminfo file */
+ write_viminfo(NULL, FALSE);
+! #endif
+
+ #ifdef FEAT_AUTOCMD
+ apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, FALSE, curbuf);
++ #endif
++
++ if (did_emsg
++ #ifdef FEAT_GUI
++ || (gui.in_use && msg_didany && p_verbose > 0)
++ #endif
++ )
++ {
++ /* give the user a chance to read the (error) message */
++ no_wait_return = FALSE;
++ wait_return(FALSE);
++ }
+
++ #ifdef FEAT_AUTOCMD
+ /* Position the cursor again, the autocommands may have moved it */
+ # ifdef FEAT_GUI
+ if (!gui.in_use)
+*** ../vim-6.2.258/src/version.c Sun Feb 15 13:33:50 2004
+--- src/version.c Sun Feb 15 13:35:15 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 259,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+145. You e-mail your boss, informing him you'll be late.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.260
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.260
+Problem: GTK 2: Can't quit a dialog with <Esc>.
+ GTK 1 and 2: <Enter> always gives a result, even when the default
+ button has been disabled.
+Solution: Handle these keys explicitly. When no default button is specified
+ use the first one (works mostly like it was before).
+Files: src/gui_gtk.c
+
+
+*** ../vim-6.2.259/src/gui_gtk.c Sun Feb 15 13:08:28 2004
+--- src/gui_gtk.c Thu Feb 12 12:46:10 2004
+***************
+*** 1512,1517 ****
+--- 1512,1518 ----
+ typedef struct _CancelData
+ {
+ int *status;
++ int ignore_enter;
+ GtkWidget *dialog;
+ } CancelData;
+
+***************
+*** 1530,1535 ****
+--- 1531,1540 ----
+ static int
+ dlg_key_press_event(GtkWidget * widget, GdkEventKey * event, CancelData *data)
+ {
++ /* Ignore hitting Enter when there is no default button. */
++ if (data->ignore_enter && event->keyval == GDK_Return)
++ return TRUE;
++
+ if (event->keyval != GDK_Escape && event->keyval != GDK_Return)
+ return FALSE;
+
+***************
+*** 1820,1825 ****
+--- 1825,1831 ----
+
+ vim_free(names);
+
++ cancel_data.ignore_enter = FALSE;
+ if (butcount > 0)
+ {
+ --def_but; /* 1 is first button */
+***************
+*** 1830,1835 ****
+--- 1836,1844 ----
+ gtk_widget_grab_focus(button[def_but]);
+ gtk_widget_grab_default(button[def_but]);
+ }
++ else
++ /* No default, ignore hitting Enter. */
++ cancel_data.ignore_enter = TRUE;
+ }
+
+ if (textfield != NULL)
+***************
+*** 2103,2118 ****
+ * GUI used to work this way, and I consider the impact on UI consistency
+ * low enough to justify implementing this as a special Vim feature.
+ */
+ /*ARGSUSED2*/
+ static gboolean
+ dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+ {
+! if ((event->state & gtk_accelerator_get_default_mod_mask()) == 0)
+ {
+ return gtk_window_mnemonic_activate(
+ GTK_WINDOW(widget), event->keyval,
+ gtk_window_get_mnemonic_modifier(GTK_WINDOW(widget)));
+ }
+ return FALSE; /* continue emission */
+ }
+
+--- 2112,2149 ----
+ * GUI used to work this way, and I consider the impact on UI consistency
+ * low enough to justify implementing this as a special Vim feature.
+ */
++ typedef struct _DialogInfo
++ {
++ int ignore_enter; /* no default button, ignore "Enter" */
++ int noalt; /* accept accelerators without Alt */
++ GtkDialog *dialog; /* Widget of the dialog */
++ } DialogInfo;
++
+ /*ARGSUSED2*/
+ static gboolean
+ dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+ {
+! DialogInfo *di = (DialogInfo *)data;
+!
+! /* Ignore hitting "Enter" if there is no default button. */
+! if (di->ignore_enter && event->keyval == GDK_Return)
+! return TRUE;
+!
+! /* Close the dialog when hitting "Esc". */
+! if (event->keyval == GDK_Escape)
+! {
+! gtk_dialog_response(di->dialog, GTK_RESPONSE_REJECT);
+! return TRUE;
+! }
+!
+! if (di->noalt
+! && (event->state & gtk_accelerator_get_default_mod_mask()) == 0)
+ {
+ return gtk_window_mnemonic_activate(
+ GTK_WINDOW(widget), event->keyval,
+ gtk_window_get_mnemonic_modifier(GTK_WINDOW(widget)));
+ }
++
+ return FALSE; /* continue emission */
+ }
+
+***************
+*** 2128,2135 ****
+--- 2159,2168 ----
+ GtkWidget *entry = NULL;
+ char_u *text;
+ int response;
++ DialogInfo dialoginfo;
+
+ dialog = create_message_dialog(type, title, message);
++ dialoginfo.dialog = GTK_DIALOG(dialog);
+ dialog_add_buttons(GTK_DIALOG(dialog), buttons);
+
+ if (textfield != NULL)
+***************
+*** 2151,2168 ****
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
+ alignment, TRUE, FALSE, 0);
+ }
+ else
+! {
+! /* Allow activation of mnemonic accelerators without pressing <Alt>.
+! * For safety, connect this signal handler only if the dialog has
+! * no other other interaction widgets but buttons. */
+! g_signal_connect(G_OBJECT(dialog), "key_press_event",
+! G_CALLBACK(&dialog_key_press_event_cb), NULL);
+! }
+
+ if (def_but > 0)
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), def_but);
+
+ /* Show the mouse pointer if it's currently hidden. */
+ gui_mch_mousehide(FALSE);
+--- 2184,2207 ----
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
+ alignment, TRUE, FALSE, 0);
++ dialoginfo.noalt = FALSE;
+ }
+ else
+! dialoginfo.noalt = TRUE;
+!
+! /* Allow activation of mnemonic accelerators without pressing <Alt> when
+! * there is no textfield. Handle pressing Enter and Esc. */
+! g_signal_connect(G_OBJECT(dialog), "key_press_event",
+! G_CALLBACK(&dialog_key_press_event_cb), &dialoginfo);
+
+ if (def_but > 0)
++ {
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), def_but);
++ dialoginfo.ignore_enter = FALSE;
++ }
++ else
++ /* No default button, ignore pressing Enter. */
++ dialoginfo.ignore_enter = TRUE;
+
+ /* Show the mouse pointer if it's currently hidden. */
+ gui_mch_mousehide(FALSE);
+*** ../vim-6.2.259/src/version.c Sun Feb 15 13:37:22 2004
+--- src/version.c Sun Feb 15 13:39:01 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 260,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+146. You experience ACTUAL physical withdrawal symptoms when away
+ from your 'puter and the net.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.261
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.261
+Problem: When 'autoindent' and 'cindent' are set and a line is recognized
+ as a comment, starting a new line won't do 'cindent' formatting.
+Solution: Also use 'cindent' formatting for lines that are used as a
+ comment. (Servatius Brandt)
+Files: src/misc1.c
+
+
+*** ../vim-6.2.260/src/misc1.c Sun Feb 1 16:39:09 2004
+--- src/misc1.c Wed Feb 11 21:55:44 2004
+***************
+*** 1324,1332 ****
+ * May do indenting after opening a new line.
+ */
+ if (!p_paste
+- # ifdef FEAT_COMMENTS
+- && (leader == NULL || !curbuf->b_p_ai)
+- # endif
+ && (curbuf->b_p_cin
+ # ifdef FEAT_EVAL
+ || *curbuf->b_p_inde != NUL
+--- 1324,1329 ----
+*** ../vim-6.2.260/src/version.c Sun Feb 15 13:42:25 2004
+--- src/version.c Sun Feb 15 13:44:02 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 261,
+ /**/
+
+--
+We are the Borg of GNU GPL. We will assimilate your source code.
+Resistance is futile.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.262
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.262
+Problem: 1 CTRL-W w beeps, even though going to the first window is
+ possible. (Charles Campbell)
+Solution: Don't beep.
+Files: src/window.c
+
+
+*** ../vim-6.2.261/src/window.c Wed Feb 4 21:42:30 2004
+--- src/window.c Thu Feb 12 16:01:23 2004
+***************
+*** 222,228 ****
+ /* cursor to previous window with wrap around */
+ case 'W':
+ CHECK_CMDWIN
+! if (lastwin == firstwin) /* just one window */
+ beep_flush();
+ else
+ {
+--- 222,228 ----
+ /* cursor to previous window with wrap around */
+ case 'W':
+ CHECK_CMDWIN
+! if (lastwin == firstwin && Prenum != 1) /* just one window */
+ beep_flush();
+ else
+ {
+*** ../vim-6.2.261/src/version.c Sun Feb 15 13:44:45 2004
+--- src/version.c Sun Feb 15 13:46:41 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 262,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+147. You finally give up smoking...because it made the monitor dirty.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 6.2.263
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.2.263
+Problem: Lint warnings: Duplicate function prototypes, duplicate macros,
+ use of a zero character instead of a zero pointer, unused
+ variable. Clearing allocated memory in a complicated way.
+Solution: Remove the function prototypes from farsi.h. Remove the
+ duplicated lines in keymap.h. Change getvcol() argument from NUL
+ to NULL. Remove the "col" variable in regmatch(). Use
+ lalloc_clear() instead of lalloc(). (Walter Briscoe)
+Files: src/farsi.h, src/keymap.h, src/ops.c, src/regexp.c, src/search.c
+
+
+*** ../vim-6.2.262/src/farsi.h Sat Apr 14 22:20:29 2001
+--- src/farsi.h Wed Feb 11 15:12:51 2004
+***************
+*** 184,206 ****
+ #define W_R_L 0x2
+
+
+- /* prototypes */
+-
+- int fkmap __ARGS((int c));
+- int toF_TyA __ARGS((int c));
+- int F_isalpha __ARGS((int c));
+- int F_isdigit __ARGS((int c));
+- int F_ischar __ARGS((int c));
+- int cmdl_fkmap __ARGS((int c));
+- void cmd_pchar __ARGS((int c, int offset));
+- int cmd_gchar __ARGS((int offset));
+- void conv_to_pvim __ARGS((void));
+- void conv_to_pstd __ARGS((void));
+- char_u *lrswap __ARGS((char_u *ibuf));
+- char_u *lrFswap __ARGS((char_u *cmdbuf, int len));
+- char_u *lrF_sub __ARGS((char_u *ibuf));
+- void farsi_fkey __ARGS((cmdarg_T *cap));
+-
+ /* special Farsi text messages */
+
+ EXTERN char_u farsi_text_1[]
+--- 184,189 ----
+*** ../vim-6.2.262/src/keymap.h Sun May 4 22:43:37 2003
+--- src/keymap.h Wed Feb 11 15:14:54 2004
+***************
+*** 270,281 ****
+ #define K_XF3 TERMCAP2KEY(KS_EXTRA, KE_XF3)
+ #define K_XF4 TERMCAP2KEY(KS_EXTRA, KE_XF4)
+
+- /* extra set of function keys F1-F4, for vt100 compatible xterm */
+- #define K_XF1 TERMCAP2KEY(KS_EXTRA, KE_XF1)
+- #define K_XF2 TERMCAP2KEY(KS_EXTRA, KE_XF2)
+- #define K_XF3 TERMCAP2KEY(KS_EXTRA, KE_XF3)
+- #define K_XF4 TERMCAP2KEY(KS_EXTRA, KE_XF4)
+-
+ #define K_F1 TERMCAP2KEY('k', '1') /* function keys */
+ #define K_F2 TERMCAP2KEY('k', '2')
+ #define K_F3 TERMCAP2KEY('k', '3')
+--- 270,275 ----
+*** ../vim-6.2.262/src/ops.c Sun Jan 25 20:37:29 2004
+--- src/ops.c Wed Feb 11 15:17:11 2004
+***************
+*** 2696,2702 ****
+ #ifdef FEAT_VIRTUALEDIT
+ if (virtual_op)
+ {
+! getvcol(curwin, &oap->start, &cs, NUL, &ce);
+ if (ce != cs && oap->start.coladd > 0)
+ {
+ /* Part of a tab selected -- but don't
+--- 2696,2702 ----
+ #ifdef FEAT_VIRTUALEDIT
+ if (virtual_op)
+ {
+! getvcol(curwin, &oap->start, &cs, NULL, &ce);
+ if (ce != cs && oap->start.coladd > 0)
+ {
+ /* Part of a tab selected -- but don't
+***************
+*** 2715,2721 ****
+ #ifdef FEAT_VIRTUALEDIT
+ if (virtual_op)
+ {
+! getvcol(curwin, &oap->end, &cs, NUL, &ce);
+ if (p[endcol] == NUL || (cs + oap->end.coladd < ce
+ # ifdef FEAT_MBYTE
+ /* Don't add space for double-wide
+--- 2715,2721 ----
+ #ifdef FEAT_VIRTUALEDIT
+ if (virtual_op)
+ {
+! getvcol(curwin, &oap->end, &cs, NULL, &ce);
+ if (p[endcol] == NUL || (cs + oap->end.coladd < ce
+ # ifdef FEAT_MBYTE
+ /* Don't add space for double-wide
+*** ../vim-6.2.262/src/regexp.c Tue Feb 3 16:55:34 2004
+--- src/regexp.c Wed Feb 11 15:20:02 2004
+***************
+*** 2800,2808 ****
+ if (SETJMP(lc_jump_env) != 0)
+ {
+ mch_didjmp();
+! #ifdef SIGHASARG
+ if (lc_signal != SIGINT)
+! #endif
+ EMSG(_("E361: Crash intercepted; regexp too complex?"));
+ retval = 0L;
+ goto theend;
+--- 2800,2808 ----
+ if (SETJMP(lc_jump_env) != 0)
+ {
+ mch_didjmp();
+! # ifdef SIGHASARG
+ if (lc_signal != SIGINT)
+! # endif
+ EMSG(_("E361: Crash intercepted; regexp too complex?"));
+ retval = 0L;
+ goto theend;
+***************
+*** 4101,4107 ****
+ regsave_T save_after, save_start;
+ regsave_T save_behind_pos;
+ int needmatch = (op == BEHIND);
+- long col;
+
+ /*
+ * Look back in the input of the operand matches or not. This
+--- 4101,4106 ----
+***************
+*** 4124,4130 ****
+ * will match it. */
+ save_behind_pos = behind_pos;
+ behind_pos = save_start;
+! for (col = 0; ; ++col)
+ {
+ reg_restore(&save_start);
+ if (regmatch(OPERAND(scan))
+--- 4123,4129 ----
+ * will match it. */
+ save_behind_pos = behind_pos;
+ behind_pos = save_start;
+! for (;;)
+ {
+ reg_restore(&save_start);
+ if (regmatch(OPERAND(scan))
+*** ../vim-6.2.262/src/search.c Sun Jan 25 20:21:35 2004
+--- src/search.c Wed Feb 11 15:22:04 2004
+***************
+*** 3655,3671 ****
+ goto fpip_end;
+ def_regmatch.rm_ic = FALSE; /* don't ignore case in define pat. */
+ }
+! files = (SearchedFile *)lalloc((long_u)
+ (max_path_depth * sizeof(SearchedFile)), TRUE);
+ if (files == NULL)
+ goto fpip_end;
+- for (i = 0; i < max_path_depth; i++)
+- {
+- files[i].fp = NULL;
+- files[i].name = NULL;
+- files[i].lnum = 0;
+- files[i].matched = FALSE;
+- }
+ old_files = max_path_depth;
+ depth = depth_displayed = -1;
+
+--- 3655,3664 ----
+ goto fpip_end;
+ def_regmatch.rm_ic = FALSE; /* don't ignore case in define pat. */
+ }
+! files = (SearchedFile *)lalloc_clear((long_u)
+ (max_path_depth * sizeof(SearchedFile)), TRUE);
+ if (files == NULL)
+ goto fpip_end;
+ old_files = max_path_depth;
+ depth = depth_displayed = -1;
+
+*** ../vim-6.2.262/src/version.c Sun Feb 15 13:47:16 2004
+--- src/version.c Sun Feb 15 13:48:35 2004
+***************
+*** 639,640 ****
+--- 639,642 ----
+ { /* Add new patch number below this line */
++ /**/
++ 263,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+148. You find it easier to dial-up the National Weather Service
+ Weather/your_town/now.html than to simply look out the window.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
projects / packages / vim.git / commitdiff