summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 3947bdcdf12..1e10c828de5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-11 Glenn Morris <rgm@gnu.org>
+
+ * cus-dep.el (custom-make-dependencies): Only use safe local variables.
+ Treat cc-provide like provide.
+
2013-05-11 Kevin Ryde <user42@zip.com.au>
* cus-dep.el (custom-make-dependencies):
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 099998bf989..79698cc4b4a 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -42,6 +42,7 @@ ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)"
"Batch function to extract custom dependencies from .el files.
Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
(let ((enable-local-eval nil)
+ (enable-local-variables :safe)
subdir)
(with-temp-buffer
;; Use up command-line-args-left else Emacs can try to open
@@ -70,7 +71,7 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
(load-file-name file))
(if (save-excursion
(re-search-forward
- (concat "(provide[ \t\n]+\\('\\|(quote[ \t\n]\\)[ \t\n]*"
+ (concat "(\\(cc-\\)?provide[ \t\n]+\\('\\|(quote[ \t\n]\\)[ \t\n]*"
(regexp-quote name) "[ \t\n)]")
nil t))
(setq name (intern name)))