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-d3aeb78583b8master
parent
c41285fb0b
commit
846658eb6b
|
@ -1,5 +1,6 @@
|
||||||
CVS code -
|
CVS code -
|
||||||
- General:
|
- General:
|
||||||
|
- More int -> bool conversions. (DLR)
|
||||||
- Overhaul the cutting and uncutting routines to use the
|
- Overhaul the cutting and uncutting routines to use the
|
||||||
partitioning code, as it greatly simplifies how they work.
|
partitioning code, as it greatly simplifies how they work.
|
||||||
New functions move_to_filestruct(), copy_from_filestruct(),
|
New functions move_to_filestruct(), copy_from_filestruct(),
|
||||||
|
@ -70,6 +71,10 @@ CVS code -
|
||||||
thanks_for_all_the_fish()
|
thanks_for_all_the_fish()
|
||||||
- Free the justify buffer if it isn't empty. (DLR)
|
- Free the justify buffer if it isn't empty. (DLR)
|
||||||
- nano.c:
|
- 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()
|
handle_sigwinch()
|
||||||
- If the justify buffer isn't empty, blow it away and don't
|
- If the justify buffer isn't empty, blow it away and don't
|
||||||
display "UnJustify" in the shortcut list anymore. (DLR)
|
display "UnJustify" in the shortcut list anymore. (DLR)
|
||||||
|
|
|
@ -3275,6 +3275,7 @@ void do_toggle(const toggle *which)
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_NANORC
|
#ifdef ENABLE_NANORC
|
||||||
case TOGGLE_WHITESPACE_KEY:
|
case TOGGLE_WHITESPACE_KEY:
|
||||||
|
titlebar(NULL);
|
||||||
edit_refresh();
|
edit_refresh();
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
@ -3577,8 +3578,7 @@ void do_output(int *kbinput, size_t kbinput_len)
|
||||||
|
|
||||||
assert(current != NULL && current->data != NULL);
|
assert(current != NULL && current->data != NULL);
|
||||||
|
|
||||||
/* Turn off constant cursor position display if it's on. */
|
/* Turn off constant cursor position display. */
|
||||||
if (old_constupdate)
|
|
||||||
UNSET(CONSTUPDATE);
|
UNSET(CONSTUPDATE);
|
||||||
|
|
||||||
for (i = 0; i < kbinput_len; i++) {
|
for (i = 0; i < kbinput_len; i++) {
|
||||||
|
@ -3662,7 +3662,8 @@ void do_output(int *kbinput, size_t kbinput_len)
|
||||||
#endif
|
#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)
|
if (old_constupdate)
|
||||||
SET(CONSTUPDATE);
|
SET(CONSTUPDATE);
|
||||||
|
|
||||||
|
|
|
@ -2393,7 +2393,7 @@ void statusbar(const char *msg, ...)
|
||||||
char *foo;
|
char *foo;
|
||||||
size_t start_x = 0, foo_len;
|
size_t start_x = 0, foo_len;
|
||||||
#if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
|
#if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
|
||||||
int old_whitespace = ISSET(WHITESPACE_DISPLAY);
|
bool old_whitespace = ISSET(WHITESPACE_DISPLAY);
|
||||||
UNSET(WHITESPACE_DISPLAY);
|
UNSET(WHITESPACE_DISPLAY);
|
||||||
#endif
|
#endif
|
||||||
bar = charalloc(COLS - 3);
|
bar = charalloc(COLS - 3);
|
||||||
|
|
Loading…
Reference in New Issue