From 846658eb6b13491f1ac347b53f68f46f8e93ba91 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Sun, 5 Dec 2004 04:18:26 +0000
Subject: [PATCH] when we get the whitespace display toggle, update the
titlebar as well as the edit window, in case the filename displayed on the
titlebar contains spaces or tabs; also add a few miscellaneous cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2160 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 5 +++++
src/nano.c | 9 +++++----
src/winio.c | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e2807d69..5ce8f742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
CVS code -
- General:
+ - More int -> bool conversions. (DLR)
- Overhaul the cutting and uncutting routines to use the
partitioning code, as it greatly simplifies how they work.
New functions move_to_filestruct(), copy_from_filestruct(),
@@ -70,6 +71,10 @@ CVS code -
thanks_for_all_the_fish()
- Free the justify buffer if it isn't empty. (DLR)
- nano.c:
+ do_toggle()
+ - When we get the whitespace display toggle, update the titlebar
+ as well as the edit window, in case the filename displayed on
+ the titlebar contains spaces or tabs. (DLR)
handle_sigwinch()
- If the justify buffer isn't empty, blow it away and don't
display "UnJustify" in the shortcut list anymore. (DLR)
diff --git a/src/nano.c b/src/nano.c
index 64c0d8e3..20f8a531 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -3275,6 +3275,7 @@ void do_toggle(const toggle *which)
#endif
#ifdef ENABLE_NANORC
case TOGGLE_WHITESPACE_KEY:
+ titlebar(NULL);
edit_refresh();
break;
#endif
@@ -3577,9 +3578,8 @@ void do_output(int *kbinput, size_t kbinput_len)
assert(current != NULL && current->data != NULL);
- /* Turn off constant cursor position display if it's on. */
- if (old_constupdate)
- UNSET(CONSTUPDATE);
+ /* Turn off constant cursor position display. */
+ UNSET(CONSTUPDATE);
for (i = 0; i < kbinput_len; i++) {
#ifdef NANO_WIDE
@@ -3662,7 +3662,8 @@ void do_output(int *kbinput, size_t kbinput_len)
#endif
}
- /* Turn constant cursor position display back on if it was on. */
+ /* Turn constant cursor position display back on if it was on
+ * before. */
if (old_constupdate)
SET(CONSTUPDATE);
diff --git a/src/winio.c b/src/winio.c
index c3b810bc..96cac082 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2393,7 +2393,7 @@ void statusbar(const char *msg, ...)
char *foo;
size_t start_x = 0, foo_len;
#if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
- int old_whitespace = ISSET(WHITESPACE_DISPLAY);
+ bool old_whitespace = ISSET(WHITESPACE_DISPLAY);
UNSET(WHITESPACE_DISPLAY);
#endif
bar = charalloc(COLS - 3);
--
GitLab