summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Shmakov <ivan@siamics.net>2015-01-19 09:50:41 +0000
committerIvan Shmakov <ivan@siamics.net>2015-01-19 09:50:41 +0000
commit2e8d209f258c9bb6a6626d4a101995965b040024 (patch)
tree58a5ae171fb12db6b9792fa6db97481c9b60ebd5
parentb7f83adda5a32140811e8e7decc4394d64cada3d (diff)
downloademacs-2e8d209f258c9bb6a6626d4a101995965b040024.tar.gz
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.)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/cus-dep.el3
2 files changed, 7 insertions, 1 deletions
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\\'")))