cus-dep fix for build failure first occurring with 2011-06-13T08:21:09Z!rudalics...

The symptom was `make custom-dep' failing with "Unknown terminal type".
This is caused by `display-buffer' trying to pop-up a frame in batch mode.
I think this cus-dep change may be just papering over the immediate
manifestation of the underlying problem.

* lisp/cus-dep.el (custom-make-dependencies): Use up command-line-args-left.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a58b571c62c00c1d42e2b1cffeb829a5446f56e3..7dac139c29545e5ae14d7ab64ef9cce21d70fd7a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-13  Glenn Morris  <rgm@gnu.org>
+
+       * cus-dep.el (custom-make-dependencies): Use up command-line-args-left.
+
 2011-06-13  Martin Rudalics  <rudalics@gmx.at>
 
        * help.el (help-window): Remove variable.

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 5e74c68978fb43602ee2766773ec4840bc420d6d..091f832c092b2fc28c39c4a74ee23ede4af1c345 100644 (file)
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -42,9 +42,12 @@ ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)"
 (defun custom-make-dependencies ()
   "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))
+  (let ((enable-local-eval nil)
+       subdir)
     (with-temp-buffer
-      (dolist (subdir command-line-args-left)
+      ;; Use up command-line-args-left else Emacs can try to open
+      ;; 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\\'"))
               (default-directory (expand-file-name subdir))