feedback: give proper message for ^R when combining --view & --restricted

When using --view --multibuffer --restricted, it is the latter option
that forbids reading in another file, so that is what the status bar
should say.

This fixes https://savannah.gnu.org/bugs/?54824.

Bug existed since version 2.9.5, commit 8b8c6bb8.
master
Benno Schulenberg 2018-10-12 11:58:45 +02:00
parent 8c456423e9
commit 6b08648377
1 changed files with 2 additions and 2 deletions

View File

@ -1644,12 +1644,12 @@ bool wanted_to_move(void (*func)(void))
func == to_first_line || func == to_last_line;
}
/* Return TRUE when the given shortcut is valid in view mode. */
/* Return TRUE when the given shortcut is admissible in view mode. */
bool okay_for_view(const sc *shortcut)
{
const subnfunc *func = sctofunc(shortcut);
return (func != NULL && func->viewok);
return (func == NULL || func->viewok);
}
/* Read in a keystroke. Act on the keystroke if it is a shortcut or a toggle;