From f8d3d18168a742691d095a3f0c83512f19621725 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Wed, 19 Aug 2020 14:43:11 +0100
Subject: [PATCH] ; Minor simplification of two recent changes

---
 lisp/simple.el                         | 2 +-
 test/lisp/emacs-lisp/bytecomp-tests.el | 3 +--
 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."
 			    (and (commandp (function-called-at-point))
 				 (format "%S" (function-called-at-point)))))
 		     (all (sort (minibuffer-default-add-completions)
-				(lambda (a b) (string< a b)))))
+                                #'string<)))
 		 (if def
 		     (cons def (delete def all))
 		   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."
 (ert-deftest bytecomp-tests--warnings ()
   (with-current-buffer (get-buffer-create "*Compile-Log*")
     (let ((inhibit-read-only t)) (erase-buffer)))
-  (dolist (f '(my-test0 my--test11 my--test12 my--test2))
-    (fset f nil))
+  (mapc #'fmakunbound '(my-test0 my--test11 my--test12 my--test2))
   (test-byte-comp-compile-and-load t
     '(progn
        (defun my-test0 ()
-- 
2.39.5