diff options
| author | Reuben Thomas | 2016-12-01 15:21:57 +0000 |
|---|---|---|
| committer | Reuben Thomas | 2017-08-30 21:59:38 +0100 |
| commit | 98f01a13a3bf2a4db2dcc82a342ee017326de732 (patch) | |
| tree | 70aac99762c0ee95026ec72fc307304b6700d372 /test/lib-src | |
| parent | dc313922d826b9f53cf1426ff36c8cc3f71d64c6 (diff) | |
| download | emacs-98f01a13a3bf2a4db2dcc82a342ee017326de732.tar.gz emacs-98f01a13a3bf2a4db2dcc82a342ee017326de732.zip | |
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 'test/lib-src')
| -rw-r--r-- | test/lib-src/emacsclient-tests.el | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el new file mode 100644 index 00000000000..ea757f69144 --- /dev/null +++ b/test/lib-src/emacsclient-tests.el | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | ;;; emacsclient-tests.el --- Test emacsclient | ||
| 2 | |||
| 3 | ;; Copyright (C) 2016 Free Software Foundation, Inc. | ||
| 4 | |||
| 5 | ;; This program is free software; you can redistribute it and/or modify | ||
| 6 | ;; it under the terms of the GNU General Public License as published by | ||
| 7 | ;; the Free Software Foundation, either version 3 of the License, or | ||
| 8 | ;; (at your option) any later version. | ||
| 9 | |||
| 10 | ;; This program is distributed in the hope that it will be useful, | ||
| 11 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | ;; GNU General Public License for more details. | ||
| 14 | |||
| 15 | ;; You should have received a copy of the GNU General Public License | ||
| 16 | ;; along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | |||
| 18 | ;;; Commentary: | ||
| 19 | |||
| 20 | ;; | ||
| 21 | |||
| 22 | ;;; Code: | ||
| 23 | |||
| 24 | (require 'ert) | ||
| 25 | |||
| 26 | (defconst emacsclient-test-emacs | ||
| 27 | (expand-file-name "emacsclient" (concat | ||
| 28 | (file-name-directory | ||
| 29 | (directory-file-name | ||
| 30 | (file-name-directory invocation-directory))) | ||
| 31 | "lib-src")) | ||
| 32 | "Path to emacsclient binary in build tree.") | ||
| 33 | |||
| 34 | (ert-deftest emacsclient-test-alternate-editor-allows-arguments () | ||
| 35 | (let (process-environment process-environment) | ||
| 36 | (setenv "ALTERNATE_EDITOR" (concat | ||
| 37 | (expand-file-name invocation-name invocation-directory) | ||
| 38 | " --batch")) | ||
| 39 | (should (= 0 (call-process emacsclient-test-emacs nil nil nil "foo"))))) | ||
| 40 | |||
| 41 | (ert-deftest emacsclient-test-alternate-editor-allows-quotes () | ||
| 42 | (let (process-environment process-environment) | ||
| 43 | (setenv "ALTERNATE_EDITOR" (concat | ||
| 44 | "\"" | ||
| 45 | (expand-file-name invocation-name invocation-directory) | ||
| 46 | "\"" " --batch")) | ||
| 47 | (should (= 0 (call-process emacsclient-test-emacs nil nil nil "foo"))))) | ||
| 48 | |||
| 49 | (provide 'emacsclient-tests) | ||
| 50 | ;;; emacsclient-tests.el ends here | ||