summaryrefslogtreecommitdiff
path: root/doc/man
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2016-12-01 15:21:57 +0000
committerReuben Thomas <rrt@sc3d.org>2017-08-30 21:59:38 +0100
commit98f01a13a3bf2a4db2dcc82a342ee017326de732 (patch)
tree70aac99762c0ee95026ec72fc307304b6700d372 /doc/man
parentdc313922d826b9f53cf1426ff36c8cc3f71d64c6 (diff)
downloademacs-98f01a13a3bf2a4db2dcc82a342ee017326de732.tar.gz
Add support for arguments in emacsclient's ALTERNATE_EDITOR (Bug #25082)
* lib-src/emacsclient.c (fail): Parse ALTERNATE_EDITOR, or corresponding command-line argument, into quote- or space-separated tokens. If a token starts with a quote, then it naturally is expected to end with a quote; escaping is not supported. This is enough to cope with the typical case of requiring the initial path to be quoted, common on Windows where it may contain spaces. * etc/NEWS: Document. * doc/emacs/misc.texi: Likewise. * doc/man/emacsclient.1: Tweak to remove the implication that only an editor can be specified (the manual already mentions a “command”). Fix a small error where “EDITOR” is referred to rather than “ALTERNATE_EDITOR”. * test/lib-src/emacsclient-tests.el: Add tests.
Diffstat (limited to 'doc/man')
-rw-r--r--doc/man/emacsclient.16
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 010eeba19c1..daaacab7f3e 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -62,10 +62,10 @@ A missing
is treated as column 1.
This option applies only to the next file specified.
.TP
-.B \-a, \-\-alternate-editor=EDITOR
-if the Emacs server is not running, run the specified editor instead.
+.B \-a, \-\-alternate-editor=COMMAND
+if the Emacs server is not running, run the specified shell command instead.
This can also be specified via the ALTERNATE_EDITOR environment variable.
-If the value of EDITOR is the empty string, run "emacs \-\-daemon" to
+If the value of ALTERNATE_EDITOR is the empty string, run "emacs \-\-daemon" to
start Emacs in daemon mode, and try to connect to it.
.TP
.B -c, \-\-create-frame