From a935ab0109a1dc7c4d97d2f1d92f9f3d207be33c Mon Sep 17 00:00:00 2001 From: kloczek Date: Mon, 11 Sep 2000 00:26:09 +0000 Subject: [PATCH] - offcial vim patches from ftp://ftp.home.vim.org/pub/vim/patches. Changed files: 5.7.001 -> 1.1 5.7.002 -> 1.1 5.7.003 -> 1.1 5.7.004 -> 1.1 5.7.005 -> 1.1 5.7.006 -> 1.1 5.7.007 -> 1.1 5.7.008 -> 1.1 5.7.009 -> 1.1 --- 5.7.001 | 52 ++++++++++++++++ 5.7.002 | 57 ++++++++++++++++++ 5.7.003 | 47 +++++++++++++++ 5.7.004 | 46 +++++++++++++++ 5.7.005 | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5.7.006 | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ 5.7.007 | 57 ++++++++++++++++++ 5.7.008 | 44 ++++++++++++++ 5.7.009 | 60 +++++++++++++++++++ 9 files changed, 696 insertions(+) create mode 100644 5.7.001 create mode 100644 5.7.002 create mode 100644 5.7.003 create mode 100644 5.7.004 create mode 100644 5.7.005 create mode 100644 5.7.006 create mode 100644 5.7.007 create mode 100644 5.7.008 create mode 100644 5.7.009 diff --git a/5.7.001 b/5.7.001 new file mode 100644 index 0000000..00c00b9 --- /dev/null +++ b/5.7.001 @@ -0,0 +1,52 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.001 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.001 +Problem: When the current buffer is crypted, and another modified buffer + isn't, ":wall" will encrypt the other buffer. +Solution: In buf_write() use "buf" instead of "curbuf" to check for the + crypt key. +Files: src/fileio.c + + +*** ../vim-5.7/src/fileio.c Sat Jun 24 13:54:27 2000 +--- src/fileio.c Sun Jun 25 20:14:38 2000 +*************** +*** 1857,1865 **** + start = end + 1; + + #ifdef CRYPTV +! if (*curbuf->b_p_key) + { +! crypt_init_keys(curbuf->b_p_key); + encrypted = TRUE; + /* Write magic number, so that Vim knows that this file is encrypted + * when reading it again */ +--- 1857,1865 ---- + start = end + 1; + + #ifdef CRYPTV +! if (*buf->b_p_key) + { +! crypt_init_keys(buf->b_p_key); + encrypted = TRUE; + /* Write magic number, so that Vim knows that this file is encrypted + * when reading it again */ +*** ../vim-5.7/src/version.c Sat Jun 24 13:54:21 2000 +--- src/version.c Sun Jun 25 20:14:50 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 1, + /**/ + +-- +In a world without walls and borders, who needs windows and gates? + +/-/-- Bram Moolenaar --- Bram@moolenaar.net --- http://www.moolenaar.net --\-\ +\-\-- Vim: http://www.vim.org ---- ICCF Holland: http://www.vim.org/iccf --/-/ diff --git a/5.7.002 b/5.7.002 new file mode 100644 index 0000000..9554faa --- /dev/null +++ b/5.7.002 @@ -0,0 +1,57 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.002 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.002 +Problem: When 'showmode' is set, using "CTRL-O :r file" waits three seconds + before displaying the read text. (Wichert Akkerman) +Solution: Set "keep_msg" to the file message so that the screen is redrawn + before the three seconds wait for displaying the mode message. +Files: src/fileio.c + + +*** ../vim-5.7.1/src/fileio.c Tue Jun 27 20:51:18 2000 +--- src/fileio.c Tue Jun 27 10:22:03 2000 +*************** +*** 966,975 **** + #endif + keep_msg = msg_trunc_attr(IObuff, FALSE, 0); + keep_msg_attr = 0; +! if (read_stdin) + { + /* When reading from stdin, the screen will be cleared next; + * keep the message to repeat it later. + * Copy the message (truncated) to msg_buf, because IObuff + * could be overwritten any time. */ + STRNCPY(msg_buf, keep_msg, MSG_BUF_LEN); +--- 966,978 ---- + #endif + keep_msg = msg_trunc_attr(IObuff, FALSE, 0); + keep_msg_attr = 0; +! if (read_stdin || restart_edit != 0) + { + /* When reading from stdin, the screen will be cleared next; + * keep the message to repeat it later. ++ * When restart_edit is set, keep the message to show it after ++ * redrawing (otherwise there will be a delay before ++ * redrawing). + * Copy the message (truncated) to msg_buf, because IObuff + * could be overwritten any time. */ + STRNCPY(msg_buf, keep_msg, MSG_BUF_LEN); +*** ../vim-5.7.1/src/version.c Tue Jun 27 20:51:18 2000 +--- src/version.c Tue Jun 27 20:49:49 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 2, + /**/ + +-- +I have a watch cat! Just break in and she'll watch. + +/// Bram Moolenaar Bram@moolenaar.net http://www.moolenaar.net \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// diff --git a/5.7.003 b/5.7.003 new file mode 100644 index 0000000..2925c0d --- /dev/null +++ b/5.7.003 @@ -0,0 +1,47 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.003 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.003 +Problem: Searching for "[[:cntrl:]]" doesn't work. +Solution: Exclude NUL from the matching characters, it terminates the list. +Files: src/regexp.c + + +*** ../vim-5.7.2/src/regexp.c Wed Jun 7 16:13:32 2000 +--- src/regexp.c Fri Aug 4 21:23:15 2000 +*************** +*** 1211,1217 **** + regc(*regparse++); + else + /* Characters assumed to be 8 bits */ +! for (cu = 0; cu <= 255; cu++) + if ((*func)(cu)) + regc(cu); + } +--- 1211,1217 ---- + regc(*regparse++); + else + /* Characters assumed to be 8 bits */ +! for (cu = 1; cu <= 255; cu++) + if ((*func)(cu)) + regc(cu); + } +*** ../vim-5.7.2/src/version.c Tue Jun 27 20:54:03 2000 +--- src/version.c Fri Aug 4 21:43:24 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 3, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +118. You are on a first-name basis with your ISP's staff. + +/// Bram Moolenaar Bram@moolenaar.net http://www.moolenaar.net \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// diff --git a/5.7.004 b/5.7.004 new file mode 100644 index 0000000..92dd226 --- /dev/null +++ b/5.7.004 @@ -0,0 +1,46 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.004 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.004 +Problem: GTK: When selecting a new font, Vim can crash. +Solution: In gui_mch_init_font() unreference the old font, not the new one. +Files: src/gui_gtk_x11.c + + +*** ../vim-5.7.3/src/gui_gtk_x11.c Tue Jun 20 15:08:20 2000 +--- src/gui_gtk_x11.c Sat Aug 5 14:22:57 2000 +*************** +*** 2205,2211 **** + } + + if (gui.norm_font != 0) +! gdk_font_unref(font); + gui.norm_font = font; + #ifdef USE_FONTSET + if (font->type == GDK_FONT_FONTSET) +--- 2205,2211 ---- + } + + if (gui.norm_font != 0) +! gdk_font_unref(gui.norm_font); + gui.norm_font = font; + #ifdef USE_FONTSET + if (font->type == GDK_FONT_FONTSET) +*** ../vim-5.7.3/src/version.c Fri Aug 4 21:51:08 2000 +--- src/version.c Sat Aug 5 14:23:49 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 4, + /**/ + +-- +I have a watch cat! Just break in and she'll watch. + +/// Bram Moolenaar Bram@moolenaar.net http://www.moolenaar.net \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// diff --git a/5.7.005 b/5.7.005 new file mode 100644 index 0000000..087cceb --- /dev/null +++ b/5.7.005 @@ -0,0 +1,179 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.005 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.005 +Problem: Multibyte: Inserting a wrapped line corrupts kterm screen. + Pasting TEXT/COMPOUND_TEXT into Vim does not work. + On Motif no XIM status line is displayed even though it is + available. +Solution: Don't use xterm trick for wrapping lines for multibyte mode. + Correct a missing "break", added TEXT/COMPOUND_TEXT selection + request. + Add XIMStatusArea fallback code. + (Katsuhito Nagano) +Files: src/gui_gtk_x11.c, src/multbyte.c, src/screen.c, src/ui.c + + +*** ../vim-5.7.4/src/gui_gtk_x11.c Sat Aug 5 14:26:52 2000 +--- src/gui_gtk_x11.c Sat Aug 5 14:22:57 2000 +*************** +*** 1444,1452 **** + #define VIM_ATOM_NAME "_VIM_TEXT" + static const GtkTargetEntry primary_targets[] = { + {VIM_ATOM_NAME, 0, SELECTION_CLIPBOARD}, +! {"STRING", 0, SELECTION_STRING}, + {"TEXT", 0, SELECTION_TEXT}, +! {"COMPOUND_TEXT", 0, SELECTION_COMPOUND_TEXT} + }; + + /* +--- 1444,1452 ---- + #define VIM_ATOM_NAME "_VIM_TEXT" + static const GtkTargetEntry primary_targets[] = { + {VIM_ATOM_NAME, 0, SELECTION_CLIPBOARD}, +! {"COMPOUND_TEXT", 0, SELECTION_COMPOUND_TEXT}, + {"TEXT", 0, SELECTION_TEXT}, +! {"STRING", 0, SELECTION_STRING} + }; + + /* +*************** +*** 3130,3135 **** +--- 3130,3155 ---- + gtk_main(); /* wait for selection_received_event */ + + if (received_selection == RS_FAIL) ++ { ++ /* Now try to get it out of the usual string selection. */ ++ received_selection = RS_NONE; ++ (void)gtk_selection_convert(gui.drawarea, GDK_SELECTION_PRIMARY, ++ gdk_atom_intern("COMPOUND_TEXT", FALSE), ++ (guint32)GDK_CURRENT_TIME); ++ while (received_selection == RS_NONE) ++ gtk_main(); /* wait for selection_received_event */ ++ } ++ if (received_selection == RS_FAIL) ++ { ++ /* Now try to get it out of the usual string selection. */ ++ received_selection = RS_NONE; ++ (void)gtk_selection_convert(gui.drawarea, GDK_SELECTION_PRIMARY, ++ gdk_atom_intern("TEXT", FALSE), ++ (guint32)GDK_CURRENT_TIME); ++ while (received_selection == RS_NONE) ++ gtk_main(); /* wait for selection_received_event */ ++ } ++ if (received_selection == RS_FAIL) + { + /* Now try to get it out of the usual string selection. */ + received_selection = RS_NONE; +*** ../vim-5.7.4/src/multbyte.c Wed Jun 7 12:29:37 2000 +--- src/multbyte.c Sat Aug 5 14:22:57 2000 +*************** +*** 520,526 **** + } + + #if defined(USE_GUI_X11) || defined(PROTO) +! # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 + # define USE_X11R6_XIM + # endif + +--- 520,526 ---- + } + + #if defined(USE_GUI_X11) || defined(PROTO) +! # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(sun) + # define USE_X11R6_XIM + # endif + +*************** +*** 724,737 **** + found = True; + break; + } +! if ((xim_styles->supported_styles[i] & this_input_style) +! == (this_input_style & ~XIMStatusArea)) + { +! this_input_style &= ~XIMStatusArea; +! found = True; +! break; + } +- } + + s = ns; + } +--- 724,741 ---- + found = True; + break; + } +! } +! if (!found) +! for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) + { +! if ((xim_styles->supported_styles[i] & this_input_style) +! == (this_input_style & ~XIMStatusArea)) +! { +! this_input_style &= ~XIMStatusArea; +! found = True; +! break; +! } + } + + s = ns; + } +*** ../vim-5.7.4/src/screen.c Wed Jun 7 14:43:59 2000 +--- src/screen.c Sat Aug 5 14:22:57 2000 +*************** +*** 1746,1751 **** +--- 1746,1754 ---- + #ifdef USE_GUI + && !gui.in_use + #endif ++ #ifdef MULTI_BYTE ++ && !is_dbcs ++ #endif + ) + { + if (screen_cur_col != Columns) +*** ../vim-5.7.4/src/ui.c Sat Jun 3 11:37:13 2000 +--- src/ui.c Sat Aug 5 14:22:57 2000 +*************** +*** 1523,1531 **** + { + switch (i) + { +! case 0: type = clipboard.xatom; +! case 1: type = clipboard.xa_compound_text; +! case 2: type = clipboard.xa_text; + default: type = XA_STRING; + } + XtGetSelectionValue(myShell, XA_PRIMARY, type, +--- 1523,1531 ---- + { + switch (i) + { +! case 0: type = clipboard.xatom; break; +! case 1: type = clipboard.xa_compound_text; break; +! case 2: type = clipboard.xa_text; break; + default: type = XA_STRING; + } + XtGetSelectionValue(myShell, XA_PRIMARY, type, +*** ../vim-5.7.4/src/version.c Sat Aug 5 14:27:00 2000 +--- src/version.c Sat Aug 5 14:36:42 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 5, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +125. You begin to wonder how often it REALLY is necessary to get up + and shower or bathe. + +/// Bram Moolenaar Bram@moolenaar.net http://www.moolenaar.net \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// diff --git a/5.7.006 b/5.7.006 new file mode 100644 index 0000000..a266da1 --- /dev/null +++ b/5.7.006 @@ -0,0 +1,154 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.006 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.006 +Problem: GUI: redrawing the non-Visual selection is wrong when the window + is unobscured. (Jean-Pierre Etienne) +Solution: Redraw the selection properly and don't clear it. Added "len" + argument to clip_may_redraw_selection(). +Files: src/gui.c, src/ui.c, src/proto/ui.pro + + +*** ../vim-5.7.5/src/gui.c Sun Jun 18 13:56:27 2000 +--- src/gui.c Sat Aug 5 15:45:18 2000 +*************** +*** 1542,1550 **** + /* Draw the text */ + gui_mch_draw_string(gui.row, col, s, len, draw_flags); + +! /* May need to invert it when it's part of the selection (assumes len==1) */ + if (flags & GUI_MON_NOCLEAR) +! clip_may_redraw_selection(gui.row, col); + + if (!(flags & (GUI_MON_IS_CURSOR | GUI_MON_TRS_CURSOR))) + { +--- 1542,1550 ---- + /* Draw the text */ + gui_mch_draw_string(gui.row, col, s, len, draw_flags); + +! /* May need to invert it when it's part of the selection. */ + if (flags & GUI_MON_NOCLEAR) +! clip_may_redraw_selection(gui.row, col, len); + + if (!(flags & (GUI_MON_IS_CURSOR | GUI_MON_TRS_CURSOR))) + { +*************** +*** 1609,1615 **** + row2 = Y_2_ROW(y + h - 1); + col2 = X_2_COL(x + w - 1); + +! (void)gui_redraw_block(row1, col1, row2, col2, 0); + + /* + * We may need to redraw the cursor, but don't take it upon us to change +--- 1609,1615 ---- + row2 = Y_2_ROW(y + h - 1); + col2 = X_2_COL(x + w - 1); + +! (void)gui_redraw_block(row1, col1, row2, col2, GUI_MON_NOCLEAR); + + /* + * We may need to redraw the cursor, but don't take it upon us to change +*************** +*** 1620,1628 **** + */ + if (gui.row == gui.cursor_row) + gui_update_cursor(FALSE, TRUE); +- +- if (clipboard.state != SELECT_CLEARED) +- clip_redraw_selection(x, y, w, h); + } + + /* +--- 1620,1625 ---- +*** ../vim-5.7.5/src/ui.c Sat Aug 5 15:43:46 2000 +--- src/ui.c Sat Aug 5 15:33:18 2000 +*************** +*** 742,761 **** + } + + /* +! * Redraw the selection if character at "row,col" is inside of it. + */ + void +! clip_may_redraw_selection(row, col) +! int row, col; + { + if (clipboard.state != SELECT_CLEARED +! && ((row == clipboard.start.lnum +! && col >= (int)clipboard.start.col) +! || row > clipboard.start.lnum) +! && ((row == clipboard.end.lnum +! && col < (int)clipboard.end.col) +! || row < clipboard.end.lnum)) +! clip_invert_area(row, col, row, col + 1); + } + + /* +--- 742,768 ---- + } + + /* +! * Redraw part of the selection if character at "row,col" is inside of it. + */ + void +! clip_may_redraw_selection(row, col, len) +! int row, col; +! int len; + { ++ int start = col; ++ int end = col + len; ++ + if (clipboard.state != SELECT_CLEARED +! && row >= clipboard.start.lnum +! && row <= clipboard.end.lnum) +! { +! if (row == clipboard.start.lnum && start < (int)clipboard.start.col) +! start = clipboard.start.col; +! if (row == clipboard.end.lnum && end > (int)clipboard.end.col) +! end = clipboard.end.col; +! if (end > start) +! clip_invert_area(row, start, row, end); +! } + } + + /* +*** ../vim-5.7.5/src/proto/ui.pro Sat Jun 24 11:19:16 2000 +--- src/proto/ui.pro Sat Aug 5 15:33:41 2000 +*************** +*** 19,25 **** + void clip_start_selection __ARGS((int button, int x, int y, int repeated_click, int_u modifiers)); + void clip_process_selection __ARGS((int button, int x, int y, int repeated_click, int_u modifiers)); + void clip_redraw_selection __ARGS((int x, int y, int w, int h)); +! void clip_may_redraw_selection __ARGS((int row, int col)); + void clip_clear_selection __ARGS((void)); + void clip_may_clear_selection __ARGS((int row1, int row2)); + void clip_scroll_selection __ARGS((int rows)); +--- 19,25 ---- + void clip_start_selection __ARGS((int button, int x, int y, int repeated_click, int_u modifiers)); + void clip_process_selection __ARGS((int button, int x, int y, int repeated_click, int_u modifiers)); + void clip_redraw_selection __ARGS((int x, int y, int w, int h)); +! void clip_may_redraw_selection __ARGS((int row, int col, int len)); + void clip_clear_selection __ARGS((void)); + void clip_may_clear_selection __ARGS((int row1, int row2)); + void clip_scroll_selection __ARGS((int rows)); +*** ../vim-5.7.5/src/version.c Sat Aug 5 15:43:46 2000 +--- src/version.c Sat Aug 5 15:42:30 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 6, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +126. You brag to all of your friends about your date Saturday night...but + you don't tell them it was only in a chat room. + +/// Bram Moolenaar Bram@moolenaar.net http://www.moolenaar.net \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// diff --git a/5.7.007 b/5.7.007 new file mode 100644 index 0000000..857e8f5 --- /dev/null +++ b/5.7.007 @@ -0,0 +1,57 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.007 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.007 +Problem: Python: Crash when using the current buffer twice. +Solution: Increase the reference count for buffer and window objects. + (Johannes Zellner) +Files: src/if_python.c + + +*** ../vim-5.7.6/src/if_python.c Sat Sep 11 20:19:46 1999 +--- src/if_python.c Sat Aug 5 16:20:51 2000 +*************** +*** 897,903 **** +--- 897,906 ---- + BufferObject *self; + + if (buf->python_ref) ++ { + self = buf->python_ref; ++ Py_INCREF(self); ++ } + else + { + self = PyObject_NEW(BufferObject, &BufferType); +*************** +*** 1367,1373 **** +--- 1370,1379 ---- + WindowObject *self; + + if (win->python_ref) ++ { + self = win->python_ref; ++ Py_INCREF(self); ++ } + else + { + self = PyObject_NEW(WindowObject, &WindowType); +*** ../vim-5.7.6/src/version.c Sat Aug 5 15:47:11 2000 +--- src/version.c Sat Aug 5 16:20:45 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 7, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +127. You bring your laptop and cellular phone to church. + +/// Bram Moolenaar Bram@moolenaar.net http://www.moolenaar.net \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// diff --git a/5.7.008 b/5.7.008 new file mode 100644 index 0000000..9e73c4f --- /dev/null +++ b/5.7.008 @@ -0,0 +1,44 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.008 +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.008 +Problem: In Ex mode, backspacing over the first TAB doesn't work properly. + (Wichert Akkerman) +Solution: Switch the cursor on before printing the newline. +Files: src/ex_getln.c + + +*** ../vim-5.7.7/src/ex_getln.c Mon Jun 5 12:35:31 2000 +--- src/ex_getln.c Sat Aug 5 16:48:39 2000 +*************** +*** 1408,1413 **** +--- 1408,1417 ---- + int vcol = 0; + #endif + ++ /* Switch cursor on now. This avoids that it happens after the "\n", which ++ * confuses the system function that computes tabstops. */ ++ cursor_on(); ++ + /* always start in column 0; write a newline if necessary */ + compute_cmdrow(); + if (msg_col) +*** ../vim-5.7.7/src/version.c Sat Aug 5 16:22:38 2000 +--- src/version.c Sat Aug 5 16:52:29 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 8, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +128. You can access the Net -- via your portable and cellular phone. + +/// Bram Moolenaar Bram@moolenaar.net http://www.moolenaar.net \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// diff --git a/5.7.009 b/5.7.009 new file mode 100644 index 0000000..cb604e5 --- /dev/null +++ b/5.7.009 @@ -0,0 +1,60 @@ +To: vim-dev@vim.org +Subject: Patch 5.7.009 (extra) +Fcc: outbox +From: Bram Moolenaar +------------ + +Patch 5.7.009 (extra) +Problem: Mac: Crash when using a long file. +Solution: Don't redefine malloc() and free(), because it will break using + realloc(). +Files: src/os_mac.h + + +*** ../vim-5.7.8/src/os_mac.h Wed Jun 7 12:30:32 2000 +--- src/os_mac.h Sun Jul 23 12:45:19 2000 +*************** +*** 31,42 **** + #include + #include + + /* + * Use Macintosh subroutine to alloc the memory. + * (malloc generate Ptr format hard to debug with ZoneRanger) + */ +! #define malloc(x) NewPtr(x) +! #define free(x) DisposePtr((char *) x) + + /* This will go away when CMD_KEY fully tested */ + #define USE_CMD_KEY +--- 31,44 ---- + #include + #include + ++ #if 0 /* this doesn't work, because realloc() isn't redefined */ + /* + * Use Macintosh subroutine to alloc the memory. + * (malloc generate Ptr format hard to debug with ZoneRanger) + */ +! # define malloc(x) NewPtr(x) +! # define free(x) DisposePtr((char *) x) +! #endif + + /* This will go away when CMD_KEY fully tested */ + #define USE_CMD_KEY +*** ../vim-5.7.8/src/version.c Sat Aug 5 16:53:54 2000 +--- src/version.c Mon Aug 7 09:52:55 2000 +*************** +*** 439,440 **** +--- 439,442 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 9, + /**/ + +-- +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 \\\ +\\\ Vim: http://www.vim.org ICCF Holland: http://iccf-holland.org /// -- 2.44.0