reduce number of versions

diff --git a/commands.c b/commands.c
index 9254b4424091a85e40aeb1736cee8ae042c656ba..d6b77d0056295bfe44ab84dcee33eca982e87453 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -1071,14 +1071,6 @@ int mutt_save_message(struct Header *h, bool delete, bool decode, bool decrypt)
   return -1;
 }
 
-/**
- * mutt_version - Generate the NeoMutt version string
- */
-void mutt_version(void)
-{
-  mutt_message("NeoMutt %s%s", PACKAGE_VERSION, GitVer);
-}
-
 /**
  * mutt_edit_content_type - Edit the content type of an attachment
  * @param h  Header of email

diff --git a/commands.h b/commands.h
index 9f78ba44d61e0cc85a835a6b9c965fa6ff214aff..d1018949b2a90b962d552d1a79e7cfdaea707aec 100644 (file)
--- a/commands.h
+++ b/commands.h
@@ -54,6 +54,5 @@ int  mutt_save_message_ctx(struct Header *h, bool delete, bool decode, bool decr
 int  mutt_save_message(struct Header *h, bool delete, bool decode, bool decrypt);
 int  mutt_select_sort(int reverse);
 void mutt_shell_escape(void);
-void mutt_version(void);
 
 #endif /* MUTT_COMMANDS_H */

diff --git a/compose.c b/compose.c
index 5ca933ae3de79f8bcbfcf598a048fd934e5b826a..d698f9436d1120493aff62cfad72fa0faa796c11 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -848,7 +848,7 @@ static const char *compose_format_str(char *buf, size_t buflen, size_t col, int
       break;
 
     case 'v':
-      snprintf(buf, buflen, "NeoMutt %s%s", PACKAGE_VERSION, GitVer);
+      snprintf(buf, buflen, "%s", mutt_make_version());
       break;
 
     case 0:

diff --git a/curs_main.c b/curs_main.c
index c58d1365314a4ca0914fb0c28e7bccc9e6a1487d..991a2dd917c32063e905ac03f83109d9979285fc 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -3354,7 +3354,7 @@ int mutt_index_menu(void)
         break;
 
       case OP_VERSION:
-        mutt_version();
+        mutt_message(mutt_make_version());
         break;
 
       case OP_BUFFY_LIST:

diff --git a/pager.c b/pager.c
index c759377a75c22d3315717de6cf16f4e45b1934fb..0d8e40c0aabbd27d8ff58ee48bde88ea108c09fd 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -55,6 +55,7 @@
 #include "mutt_header.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
@@ -3353,7 +3354,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         break;
 
       case OP_VERSION:
-        mutt_version();
+        mutt_message(mutt_make_version());
         break;
 
       case OP_BUFFY_LIST:

diff --git a/status.c b/status.c
index fab85dd5aca052d8d6a9036ce8089ed9738381bb..b221d0b0a04843516f30bcc24ba554a889ef90f4 100644 (file)
--- a/status.c
+++ b/status.c
@@ -345,8 +345,7 @@ static const char *status_format_str(char *buf, size_t buflen, size_t col, int c
       break;
 
     case 'v':
-      snprintf(fmt, sizeof(fmt), "NeoMutt %%s%%s");
-      snprintf(buf, buflen, fmt, PACKAGE_VERSION, GitVer);
+      snprintf(buf, buflen, "%s", mutt_make_version());
       break;
 
     case 'V':