replace VERMSG #define with PACKAGE_STRING #define (as defined by

autoconf)

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3327 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index f0ba6b6dfa6592687858b546e3ec4cfb8721a6c4..c36618ffd6466ea2296ef240c426aee47dd99619 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,8 @@ CVS code -
   shortcut_init()
        - Remove erroneous handling of the "Get Help" shortcut in the
          file browser shortcut list. (DLR)
+- nano.h:
+       - Remove now-unneeded VERMSG #define. (DLR)
 - prompt.c:
   get_prompt_string()
        - Redraw the prompt and set finished to FALSE when NANO_HELP_KEY
@@ -73,6 +75,9 @@ CVS code -
          Shift-Insert, and Shift-Suspend as Begin, Delete, End, Home,
          Insert, and Suspend, respectively, regardless of whether
          --rebindkeypad is used. (DLR, found by David Benbennick)
+  titlebar()
+       - Use PACKAGE_STRING, as defined by autoconf, instead of VERMSG.
+         (DLR)
   edit_redraw()
        - If either current or old_current is offscreen, we're not on
          the first page, and/or we're not on the same page as before,

diff --git a/src/nano.h b/src/nano.h
index 40b24816415e5ff5ea168d8784ae0528d8dbbb79..99521e9f5a7fe6a709983b41ee7647a3ccd18a98 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -136,8 +136,6 @@
 #define getline ngetline
 #endif
 
-#define VERMSG "GNU nano " VERSION
-
 /* If we don't have regex support, turn the color support off, as it
  * depends on the use of regexes. */
 #ifndef HAVE_REGEX_H

diff --git a/src/winio.c b/src/winio.c
index aaab4072b7b24541ef1e758c1b933777ba0db1f8..f2f98ddb275447fe60cc95eea969461fbe83ab17 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -1970,7 +1970,7 @@ void titlebar(const char *path)
 {
     int space = COLS;
        /* The space we have available for display. */
-    size_t verlen = strlenpt(VERMSG) + 1;
+    size_t verlen = strlenpt(PACKAGE_STRING) + 1;
        /* The length of the version message in columns, plus one for
         * padding. */
     const char *prefix;
@@ -2010,7 +2010,8 @@ void titlebar(const char *path)
     if (space >= 4) {
        /* Add a space after the version message, and account for both
         * it and the two spaces before it. */
-       mvwaddnstr(topwin, 0, 2, VERMSG, actual_x(VERMSG, verlen));
+       mvwaddnstr(topwin, 0, 2, PACKAGE_STRING,
+               actual_x(PACKAGE_STRING, verlen));
        verlen += 3;
 
        /* Account for the full length of the version message. */