diff options
| author | Glenn Morris | 2011-06-13 17:42:40 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-06-13 17:42:40 -0400 |
| commit | d647b7c44e4205c50b29d1533880e9ae7ce0bea6 (patch) | |
| tree | e1feaa8538dae8a75fb1c47879cf4a30aa657ef6 | |
| parent | 357f93d245344725f9d7c5b96eadc400107923b6 (diff) | |
| download | emacs-d647b7c44e4205c50b29d1533880e9ae7ce0bea6.tar.gz emacs-d647b7c44e4205c50b29d1533880e9ae7ce0bea6.zip | |
cus-dep fix for build failure first occurring with 2011-06-13T08:21:09Z!rudalics@gmx.at
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.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/cus-dep.el | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a58b571c62c..7dac139c295 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-06-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * cus-dep.el (custom-make-dependencies): Use up command-line-args-left. | ||
| 4 | |||
| 1 | 2011-06-13 Martin Rudalics <rudalics@gmx.at> | 5 | 2011-06-13 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | * help.el (help-window): Remove variable. | 7 | * help.el (help-window): Remove variable. |
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index 5e74c68978f..091f832c092 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el | |||
| @@ -42,9 +42,12 @@ ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)" | |||
| 42 | (defun custom-make-dependencies () | 42 | (defun custom-make-dependencies () |
| 43 | "Batch function to extract custom dependencies from .el files. | 43 | "Batch function to extract custom dependencies from .el files. |
| 44 | Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" | 44 | Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" |
| 45 | (let ((enable-local-eval nil)) | 45 | (let ((enable-local-eval nil) |
| 46 | subdir) | ||
| 46 | (with-temp-buffer | 47 | (with-temp-buffer |
| 47 | (dolist (subdir command-line-args-left) | 48 | ;; Use up command-line-args-left else Emacs can try to open |
| 49 | ;; the args as directories after we are done. | ||
| 50 | (while (setq subdir (pop command-line-args-left)) | ||
| 48 | (message "Directory %s" subdir) | 51 | (message "Directory %s" subdir) |
| 49 | (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'")) | 52 | (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'")) |
| 50 | (default-directory (expand-file-name subdir)) | 53 | (default-directory (expand-file-name subdir)) |