From: Ivan Shmakov <ivan@siamics.net>
Date: Mon, 19 Jan 2015 09:50:41 +0000 (+0000)
Subject: Fix the value default-directory gets in custom-make-dependencies.
X-Git-Tag: emacs-25.0.90~2595^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e8d209f258c9bb6a6626d4a101995965b040024;p=emacs.git

Fix the value default-directory gets in custom-make-dependencies.

* lisp/cus-dep.el (custom-make-dependencies): Ensure that
default-directory is interpreted as a directory (see bug#19140.)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3991885d2ec..44d0cddc642 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-19  Ivan Shmakov  <ivan@siamics.net>
+
+	* cus-dep.el (custom-make-dependencies): Ensure that
+	default-directory is interpreted as a directory (see bug#19140.)
+
 2015-01-19  Dmitry Gutov  <dgutov@yandex.ru>
 
 	* progmodes/xref.el (xref--display-position):
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 453b15ddcea..b8a9eb82655 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -62,7 +62,8 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
       (while (setq subdir (pop command-line-args-left))
         (message "Directory %s" subdir)
         (let ((files (directory-files subdir nil "\\`[^=.].*\\.el\\'"))
-              (default-directory (expand-file-name subdir))
+              (default-directory
+                (file-name-as-directory (expand-file-name subdir)))
               (preloaded (concat "\\`\\(\\./+\\)?"
                                  (regexp-opt preloaded-file-list t)
                                  "\\.el\\'")))