if we're in restricted mode and the filename isn't blank, disable tab

completion at the "Write File" prompt, since we can't change the
filename in that case; also remove an unneeded trailing space


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1842 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey 2004-07-05 14:27:29 +00:00
parent 309fbcbddf
commit f7b5d930a9
3 changed files with 10 additions and 2 deletions

View File

@ -22,6 +22,10 @@ CVS code -
- For consistency with nano 1.2.x and with other editors, make - For consistency with nano 1.2.x and with other editors, make
the mode of newly created files 666 instead of 600 before the mode of newly created files 666 instead of 600 before
it's modified by the umask. (DLR) it's modified by the umask. (DLR)
do_writeout()
- If we're in restricted mode abd the current filename isn't
blank, we can't change it, so disable tab completion in that
case. (DLR)
- global.c: - global.c:
shortcut_init() shortcut_init()
- Fix erroneous #ifdef so that nano compiles with - Fix erroneous #ifdef so that nano compiles with

View File

@ -1847,7 +1847,11 @@ int do_writeout(int exiting)
else else
msg = _("File Name to Write"); msg = _("File Name to Write");
i = statusq(TRUE, writefile_list, /* If we're using restricted mode, the filename isn't blank,
* and we're at the "Write File" prompt, disable tab
* completion. */
i = statusq(!ISSET(RESTRICTED) || filename[0] == '\0' ? TRUE :
FALSE, writefile_list,
#ifndef NANO_SMALL #ifndef NANO_SMALL
ans, NULL, "%s%s%s", msg, formatstr, backupstr ans, NULL, "%s%s%s", msg, formatstr, backupstr
#else #else

View File

@ -2384,7 +2384,7 @@ void do_justify(int full_justify)
* original to restore it later. */ * original to restore it later. */
int allow_respacing; int allow_respacing;
/* Whether we should change the spacing at the end of a line /* Whether we should change the spacing at the end of a line
* after justifying it. This should be TRUE whenever we move * after justifying it. This should be TRUE whenever we move
* to the next line after justifying the current line. */ * to the next line after justifying the current line. */
/* We save these global variables to be restored if the user /* We save these global variables to be restored if the user