mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-30 00:23:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

options: let view mode activate "multibuffer" to allow viewing more files

Browse Source 
When --view is used without --ignorercfiles, the user could view
other files anyway if they had 'set multibuffer' in their nanorc.
So, just make this the default when --view is used, also because
"multibuffer" cannot be toggled once nano is running in view mode.

When the viewing of other files in view mode should not be allowed,
one should now additionally use --restricted.
This commit is contained in:
Benno Schulenberg 2018-10-12 19:57:43 +02:00
parent 71de0b9e2f
commit 63f2be7a2f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/files.c
View File

@ -1258,10 +1258,6 @@ void do_insertfile_void(void)
{ {
if (ISSET(RESTRICTED)) if (ISSET(RESTRICTED))
show_restricted_warning(); show_restricted_warning();
#ifdef ENABLE_MULTIBUFFER
else if (ISSET(VIEW_MODE) && !ISSET(MULTIBUFFER))
statusbar(_("Key invalid in non-multibuffer mode"));
#endif
else else
do_insertfile(); do_insertfile();
} }

2
src/nano.c
View File

@ -2654,6 +2654,8 @@ int main(int argc, char **argv)
openfile = openfile->next; openfile = openfile->next;
if (more_than_one) if (more_than_one)
mention_name_and_linecount(); mention_name_and_linecount();
if (ISSET(VIEW_MODE))
SET(MULTIBUFFER);
} }
#endif #endif