From: Glenn Morris <rgm@gnu.org>
Date: Wed, 16 Mar 2016 21:36:57 +0000 (-0400)
Subject: * lisp/dired-x.el (dired-omit-here-always): Replace undefined function
X-Git-Tag: emacs-25.0.93~89^2~52^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=253929fee3c990703f26fc76ccb9ea8b56881772;p=emacs.git

* lisp/dired-x.el (dired-omit-here-always): Replace undefined function
removed 2016-01-30.

; Do not merge to master.
---

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index dccaa9e96ca..84de13d7ef9 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -819,9 +819,8 @@ If in a Dired buffer, reverts it."
 replace it with a dir-locals-file `./%s.el'"
              dired-local-variables-file
              dir-locals-file))
-  (if (dir-locals--all-files default-directory)
-      (message "File `./%s' already exists."
-               (car (dir-locals--all-files default-directory)))
+  (if (file-exists-p dir-locals-file)
+      (message "File `./%s' already exists." dir-locals-file)
     (add-dir-local-variable 'dired-mode 'subdirs nil)
     (add-dir-local-variable 'dired-mode 'dired-omit-mode t)
     ;; Run extra-hooks and revert directory.