aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBasil L. Contovounesios2020-08-19 14:43:11 +0100
committerBasil L. Contovounesios2020-08-19 15:02:43 +0100
commitf8d3d18168a742691d095a3f0c83512f19621725 (patch)
tree4123ed7e8c563b25d7a65bb41c9883eb0fd38588
parent90e65c826fab2092ad2099d7763538194c93e021 (diff)
downloademacs-f8d3d18168a742691d095a3f0c83512f19621725.tar.gz
emacs-f8d3d18168a742691d095a3f0c83512f19621725.zip
; Minor simplification of two recent changes
-rw-r--r--lisp/simple.el2
-rw-r--r--test/lisp/emacs-lisp/bytecomp-tests.el3
2 files changed, 2 insertions, 3 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 5f1338abb0c..f08015372af 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1852,7 +1852,7 @@ to get different commands to edit and resubmit."
1852 (and (commandp (function-called-at-point)) 1852 (and (commandp (function-called-at-point))
1853 (format "%S" (function-called-at-point))))) 1853 (format "%S" (function-called-at-point)))))
1854 (all (sort (minibuffer-default-add-completions) 1854 (all (sort (minibuffer-default-add-completions)
1855 (lambda (a b) (string< a b))))) 1855 #'string<)))
1856 (if def 1856 (if def
1857 (cons def (delete def all)) 1857 (cons def (delete def all))
1858 all))))) 1858 all)))))
diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el
index f62427305a0..834e3b6d914 100644
--- a/test/lisp/emacs-lisp/bytecomp-tests.el
+++ b/test/lisp/emacs-lisp/bytecomp-tests.el
@@ -479,8 +479,7 @@ Subtests signal errors if something goes wrong."
479(ert-deftest bytecomp-tests--warnings () 479(ert-deftest bytecomp-tests--warnings ()
480 (with-current-buffer (get-buffer-create "*Compile-Log*") 480 (with-current-buffer (get-buffer-create "*Compile-Log*")
481 (let ((inhibit-read-only t)) (erase-buffer))) 481 (let ((inhibit-read-only t)) (erase-buffer)))
482 (dolist (f '(my-test0 my--test11 my--test12 my--test2)) 482 (mapc #'fmakunbound '(my-test0 my--test11 my--test12 my--test2))
483 (fset f nil))
484 (test-byte-comp-compile-and-load t 483 (test-byte-comp-compile-and-load t
485 '(progn 484 '(progn
486 (defun my-test0 () 485 (defun my-test0 ()