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

Improving the wording of an error message: the confinement of 

an operating directory is not the same as restricted mode.

(In restricted mode, the file browser is not available at all.)


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5772 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-03-29 14:16:55 +00:00
parent f45a2938e3
commit e258cc3e95
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
window also when --constantshow is in effect, after a ^J Justify or
an invalid escape sequence, and when entering a verbatim keystroke.
Leave the cursor off during Unicode input, for extra feedback.
* src/browser.c (do_browser): Improve the wording of a message.
2016-03-28 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (statusbar): Don't bother putting back the cursor in

6
src/browser.c
View File

@ -240,7 +240,9 @@ char *do_browser(char *path, DIR *dir)
#ifndef DISABLE_OPERATINGDIR
if (check_operating_dir(new_path, FALSE)) {
statusbar(_("Can't go outside of %s in restricted mode"),
/* TRANSLATORS: This refers to the option --operatingdir,
* not to --restricted. */
statusbar(_("Can't go outside of %s in confined mode"),
operating_dir);
free(new_path);
continue;
@ -287,7 +289,7 @@ char *do_browser(char *path, DIR *dir)
* directory if it's ".." or if it's a symlink to a
* directory outside the operating directory. */
if (check_operating_dir(filelist[selected], FALSE)) {
statusbar(_("Can't go outside of %s in restricted mode"),
statusbar(_("Can't go outside of %s in confined mode"),
operating_dir);
beep();
continue;