ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow blank buffers at the "Execute Command" prompt, and document it in 

the help text


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2085 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-11-07 21:30:55 +00:00
parent c136f75f62
commit fdd3becc1e
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -191,6 +191,8 @@ CVS code -
- Update the help text to mention replacing and spell checking - Update the help text to mention replacing and spell checking
only selected text, and also add a few cosmetic fixes to it. only selected text, and also add a few cosmetic fixes to it.
(DLR) (DLR)
- Update the help text to mention how to get a blank buffer at
the "Execute Command" prompt. (DLR)
do_prev_word() do_prev_word()
- Tweak to avoid an infinite loop, since current_x is now a - Tweak to avoid an infinite loop, since current_x is now a
size_t and hence is unsigned. (DLR) size_t and hence is unsigned. (DLR)

7
src/files.c
View File

@ -540,14 +540,11 @@ void do_insertfile(
#endif #endif
"./"); "./");
/* If we're in multibuffer mode and file insertion mode, and the /* If we're in multibuffer mode and the filename or command is
* filename is blank, open a new buffer instead of canceling. */ * blank, open a new buffer instead of canceling. */
if (i == -1 || (i == -2 if (i == -1 || (i == -2
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
&& !ISSET(MULTIBUFFER) && !ISSET(MULTIBUFFER)
#endif
#ifndef NANO_SMALL
&& !execute
#endif #endif
)) ))
{ {

14
src/nano.c
View File

@ -304,11 +304,10 @@ void help_init(void)
"or --multibuffer command line flags, the Meta-F toggle, or " "or --multibuffer command line flags, the Meta-F toggle, or "
"a nanorc file, inserting a file will cause it to be " "a nanorc file, inserting a file will cause it to be "
"loaded into a separate buffer (use Meta-< and > to switch " "loaded into a separate buffer (use Meta-< and > to switch "
"between file buffers).\n\n If you need another blank " "between file buffers). If you need another blank buffer, "
"buffer, do not enter any filename, or type in a " "do not enter any filename, or type in a nonexistent "
"nonexistent filename at the prompt and press " "filename at the prompt and press Enter.\n\n The following "
"Enter.\n\n The following function keys are " "function keys are available in Insert File mode:\n\n");
"available in Insert File mode:\n\n");
else if (currshortcut == writefile_list) else if (currshortcut == writefile_list)
htx = N_("Write File Help Text\n\n " htx = N_("Write File Help Text\n\n "
"Type the name that you wish to save the current file " "Type the name that you wish to save the current file "
@ -356,8 +355,9 @@ void help_init(void)
htx = N_("External Command Help Text\n\n " htx = N_("External Command Help Text\n\n "
"This menu allows you to insert the output of a command " "This menu allows you to insert the output of a command "
"run by the shell into the current buffer (or a new " "run by the shell into the current buffer (or a new "
"buffer in multibuffer mode).\n\n The following keys are " "buffer in multibuffer mode). If you need another blank "
"available in this mode:\n\n"); "buffer, do not enter any command.\n\n The following keys "
"are available in this mode:\n\n");
#endif #endif
else else
/* Default to the main help list. */ /* Default to the main help list. */