From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 26 Aug 2020 17:51:48 +0000 (-0700)
Subject: * lisp/files.el (insert-directory): Simplify (if ... X X) to X.
X-Git-Tag: emacs-28.0.90~6377
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dfeb0593128006e4cd1e47d831bf00bde9867437;p=emacs.git

* lisp/files.el (insert-directory): Simplify (if ... X X) to X.
---

diff --git a/lisp/files.el b/lisp/files.el
index e08f0f0134c..3403e257a16 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7070,6 +7070,8 @@ normally equivalent short `-D' option is just passed on to
                              ((stringp switches) (concat switches " -d"))
                              ((member "-d" switches) switches)
                              (t (append switches '("-d"))))))
+		    (if (string-match "\\`~" file)
+			(setq file (expand-file-name file)))
 		    (apply 'call-process
 			   insert-directory-program nil t nil
 			   (append
@@ -7080,14 +7082,7 @@ normally equivalent short `-D' option is just passed on to
 				(split-string-and-unquote switches)))
 			    ;; Avoid lossage if FILE starts with `-'.
 			    '("--")
-			    (progn
-			      (if (string-match "\\`~" file)
-				  (setq file (expand-file-name file)))
-			      (list
-			       (if full-directory-p
-				   ;; (concat (file-name-as-directory file) ".")
-                                   file
-				 file))))))))
+			    (list file))))))
 
 	  ;; If we got "//DIRED//" in the output, it means we got a real
 	  ;; directory listing, even if `ls' returned nonzero.