diff --git a/BUGS b/BUGS index c100c4bf..73ad4f4f 100644 --- a/BUGS +++ b/BUGS @@ -65,7 +65,7 @@ - Using -k, pasted text is not updated properly if it goes beyond editbot. (35) [FIXED] - Doing a cut with -k can screw up the filestruct; fault is in cutting - code. (36) [FIXED] + code. (36) [FIXED] - Hitting enter on the magic line makes new lines, but they are not written out to disk when saved..... (37). [FIXED] - Page up and page down do not work the same way as in Pico (# of diff --git a/ChangeLog b/ChangeLog index ab9fffcc..e3134591 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ CVS code - +- nano.h: + - Rename NANO_ALT_REPLACE_KEY to NANO_REPLACE_ALTKEY, for + consistency. (DLR) - BUGS: - Miscellaneous cosmetic fixes. (DLR) diff --git a/src/global.c b/src/global.c index 76ef06d1..f600ea2a 100644 --- a/src/global.c +++ b/src/global.c @@ -564,9 +564,9 @@ void shortcut_init(bool unjustify) sc_init_one(&main_list, NANO_REPLACE_KEY, replace_msg #ifndef NANO_TINY - , IFSCHELP(nano_replace_msg, FALSE, NANO_ALT_REPLACE_KEY) + , IFSCHELP(nano_replace_msg, FALSE, NANO_REPLACE_ALTKEY) #else - , IFSCHELP(nano_replace_msg, TRUE, NANO_ALT_REPLACE_KEY) + , IFSCHELP(nano_replace_msg, TRUE, NANO_REPLACE_ALTKEY) #endif , NANO_REPLACE_FKEY, NANO_NO_KEY, NOVIEW, do_replace); diff --git a/src/nano.h b/src/nano.h index a1108fe4..b9cace71 100644 --- a/src/nano.h +++ b/src/nano.h @@ -495,7 +495,7 @@ typedef struct rcoption { #define NANO_REGEXP_KEY NANO_ALT_R #define NANO_REPLACE_KEY NANO_CONTROL_4 #define NANO_REPLACE_FKEY KEY_F(14) -#define NANO_ALT_REPLACE_KEY NANO_ALT_R +#define NANO_REPLACE_ALTKEY NANO_ALT_R #define NANO_TOOTHERSEARCH_KEY NANO_CONTROL_R #define NANO_PREVPAGE_KEY NANO_CONTROL_Y #define NANO_PREVPAGE_FKEY KEY_F(7)