[Emacs-diffs] /srv/bzr/emacs/trunk r104581: cus-dep fix for build failure first occurring with r104579

[Glenn Morris]

------------------------------------------------------------
revno: 104581
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-06-13 17:42:40 -0400
message:
  cus-dep fix for build failure first occurring with r104579
  
  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.
modified:
  lisp/ChangeLog
  lisp/cus-dep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-13 13:14:42 +0000
+++ b/lisp/ChangeLog    2011-06-13 21:42:40 +0000
@@ -1,3 +1,7 @@
+2011-06-13  Glenn Morris  <address@hidden>
+
+       * cus-dep.el (custom-make-dependencies): Use up command-line-args-left.
+
 2011-06-13  Martin Rudalics  <address@hidden>
 
        * help.el (help-window): Remove variable.

=== modified file 'lisp/cus-dep.el'
--- a/lisp/cus-dep.el   2011-01-25 04:08:28 +0000
+++ b/lisp/cus-dep.el   2011-06-13 21:42:40 +0000
@@ -42,9 +42,12 @@
 (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))