Commit 7dfec43f authored by David Lawrence Ramsey's avatar David Lawrence Ramsey
Browse files

per DB's patch, show the "Press Return To Continue" prompt if we can't

read the .nano_history file while starting nano


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1896 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 6 additions and 2 deletions
+6 -2
...@@ -69,7 +69,8 @@ CVS code - ...@@ -69,7 +69,8 @@ CVS code -
rcfile_error() to parse_rcfile() so that we only get prompted rcfile_error() to parse_rcfile() so that we only get prompted
once for all errors instead of separately for each error. once for all errors instead of separately for each error.
(DLR) David Benbennick: Make sure that no rcfile error (DLR) David Benbennick: Make sure that no rcfile error
messages end in newlines. messages end in newlines, and show the ending prompt if we
can't read the .nano_history file while starting nano.
- Don't treat the return value of strn?(case)?cmp() as boolean. - Don't treat the return value of strn?(case)?cmp() as boolean.
(DLR and David Benbennick) (DLR and David Benbennick)
- Automatically install a symlink "rnano" pointing to nano. - Automatically install a symlink "rnano" pointing to nano.
......
...@@ -2943,6 +2943,9 @@ void load_history(void) ...@@ -2943,6 +2943,9 @@ void load_history(void)
/* Don't save history when we quit. */ /* Don't save history when we quit. */
UNSET(HISTORYLOG); UNSET(HISTORYLOG);
rcfile_error(N_("Error reading %s: %s"), nanohist, strerror(errno)); rcfile_error(N_("Error reading %s: %s"), nanohist, strerror(errno));
fprintf(stderr, _("\nPress Return to continue starting nano\n"));
while (getchar() != '\n')
;
} }
free(nanohist); free(nanohist);
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment