mirror of
git://git.sv.gnu.org/nano.git
synced 2024-11-22 12:51:23 +03:00
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
This commit is contained in:
parent
1f479ee9fc
commit
3c43d3d688
@ -48,6 +48,8 @@ CVS code -
|
|||||||
shortcut_init()
|
shortcut_init()
|
||||||
- Remove erroneous handling of the "Get Help" shortcut in the
|
- Remove erroneous handling of the "Get Help" shortcut in the
|
||||||
file browser shortcut list. (DLR)
|
file browser shortcut list. (DLR)
|
||||||
|
- nano.h:
|
||||||
|
- Remove now-unneeded VERMSG #define. (DLR)
|
||||||
- prompt.c:
|
- prompt.c:
|
||||||
get_prompt_string()
|
get_prompt_string()
|
||||||
- Redraw the prompt and set finished to FALSE when NANO_HELP_KEY
|
- 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,
|
Shift-Insert, and Shift-Suspend as Begin, Delete, End, Home,
|
||||||
Insert, and Suspend, respectively, regardless of whether
|
Insert, and Suspend, respectively, regardless of whether
|
||||||
--rebindkeypad is used. (DLR, found by David Benbennick)
|
--rebindkeypad is used. (DLR, found by David Benbennick)
|
||||||
|
titlebar()
|
||||||
|
- Use PACKAGE_STRING, as defined by autoconf, instead of VERMSG.
|
||||||
|
(DLR)
|
||||||
edit_redraw()
|
edit_redraw()
|
||||||
- If either current or old_current is offscreen, we're not on
|
- 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,
|
the first page, and/or we're not on the same page as before,
|
||||||
|
@ -136,8 +136,6 @@
|
|||||||
#define getline ngetline
|
#define getline ngetline
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define VERMSG "GNU nano " VERSION
|
|
||||||
|
|
||||||
/* If we don't have regex support, turn the color support off, as it
|
/* If we don't have regex support, turn the color support off, as it
|
||||||
* depends on the use of regexes. */
|
* depends on the use of regexes. */
|
||||||
#ifndef HAVE_REGEX_H
|
#ifndef HAVE_REGEX_H
|
||||||
|
@ -1970,7 +1970,7 @@ void titlebar(const char *path)
|
|||||||
{
|
{
|
||||||
int space = COLS;
|
int space = COLS;
|
||||||
/* The space we have available for display. */
|
/* 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
|
/* The length of the version message in columns, plus one for
|
||||||
* padding. */
|
* padding. */
|
||||||
const char *prefix;
|
const char *prefix;
|
||||||
@ -2010,7 +2010,8 @@ void titlebar(const char *path)
|
|||||||
if (space >= 4) {
|
if (space >= 4) {
|
||||||
/* Add a space after the version message, and account for both
|
/* Add a space after the version message, and account for both
|
||||||
* it and the two spaces before it. */
|
* 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;
|
verlen += 3;
|
||||||
|
|
||||||
/* Account for the full length of the version message. */
|
/* Account for the full length of the version message. */
|
||||||
|
Loading…
Reference in New Issue
Block a user