Mercurial > vim

comparison src/ex_cmds.c @ 9256:26c7bf23ec1d v7.4.1911

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/1fd99c1ca89a3d13bb53aff4a5a8f5ee740713e5 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jun 9 20:24:28 2016 +0200 patch 7.4.1911 Problem: Recent history lines may be lost when exiting Vim. Solution: Merge history using the timestamp.
author Christian Brabandt <cb@256bit.org>
date Thu, 09 Jun 2016 20:30:07 +0200
parents 9c751c33dc0f
children ac8180818504
comparison
equal deleted inserted replaced
9255:8735c9123f66 9256:26c7bf23ec1d
1753 static int read_viminfo_barline(vir_T *virp, int got_encoding, int writing); 1753 static int read_viminfo_barline(vir_T *virp, int got_encoding, int writing);
1754 static void write_viminfo_version(FILE *fp_out); 1754 static void write_viminfo_version(FILE *fp_out);
1755 static void write_viminfo_barlines(vir_T *virp, FILE *fp_out); 1755 static void write_viminfo_barlines(vir_T *virp, FILE *fp_out);
1756 static int viminfo_errcnt; 1756 static int viminfo_errcnt;
1757 1757
1758 #define VIMINFO_VERSION 2
1759 #define VIMINFO_VERSION_WITH_HISTORY 2
1760
1761 static int 1758 static int
1762 no_viminfo(void) 1759 no_viminfo(void)
1763 { 1760 {
1764 /* "vim -i NONE" does not read or write a viminfo file */ 1761 /* "vim -i NONE" does not read or write a viminfo file */
1765 return (use_viminfo != NULL && STRCMP(use_viminfo, "NONE") == 0); 1762 return (use_viminfo != NULL && STRCMP(use_viminfo, "NONE") == 0);
2304 } 2301 }
2305 2302
2306 #ifdef FEAT_CMDHIST 2303 #ifdef FEAT_CMDHIST
2307 /* Finish reading history items. */ 2304 /* Finish reading history items. */
2308 if (!writing) 2305 if (!writing)
2309 finish_viminfo_history(); 2306 finish_viminfo_history(virp);
2310 #endif 2307 #endif
2311 2308
2312 /* Change file names to buffer numbers for fmarks. */ 2309 /* Change file names to buffer numbers for fmarks. */
2313 for (buf = firstbuf; buf != NULL; buf = buf->b_next) 2310 for (buf = firstbuf; buf != NULL; buf = buf->b_next)
2314 fmarks_check_names(buf); 2311 fmarks_check_names(buf);