From: Reuben Thomas <rrt@sc3d.org>
Date: Fri, 1 Sep 2017 22:38:31 +0000 (+0100)
Subject: Fix a mis-binding and a bad defun name in a test (Bug#28319)
X-Git-Tag: emacs-26.0.90~276
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c995e4194d016fa8959acffd5787da4d3032f05;p=emacs.git

Fix a mis-binding and a bad defun name in a test (Bug#28319)

test/lib-src/emacs-client-tests.el (call-emacsclient): Rename
emacsclient-test-call-emacsclient.
(emacsclient-test-alternate-editor-allows-arguments)
(emacsclient-test-alternate-editor-allows-quotes): Fix let-binding of
process-environment.

Thanks to Glenn Morris for noticing these errors.
---

diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el
index e454e2825e6..91f1f1002d5 100644
--- a/test/lib-src/emacsclient-tests.el
+++ b/test/lib-src/emacsclient-tests.el
@@ -31,26 +31,26 @@
                                    "lib-src"))
   "Path to emacsclient binary in build tree.")
 
-(defun call-emacsclient ()
+(defun emacsclient-test-call-emacsclient ()
   "Run emacsclient."
   (call-process emacsclient-test-emacs nil nil nil
                 "--server-file" (expand-file-name "non-existent-file" invocation-directory)
                 "foo"))
 
 (ert-deftest emacsclient-test-alternate-editor-allows-arguments ()
-  (let (process-environment process-environment)
+  (let ((process-environment process-environment))
     (setenv "ALTERNATE_EDITOR" (concat
                                 (expand-file-name invocation-name invocation-directory)
                                 " --batch"))
-    (should (= 0 (call-emacsclient)))))
+    (should (= 0 (emacsclient-test-call-emacsclient)))))
 
 (ert-deftest emacsclient-test-alternate-editor-allows-quotes ()
-  (let (process-environment process-environment)
+  (let ((process-environment process-environment))
     (setenv "ALTERNATE_EDITOR" (concat
                                 "\""
                                 (expand-file-name invocation-name invocation-directory)
                                 "\"" " --batch"))
-    (should (= 0 (call-emacsclient)))))
+    (should (= 0 (emacsclient-test-call-emacsclient)))))
 
 (provide 'emacsclient-tests)
 ;;; emacsclient-tests.el ends here