To: vim-dev@vim.org Subject: patch 5.5.030 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.5.030 Problem: Unix: in os_unix.c, "term_str" is used, which is also defined in vim.h as a macro. (wuxin) Solution: Renamed "term_str" to "buf" in do_xterm_trace(). Files: src/os_unix.c *** ../vim-5.5.29/src/os_unix.c Sun Oct 17 17:18:13 1999 --- src/os_unix.c Tue Oct 19 11:52:22 1999 *************** *** 3974,3980 **** int win_x, win_y; int row, col; int_u mask_return; ! char_u term_str[50]; char_u *strp; long got_hints; static char_u *mouse_code; --- 3974,3980 ---- int win_x, win_y; int row, col; int_u mask_return; ! char_u buf[50]; char_u *strp; long got_hints; static char_u *mouse_code; *************** *** 4032,4044 **** if (row == prev_row && col == prev_col) return TRUE; ! STRCPY(term_str, mouse_code); ! strp = term_str + STRLEN(term_str); *strp++ = xterm_button | MOUSE_DRAG; *strp++ = (char_u)(col + ' ' + 1); *strp++ = (char_u)(row + ' ' + 1); *strp = 0; ! add_to_input_buf(term_str, STRLEN(term_str)); prev_row = row; prev_col = col; --- 4032,4044 ---- if (row == prev_row && col == prev_col) return TRUE; ! STRCPY(buf, mouse_code); ! strp = buf + STRLEN(buf); *strp++ = xterm_button | MOUSE_DRAG; *strp++ = (char_u)(col + ' ' + 1); *strp++ = (char_u)(row + ' ' + 1); *strp = 0; ! add_to_input_buf(buf, STRLEN(buf)); prev_row = row; prev_col = col; *** ../vim-5.5.29/src/version.c Tue Oct 19 20:45:17 1999 --- src/version.c Tue Oct 19 20:44:58 1999 *************** *** 420,420 **** --- 420,421 ---- { /* Add new patch number below this line */ + 30, -- If an elephant is left tied to a parking meter, the parking fee has to be paid just as it would for a vehicle. [real standing law in Florida, United States of America] --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /