Differentiating between something being disabled/restricted and

help texts being unavailable.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5331 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 674877ab01c99cf794dc00670d60f9c9002f3f94..610ac67ba965c4ee91fa3661fe9deb87c7ad4976 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2015-07-30  Benno Schulenberg  <bensberg@justemail.net>
-       * src/global.c (shortcut_init): Don't show ^R and ^T in the help lines
-       in restricted mode (if possible), to give visual feedback.
+       * src/global.c (shortcut_init): Don't show ^R and ^T in the help
+       lines in restricted mode (if possible), to give visual feedback.
        * src/*.c: Normalize the whitespace after the preceding changes.
+       * src/nano.c (show_restricted_warning, say_there_is_no_help):
+       Differentiate between something being disabled/restricted (because
+       of the way of invocation) and help texts being unavailable (which
+       is a compile-time decision).
 
 2015-07-29  Benno Schulenberg  <bensberg@justemail.net>
        * src/text.c (do_linter): When the linter is called in restricted mode

diff --git a/src/browser.c b/src/browser.c
index faba2a1789d76bf9fa8bb7e846d1f72e5ad92bad..be8a404d4b583f064004f24b3feb2b60fe7bf8c0 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -174,7 +174,7 @@ char *do_browser(char *path, DIR *dir)
            browser_refresh();
            curs_set(0);
 #else
-           nano_disabled_msg();
+           say_there_is_no_help();
 #endif
        } else if (func == do_search) {
            /* Search for a filename. */

diff --git a/src/files.c b/src/files.c
index cbe3b74ddcf00f08b2fa9ad770b25962c9aee001..832613ae1e17d516cc674d82199099586a03c603 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1295,7 +1295,7 @@ void do_insertfile(
 void do_insertfile_void(void)
 {
     if (ISSET(RESTRICTED)) {
-       nano_disabled_msg();
+       show_restricted_warning();
        return;
     }
 

diff --git a/src/help.c b/src/help.c
index ab5d50fc5351cf848db8dbffbdb20ba85f93bb9a..e43665a7713d0ba7136b8f75e193326991e733bf 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -533,7 +533,7 @@ void do_help_void(void)
        do_help(&edit_refresh);
 #else
     if (currmenu == MMAIN)
-       nano_disabled_msg();
+       say_there_is_no_help();
     else
        beep();
 #endif /* !DISABLE_HELP */

diff --git a/src/nano.c b/src/nano.c
index da315fea8491ee2210007128b6f8e46731e82fd8..624a0094eeaa546105fe2324bd38a466a980b496 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -593,9 +593,24 @@ void free_openfilestruct(openfilestruct *src)
 /* Display a warning about a key disabled in view mode. */
 void print_view_warning(void)
 {
-    statusbar(_("Key invalid in view mode"));
+    statusbar(_("Key is invalid in view mode"));
 }
 
+/* Indicate that something is disabled in restricted mode. */
+void show_restricted_warning(void)
+{
+    statusbar(_("This function is disabled in restricted mode"));
+    beep();
+}
+
+#ifdef DISABLE_HELP
+/* Indicate that help texts are unavailable. */
+void say_there_is_no_help(void)
+{
+    statusbar(_("Help is unavailable"));
+}
+#endif
+
 /* Make nano exit gracefully. */
 void finish(void)
 {
@@ -1086,12 +1101,6 @@ int no_help(void)
     return ISSET(NO_HELP) ? 2 : 0;
 }
 
-/* Indicate a disabled function on the statusbar. */
-void nano_disabled_msg(void)
-{
-    statusbar(_("Sorry, support for this function has been disabled"));
-}
-
 /* If the current file buffer has been modified, and the TEMP_FILE flag
  * isn't set, ask whether or not to save the file buffer.  If the
  * TEMP_FILE flag is set and the current file has a name, save it
@@ -1280,7 +1289,7 @@ RETSIGTYPE handle_hupterm(int signal)
 RETSIGTYPE do_suspend(int signal)
 {
     if (ISSET(RESTRICTED)) {
-       nano_disabled_msg();
+       show_restricted_warning();
        return;
     }
 
@@ -1429,7 +1438,7 @@ void do_toggle(int flag)
 
     if (ISSET(RESTRICTED) && (flag == SUSPEND || flag == MULTIBUFFER ||
                        flag == BACKUP_FILE || flag == NO_COLOR_SYNTAX)) {
-       nano_disabled_msg();
+       show_restricted_warning();
        return;
     }
 

diff --git a/src/proto.h b/src/proto.h
index f6fded04a23ec5c639b0ff3b098cd0c0628180aa..777acf602563702c73aa9bde80c2fa82b9d3832d 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -450,6 +450,10 @@ void delete_opennode(openfilestruct *fileptr);
 void free_openfilestruct(openfilestruct *src);
 #endif
 void print_view_warning(void);
+void show_restricted_warning(void);
+#ifdef DISABLE_HELP
+void say_there_is_no_help(void);
+#endif
 void finish(void);
 void die(const char *msg, ...);
 void die_save_file(const char *die_filename
@@ -472,7 +476,6 @@ void usage(void);
 void version(void);
 int more_space(void);
 int no_help(void);
-void nano_disabled_msg(void);
 void do_exit(void);
 void signal_init(void);
 RETSIGTYPE handle_hupterm(int signal);

diff --git a/src/text.c b/src/text.c
index 7387efbe770d7eb9eb400e4f5ff42462159f89d6..05a51ca0b8d2f4dbcc24772fad0db9b593da9e05 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -2831,7 +2831,7 @@ void do_spell(void)
     const char *spell_msg;
 
     if (ISSET(RESTRICTED)) {
-       nano_disabled_msg();
+       show_restricted_warning();
        return;
     }
 
@@ -2904,8 +2904,8 @@ void do_linter(void)
     lintstruct *lints = NULL, *tmplint = NULL, *curlint = NULL;
 
     if (ISSET(RESTRICTED)) {
-        nano_disabled_msg();
-        return;
+       show_restricted_warning();
+       return;
     }
 
     if (!openfile->syntax || !openfile->syntax->linter) {