nano

commit 4b928b466ae0752ffcc20ece70bad7ebe7bc3d31
parent 10b4d0c8adbaa1c45fd1075ba30f7caa0cd827e1
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Mon, 15 Aug 2022 11:25:04 +0200

tweaks: determine in another way whether a shortcut is okay in view mode

This addresses the other part of https://savannah.gnu.org/bugs/?62899.

Diffstat:
M
src/nano.c
 | 
36
+++++++++++++++++++++++++-----------
M
src/prototypes.h
 | 
2
++

2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/nano.c b/src/nano.c
@@ -1368,16 +1368,30 @@ bool wanted_to_move(void (*func)(void))
 			func == to_first_line || func == to_last_line;
 }
 
-/* Return TRUE when the given shortcut is admissible in view mode. */
-bool okay_for_view(const keystruct *shortcut)
+/* Return TRUE when the given function makes a change -- no good for view mode. */
+bool changes_something(const void *f)
 {
-	funcstruct *item = allfuncs;
-
-	/* Search the function of the given shortcut in the list of functions. */
-	while (item != NULL && item->func != shortcut->func)
-		item = item->next;
-
-	return (item == NULL || item->viewok);
+	return (f == do_savefile || f == do_writeout || f == do_enter ||
+			f == do_tab || f == do_delete || f == do_backspace ||
+			f == cut_text || f == paste_text || f == do_replace ||
+#ifndef NANO_TINY
+			f == chop_previous_word || f == chop_next_word ||
+			f == zap_text || f == cut_till_eof || f == do_execute ||
+			f == do_indent || f == do_unindent || f == do_comment ||
+#endif
+#ifdef ENABLE_JUSTIFY
+			f == do_justify || f == do_full_justify ||
+#endif
+#ifdef ENABLE_SPELLER
+			f == do_spell ||
+#endif
+#ifdef ENABLE_COLOR
+			f == do_linter || f == do_formatter ||
+#endif
+#ifdef ENABLE_WORDCOMPLETION
+			f == complete_a_word ||
+#endif
+			f == do_verbatim_input);
 }
 
 #ifndef NANO_TINY
@@ -1585,7 +1599,7 @@ void process_a_keystroke(void)
 		return;
 	}
 
-	if (ISSET(VIEW_MODE) && !okay_for_view(shortcut)) {
+	if (ISSET(VIEW_MODE) && changes_something(function)) {
 		print_view_warning();
 		return;
 	}
@@ -1653,7 +1667,7 @@ void process_a_keystroke(void)
 	}
 #endif
 #ifdef ENABLE_COLOR
-	if (!refresh_needed && !okay_for_view(shortcut))
+	if (!refresh_needed && changes_something(function))
 		check_the_multis(openfile->current);
 #endif
 	if (!refresh_needed && (function == do_delete || function == do_backspace))
diff --git a/src/prototypes.h b/src/prototypes.h
@@ -523,7 +523,9 @@ void do_formatter(void);
 void count_lines_words_and_characters(void);
 #endif
 void do_verbatim_input(void);
+#ifdef ENABLE_WORDCOMPLETION
 void complete_a_word(void);
+#endif
 
 /* All functions in utils.c. */
 void get_homedir(void);