From 3fa65ae8bb8cca86742a4f4bf2980a9827aac748 Mon Sep 17 00:00:00 2001 From: Samuel Walladge Date: Wed, 8 Feb 2017 12:25:23 +1030 Subject: config.commands: quit, quitall: Don't exit if loader has work Fixes #739 --- doc/ranger.1 | 15 +++++++++++---- doc/ranger.pod | 14 +++++++++++--- doc/rifle.1 | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/ranger.1 b/doc/ranger.1 index 89acdd78..1cb2d8ed 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "RANGER 1" -.TH RANGER 1 "ranger-1.8.1" "2017-02-06" "ranger manual" +.TH RANGER 1 "ranger-1.8.1" "2017-02-08" "ranger manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -937,6 +937,7 @@ ranger. For your convenience, this is a list of the \*(L"public\*(R" commands i \& punmap keys... \& quit \& quit! +\& quitall \& relink newpath \& rename_append [\-FLAGS...] \& rename newname @@ -1170,11 +1171,17 @@ a row. Removes key mappings of the pager. Works like the \f(CW\*(C`unmap\*(C'\fR command. .IP "quit" 2 .IX Item "quit" -Like quit!, but closes only this tab if multiple tabs are open. +If only one tab is currently open and no tasks are running, quit ranger. If +multiple tabs are open, only close this tab. The current directory will be +bookmarked as ' so you can re-enter it by typing `` or '' the next time you +start ranger. .IP "quit!" 2 .IX Item "quit!" -Quit ranger. The current directory will be bookmarked as ' so you can re-enter -it by typing `` or '' the next time you start ranger. +Force quit ranger, even if tasks are running. The current directory will still +be bookmarked similarly to \f(CW\*(C`quit\*(C'\fR. +.IP "quitall" 2 +.IX Item "quitall" +Like \f(CW\*(C`quit\*(C'\fR, will close ranger even if multiple tabs are open. .IP "relink \fInewpath\fR" 2 .IX Item "relink newpath" Change the link destination of the current symlink file to . First diff --git a/doc/ranger.pod b/doc/ranger.pod index 9fc7e144..8a783094 100644 --- a/doc/ranger.pod +++ b/doc/ranger.pod @@ -958,6 +958,7 @@ ranger. For your convenience, this is a list of the "public" commands including punmap keys... quit quit! + quitall relink newpath rename_append [-FLAGS...] rename newname @@ -1224,12 +1225,19 @@ Removes key mappings of the pager. Works like the C command. =item quit -Like quit!, but closes only this tab if multiple tabs are open. +If only one tab is currently open and no tasks are running, quit ranger. If +multiple tabs are open, only close this tab. The current directory will be +bookmarked as ' so you can re-enter it by typing `` or '' the next time you +start ranger. =item quit! -Quit ranger. The current directory will be bookmarked as ' so you can re-enter -it by typing `` or '' the next time you start ranger. +Force quit ranger, even if tasks are running. The current directory will still +be bookmarked similarly to C. + +=item quitall + +Like C, will close ranger even if multiple tabs are open. =item relink I diff --git a/doc/rifle.1 b/doc/rifle.1 index feafb659..b61423e7 100644 --- a/doc/rifle.1 +++ b/doc/rifle.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "RIFLE 1" -.TH RIFLE 1 "rifle-1.8.1" "2017-02-06" "rifle manual" +.TH RIFLE 1 "rifle-1.8.1" "2017-02-08" "rifle manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l -- cgit 1.4.1-2-gfad0