* cus-dep.el (custom-make-dependencies): Only use safe local variables.

Treat cc-provide like provide.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3947bdcdf122dac1efc26dae0a3a1ed23b2b99fa..1e10c828de5736873e30f334a6f0654b19bda2d2 100644 (file)
--- 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 099998bf9892e7fd8fe3a6524207e834986ccd61..79698cc4b4ac1f404ea56559d22fa97991b036fc 100644 (file)
--- 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)))