1 files changed, 10 insertions, 101 deletions

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 043b720743..efefcc3c6f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1,14 +1,7 @@
 /// @file version.c
 ///
-/// Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred)
-/// It has been changed beyond recognition since then.
-///
-/// Differences between version 6.x and 7.x can be found with ":help version7".
-/// Differences between version 5.x and 6.x can be found with ":help version6".
-/// Differences between version 4.x and 5.x can be found with ":help version5".
-/// Differences between version 3.0 and 4.x can be found with ":help version4".
-/// All the remarks about older versions have been removed, they are not very
-/// interesting.
+/// Nvim was forked from Vim 7.4.160.
+/// Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred).
 
 #include <inttypes.h>
 
@@ -25,10 +18,8 @@
 #include "nvim/version_defs.h"
 
 char *Version = VIM_VERSION_SHORT;
-static char *mediumVersion = VIM_VERSION_MEDIUM;
-
-char *longVersion = VIM_VERSION_LONG_DATE __DATE__ " " __TIME__ ")";
-
+char *longVersion = NVIM_VERSION_LONG " (compiled " __DATE__ " " __TIME__ ")";
+char *version_commit = "Commit: " NVIM_VERSION_COMMIT;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "version.c.generated.h"
@@ -752,60 +743,24 @@ static void list_features(void)
 
 void list_version(void)
 {
-  int i;
-  int first;
-  char *s = "";
-
   // When adding features here, don't forget to update the list of
   // internal variables in eval.c!
   MSG(longVersion);
-
-  // Print the list of patch numbers if there is at least one.
-  // Print a range when patches are consecutive: "1-10, 12, 15-40, 42-45"
-  if (included_patches[0] != 0) {
-    MSG_PUTS(_("\nIncluded patches: "));
-    first = -1;
-
-    // find last one
-    for (i = 0; included_patches[i] != 0; ++i) {}
-
-    while (--i >= 0) {
-      if (first < 0) {
-        first = included_patches[i];
-      }
-
-      if ((i == 0) || (included_patches[i - 1] != included_patches[i] + 1)) {
-        MSG_PUTS(s);
-        s = ", ";
-        msg_outnum((long)first);
-
-        if (first != included_patches[i]) {
-          MSG_PUTS("-");
-          msg_outnum((long)included_patches[i]);
-        }
-        first = -1;
-      }
-    }
-  }
+  MSG(version_commit);
 
   // Print the list of extra patch descriptions if there is at least one.
+  char *s = "";
   if (extra_patches[0] != NULL) {
     MSG_PUTS(_("\nExtra patches: "));
     s = "";
 
-    for (i = 0; extra_patches[i] != NULL; ++i) {
+    for (int i = 0; extra_patches[i] != NULL; ++i) {
       MSG_PUTS(s);
       s = ", ";
       MSG_PUTS(extra_patches[i]);
     }
   }
 
-#ifdef MODIFIED_BY
-  MSG_PUTS("\n");
-  MSG_PUTS(_("Modified by "));
-  MSG_PUTS(MODIFIED_BY);
-#endif  // ifdef MODIFIED_BY
-
 #ifdef HAVE_PATHDEF
 
   if ((*compiled_user != NUL) || (*compiled_sys != NUL)) {
@@ -823,8 +778,6 @@ void list_version(void)
   }
 #endif  // ifdef HAVE_PATHDEF
 
-  MSG_PUTS(_("\nHuge version "));
-  MSG_PUTS(_("without GUI."));
   version_msg(_("  Features included (+) or not (-):\n"));
 
   list_features();
@@ -872,11 +825,6 @@ void list_version(void)
     version_msg((char *)default_vimruntime_dir);
     version_msg("\"\n");
   }
-  version_msg(_("Compilation: "));
-  version_msg((char *)all_cflags);
-  version_msg("\n");
-  version_msg(_("Linking: "));
-  version_msg((char *)all_lflags);
 #endif  // ifdef HAVE_PATHDEF
 #ifdef DEBUG
   version_msg("\n");
@@ -929,13 +877,9 @@ void intro_message(int colon)
   int sponsor;
   char *p;
   static char *(lines[]) = {
-    N_("VIM - Vi IMproved"),
+    N_(NVIM_VERSION_LONG),
     "",
-    N_("version "),
     N_("by Bram Moolenaar et al."),
-#ifdef MODIFIED_BY
-    " ",
-#endif  // ifdef MODIFIED_BY
     N_("Vim is open source and freely distributable"),
     "",
     N_("Help poor children in Uganda!"),
@@ -943,7 +887,6 @@ void intro_message(int colon)
     "",
     N_("type  :q<Enter>               to exit         "),
     N_("type  :help<Enter>  or  <F1>  for on-line help"),
-    N_("type  :help version7<Enter>   for version info"),
     NULL,
     "",
     N_("Running in Vi compatible mode"),
@@ -1001,7 +944,7 @@ void intro_message(int colon)
       }
 
       if (*p != NUL) {
-        do_intro_line(row, (char_u *)_(p), i == 2, 0);
+        do_intro_line(row, (char_u *)_(p), 0);
       }
       row++;
     }
@@ -1013,45 +956,16 @@ void intro_message(int colon)
   }
 }
 
-static void do_intro_line(int row, char_u *mesg, int add_version, int attr)
+static void do_intro_line(int row, char_u *mesg, int attr)
 {
-  char_u vers[20];
   int col;
   char_u *p;
   int l;
   int clen;
 
-#ifdef MODIFIED_BY
-# define MODBY_LEN 150
-  char_u modby[MODBY_LEN];
-
-  if (*mesg == ' ') {
-    l = STRLCPY(modby, _("Modified by "), MODBY_LEN);
-    if (l < MODBY_LEN - 1) {
-      STRLCPY(modby + l, MODIFIED_BY, MODBY_LEN - l);
-    }
-    mesg = modby;
-  }
-#endif  // ifdef MODIFIED_BY
-
   // Center the message horizontally.
   col = vim_strsize(mesg);
 
-  if (add_version) {
-    STRCPY(vers, mediumVersion);
-
-    if (highest_patch()) {
-      // Check for 9.9x or 9.9xx, alpha/beta version
-      if (isalpha((int)vers[3])) {
-        int len = (isalpha((int)vers[4])) ? 5 : 4;
-        sprintf((char *)vers + len, ".%d%s", highest_patch(),
-                mediumVersion + len);
-      } else {
-        sprintf((char *)vers + 3,   ".%d",   highest_patch());
-      }
-    }
-    col += (int)STRLEN(vers);
-  }
   col = (Columns - col) / 2;
 
   if (col < 0) {
@@ -1074,11 +988,6 @@ static void do_intro_line(int row, char_u *mesg, int add_version, int attr)
     screen_puts_len(p, l, row, col, *p == '<' ? hl_attr(HLF_8) : attr);
     col += clen;
   }
-
-  // Add the version number to the version line.
-  if (add_version) {
-    screen_puts(vers, row, col, 0);
-  }
 }
 
 /// ":intro": clear screen, display intro screen and wait for return.