[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112595: custom-make-dependencies twe
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112595: custom-make-dependencies tweaks |
Date: |
Wed, 15 May 2013 19:31:16 -0400 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112595
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-15 19:31:16 -0400
message:
custom-make-dependencies tweaks
* lisp/cus-dep.el (custom-make-dependencies): Ignore dotfiles (dir-locals).
Don't mistakenly ignore files whose basenames match a basename
from preloaded-file-list (eg cedet/ede/simple.el).
modified:
lisp/ChangeLog
lisp/cus-dep.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-15 23:21:01 +0000
+++ b/lisp/ChangeLog 2013-05-15 23:31:16 +0000
@@ -1,3 +1,9 @@
+2013-05-15 Glenn Morris <address@hidden>
+
+ * cus-dep.el (custom-make-dependencies): Ignore dotfiles (dir-locals).
+ Don't mistakenly ignore files whose basenames match a basename
+ from preloaded-file-list (eg cedet/ede/simple.el).
+
2013-05-15 Juri Linkov <address@hidden>
* isearch.el (isearch-char-by-name): Rename from
=== modified file 'lisp/cus-dep.el'
--- a/lisp/cus-dep.el 2013-05-13 16:21:00 +0000
+++ b/lisp/cus-dep.el 2013-05-15 23:31:16 +0000
@@ -61,16 +61,14 @@
;; the args as directories after we are done.
(while (setq subdir (pop command-line-args-left))
(message "Directory %s" subdir)
- (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'"))
+ (let ((files (directory-files subdir nil "\\`[^=.].*\\.el\\'"))
(default-directory (expand-file-name subdir))
- (preloaded (concat "\\`"
- (regexp-opt (mapcar
- 'file-name-base
- preloaded-file-list) t)
+ (preloaded (concat "\\`\\(\\./+\\)?"
+ (regexp-opt preloaded-file-list t)
"\\.el\\'")))
(dolist (file files)
(unless (or (string-match custom-dependencies-no-scan-regexp file)
- (string-match preloaded file)
+ (string-match preloaded (format "%s/%s" subdir file))
(not (file-exists-p file)))
(erase-buffer)
(kill-all-local-variables)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112595: custom-make-dependencies tweaks,
Glenn Morris <=