From b725353ab7edae86c391d1f96e713af9caee8ee6 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 21 Jun 2005 16:19:47 +0000
Subject: [PATCH] per Jordi's suggestion, remove the Meta-U toggle for
-U/--quickblank; the rcfile option is enough for those that use it regularly
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2749 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 15 +++++++--------
doc/texinfo/nano.texi | 5 +----
src/global.c | 2 --
src/nano.h | 1 -
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ff5544ac..f0059c7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,14 +109,13 @@ CVS code -
- Since the DISABLE_CURPOS flag is only used in winio.c, reduce
it to a static bool there. Changes to statusbar() and
disable_cursorpos(). (DLR)
- - Add -U/--quickblank option, a Meta-U toggle, and a
- "quickblank" rcfile option to blank the statusbar after 1
- keystroke instead of 25. Note that this obviously has no
- effect when constant cursor position display is turned on, and
- that this is disabled when NANO_SMALL is defined. Changes to
- toggle_init(), usage(), main(), statusbar(), nanorc.sample,
- nano.1, nanorc.5, and nano.texi. (DLR, suggested by CHAO
- Wei-Lun)
+ - Add -U/--quickblank option and a "quickblank" rcfile option to
+ blank the statusbar after 1 keystroke instead of 25. Note
+ that this obviously has no effect when constant cursor
+ position display is turned on, and that this is disabled when
+ NANO_SMALL is defined. Changes to usage(), main(),
+ statusbar(), nanorc.sample, nano.1, and nanorc.5. (DLR,
+ suggested by CHAO Wei-Lun)
- chars.c:
make_mbstring()
- Change erroneous ENABLE_EXTRA #ifdef to NANO_EXTRA to fix a
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index b9e1f177..8681a9a2 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -9,7 +9,7 @@
@smallbook
@set EDITION 0.1
@set VERSION 1.3.8
-@set UPDATED 19 Jun 2005
+@set UPDATED 21 Jun 2005
@dircategory Editors
@direntry
@@ -386,9 +386,6 @@ your .nanorc.
@item Smooth Scrolling Toggle (Meta-S)
toggles the -S (@code{--smooth}) command line flag.
-@item Quick Statusbar Blanking Toggle (Meta-U)
-toggles the -U (@code{--quickblank}) command line flag.
-
@item Expert/No Help Toggle (Meta-X)
toggles the -x (@code{--nohelp}) command line flag.
diff --git a/src/global.c b/src/global.c
index 58348cb2..5c423e3e 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1128,8 +1128,6 @@ void toggle_init(void)
toggle_init_one(TOGGLE_SUSPEND_KEY, N_("Suspend"), SUSPEND);
toggle_init_one(TOGGLE_CONST_KEY,
N_("Constant cursor position display"), CONST_UPDATE);
- toggle_init_one(TOGGLE_QUICKBLANK_KEY,
- N_("Quick statusbar blanking"), QUICK_BLANK);
toggle_init_one(TOGGLE_AUTOINDENT_KEY, N_("Auto indent"),
AUTOINDENT);
toggle_init_one(TOGGLE_TABSTOSPACES_KEY,
diff --git a/src/nano.h b/src/nano.h
index 20d7c6c9..49219f94 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -491,7 +491,6 @@ typedef struct syntaxtype {
#define TOGGLE_WHITESPACE_KEY NANO_ALT_P
#define TOGGLE_MORESPACE_KEY NANO_ALT_O
#define TOGGLE_TABSTOSPACES_KEY NANO_ALT_E
-#define TOGGLE_QUICKBLANK_KEY NANO_ALT_U
#endif /* !NANO_SMALL */
#define MAIN_VISIBLE 12
--
GitLab