Mercurial > vim
changeset 5905:662ae48e7e24 v7.4.295
updated for version 7.4.295
Problem: Various typos, bad white space and unclear comments.
Solution: Fix typos. Improve white space. Update comments.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 13 May 2014 20:19:58 +0200 |
| parents | 132c45d84bf3 |
| children | 193d5a5f3e58 |
| files | src/gui_gtk_x11.c src/macros.h src/os_unix.c src/screen.c src/structs.h src/testdir/test49.in src/version.c |
| diffstat | 7 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -2054,6 +2054,7 @@ write_session_file(char_u *filename) ssop_flags = save_ssop_flags; g_free(mksession_cmdline); + /* * Reopen the file and append a command to restore v:this_session, * as if this save never happened. This is to avoid conflicts with
--- a/src/macros.h +++ b/src/macros.h @@ -264,7 +264,7 @@ # define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len)(p) : 1 /* Advance multi-byte pointer, do not skip over composing chars. */ # define mb_cptr_adv(p) p += enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1 -/* Backup multi-byte pointer. */ +/* Backup multi-byte pointer. Only use with "p" > "s" ! */ # define mb_ptr_back(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1 /* get length of multi-byte char, not including composing chars */ # define mb_cptr2len(p) (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -3783,7 +3783,7 @@ check_mouse_termcode() del_mouse_termcode(KS_URXVT_MOUSE); # endif # ifdef FEAT_MOUSE_SGR - /* same as the dec mouse */ + /* There is no conflict with xterm mouse */ if (use_xterm_mouse() == 4 # ifdef FEAT_GUI && !gui.in_use
--- a/src/screen.c +++ b/src/screen.c @@ -2456,8 +2456,8 @@ fold_line(wp, fold_count, foldinfo, lnum if (len > 0) { int w = number_width(wp); - long num; - char *fmt = "%*ld "; + long num; + char *fmt = "%*ld "; if (len > w + 1) len = w + 1;
--- a/src/structs.h +++ b/src/structs.h @@ -572,7 +572,7 @@ struct memfile unsigned mf_page_size; /* number of bytes in a page */ int mf_dirty; /* TRUE if there are dirty blocks */ #ifdef FEAT_CRYPT - buf_T *mf_buffer; /* bufer this memfile is for */ + buf_T *mf_buffer; /* buffer this memfile is for */ char_u mf_seed[MF_SEED_LEN]; /* seed for encryption */ /* Values for key, method and seed used for reading data blocks when
--- a/src/testdir/test49.in +++ b/src/testdir/test49.in @@ -1,7 +1,7 @@ This is a test of the script language. If after adding a new test, the test output doesn't appear properly in -test49.failed, try to add one ore more "G"s at the line ending in "test.out" +test49.failed, try to add one or more "G"s at the line ending in "test.out" STARTTEST :so small.vim