summaryrefslogtreecommitdiff
path: root/data/vim/timestamp.diff
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2018-08-03 15:06:38 -1000
committerSam Bingner <sam@bingner.com>2018-08-03 15:06:38 -1000
commit135b410607f008d3709a7b1374f3f37924eb9fe4 (patch)
treef4756ef3a354f6001360db894db010df85177f76 /data/vim/timestamp.diff
parentbd1eb51da0d3f250793e1868d73babdf495c921f (diff)
Update vim
Diffstat (limited to 'data/vim/timestamp.diff')
-rw-r--r--data/vim/timestamp.diff65
1 files changed, 38 insertions, 27 deletions
diff --git a/data/vim/timestamp.diff b/data/vim/timestamp.diff
index dd3ec16d9..c54d24bf1 100644
--- a/data/vim/timestamp.diff
+++ b/data/vim/timestamp.diff
@@ -1,36 +1,23 @@
-diff -ru vim71/src/globals.h vim71+iPhone/src/globals.h
---- vim71/src/globals.h 2007-05-07 19:44:26.000000000 +0000
-+++ vim71+iPhone/src/globals.h 2008-06-18 02:18:30.000000000 +0000
-@@ -1080,11 +1080,7 @@
+diff -ur vim81/src/globals.h vim81+iPhone/src/globals.h
+--- vim81/src/globals.h 2018-07-27 10:35:59.000000000 -1000
++++ vim81+iPhone/src/globals.h 2018-07-27 11:41:21.000000000 -1000
+@@ -1133,11 +1133,7 @@
- /* these are in version.c */
+ /* These are in version.c, call init_longVersion() before use. */
extern char *Version;
-#if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
-extern char longVersion[];
-#else
- extern char *longVersion;
+-EXTERN char *longVersion;
-#endif
++extern char *longVersion;
/*
* Some file names are stored in pathdef.c, which is generated from the
-diff -ru vim71/src/main.c vim71+iPhone/src/main.c
---- vim71/src/main.c 2007-05-07 19:38:44.000000000 +0000
-+++ vim71+iPhone/src/main.c 2008-06-18 02:18:17.000000000 +0000
-@@ -235,10 +235,6 @@
- /* Init the table of Normal mode commands. */
- init_normal_cmds();
-
--#if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
-- make_version(); /* Construct the long version string. */
--#endif
--
- /*
- * Allocate space for the generic buffers (needed for set_init_1() and
- * EMSG2()).
-diff -ru vim71/src/version.c vim71+iPhone/src/version.c
---- vim71/src/version.c 2007-05-12 10:23:44.000000000 +0000
-+++ vim71+iPhone/src/version.c 2008-06-18 02:18:23.000000000 +0000
-@@ -30,29 +30,7 @@
+diff -ur vim81/src/version.c vim81+iPhone/src/version.c
+--- vim81/src/version.c 2018-07-27 10:36:00.000000000 -1000
++++ vim81+iPhone/src/version.c 2018-07-27 11:39:59.000000000 -1000
+@@ -31,45 +31,6 @@
char *Version = VIM_VERSION_SHORT;
static char *mediumVersion = VIM_VERSION_MEDIUM;
@@ -38,8 +25,9 @@ diff -ru vim71/src/version.c vim71+iPhone/src/version.c
-# if (defined(VMS) && defined(VAXC)) || defined(PROTO)
-char longVersion[sizeof(VIM_VERSION_LONG_DATE) + sizeof(__DATE__)
- + sizeof(__TIME__) + 3];
+-
- void
--make_version()
+-init_longVersion(void)
-{
- /*
- * Construct the long version string. Necessary because
@@ -51,12 +39,35 @@ diff -ru vim71/src/version.c vim71+iPhone/src/version.c
- strcat(longVersion, __TIME__);
- strcat(longVersion, ")");
-}
+-
-# else
--char *longVersion = VIM_VERSION_LONG_DATE __DATE__ " " __TIME__ ")";
+- void
+-init_longVersion(void)
+-{
+- char *date_time = __DATE__ " " __TIME__;
+- char *msg = _("%s (%s, compiled %s)");
+- size_t len = strlen(msg)
+- + strlen(VIM_VERSION_LONG_ONLY)
+- + strlen(VIM_VERSION_DATE_ONLY)
+- + strlen(date_time);
+-
+- longVersion = (char *)alloc((unsigned)len);
+- if (longVersion == NULL)
+- longVersion = VIM_VERSION_LONG;
+- else
+- vim_snprintf(longVersion, len, msg,
+- VIM_VERSION_LONG_ONLY, VIM_VERSION_DATE_ONLY, date_time);
+-}
-# endif
-#else
char *longVersion = VIM_VERSION_LONG;
+
+ void
+@@ -77,7 +38,6 @@
+ {
+ // nothing to do
+ }
-#endif
- static void version_msg __ARGS((char *s));
+ static void list_features(void);