summaryrefslogtreecommitdiffstats
path: root/src/globals.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-06 21:07:52 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-06 21:07:52 +0200
commit45d2eeaad66939348893b9254171067b0457cd9d (patch)
tree9259906f02afa0de6c6752982ad0c936e08033e5 /src/globals.h
parentbbe8d91e695184771d7e45315258fab8eb3e6b07 (diff)
patch 7.4.1903v7.4.1903
Problem: When writing viminfo merging current history with history in viminfo may drop recent history entries. Solution: Add new format for viminfo lines, use it for history entries. Use a timestamp for ordering the entries. Add test_settime(). Add the viminfo version. Does not do merging on timestamp yet.
Diffstat (limited to 'src/globals.h')
-rw-r--r--src/globals.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/globals.h b/src/globals.h
index 2e84e579cb..f5e1bb1321 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1639,6 +1639,10 @@ EXTERN int in_free_unref_items INIT(= FALSE);
EXTERN int did_add_timer INIT(= FALSE);
#endif
+#ifdef FEAT_EVAL
+EXTERN time_t time_for_testing INIT(= 0);
+#endif
+
/*
* Optional Farsi support. Include it here, so EXTERN and INIT are defined.
*/