From cd2d58c1c81d608d6e1aefe1eb8a3d1f1cd60540 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 3 Jan 2015 18:28:35 -0800 Subject: [PATCH] Less 'make' chatter in batch mode * admin/unidata/unidata-gen.el (unidata-gen-files): * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): * lisp/emacs-lisp/bytecomp.el (byte-compile-file): * lisp/files.el (save-buffer, basic-save-buffer): * lisp/international/quail.el (quail-update-leim-list-file): Don't output messages like "Generating ..." in batch mode. --- admin/ChangeLog | 6 ++++++ admin/unidata/unidata-gen.el | 4 ++-- lisp/ChangeLog | 9 +++++++++ lisp/emacs-lisp/autoload.el | 5 +++-- lisp/emacs-lisp/bytecomp.el | 2 +- lisp/files.el | 4 ++-- lisp/international/quail.el | 4 ++-- 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index d7025657e78..2f4d122e0c0 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2015-01-04 Paul Eggert + + Less chatter in batch mode + * unidata/unidata-gen.el (unidata-gen-files): + Don't output messages like "Generating ..." in batch mode. + 2015-01-02 Paul Eggert Less 'make' chatter for unidata diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index ca3bae1070a..8af6fa0dd72 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -1329,7 +1329,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." (insert (format "(define-char-code-property '%S %S\n %S)\n" prop basename docstring)) (with-temp-buffer - (message "Generating %s..." file) + (or noninteractive (message "Generating %s..." file)) (when (file-exists-p file) (insert-file-contents file) (goto-char (point-max)) @@ -1356,7 +1356,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." ";; End:\n\n" (format ";; %s ends here\n" basename))) (write-file file) - (message "Generating %s...done" file)))) + (or noninteractive (message "Generating %s...done" file))))) (message "Writing %s..." charprop-file) (insert ";; Local Variables:\n" ";; coding: utf-8\n" diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77a7ec3ac00..2feb2af917f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-01-04 Paul Eggert + + Less 'make' chatter in batch mode + * emacs-lisp/autoload.el (autoload-generate-file-autoloads): + * emacs-lisp/bytecomp.el (byte-compile-file): + * files.el (save-buffer, basic-save-buffer): + * international/quail.el (quail-update-leim-list-file): + Don't output messages like "Generating ..." in batch mode. + 2015-01-04 Dmitry Gutov Unbreak `mouse-action' property in text buttons. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index e9d13b86c29..073d923a178 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -539,7 +539,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE (autoload-find-file file)) ;; Obey the no-update-autoloads file local variable. (unless no-update-autoloads - (message "Generating autoloads for %s..." file) + (or noninteractive (message "Generating autoloads for %s..." file)) (setq load-name (if (stringp generated-autoload-load-name) generated-autoload-load-name @@ -623,7 +623,8 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE (nth 5 (file-attributes relfile)))) (insert ";;; Generated autoloads from " relfile "\n"))) (insert generate-autoload-section-trailer)))) - (message "Generating autoloads for %s...done" file)) + (or noninteractive + (message "Generating autoloads for %s...done" file))) (or visited ;; We created this buffer, so we should kill it. (kill-buffer (current-buffer)))) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 4c694adfa23..1acd4fe76b2 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1858,7 +1858,7 @@ The value is non-nil if there were no errors, nil if errors." ;; recompiled). Previously this was accomplished by ;; deleting target-file before writing it. (rename-file tempfile target-file t) - (message "Wrote %s" target-file)) + (or noninteractive (message "Wrote %s" target-file))) ;; This is just to give a better error message than write-region (signal 'file-error (list "Opening output file" diff --git a/lisp/files.el b/lisp/files.el index 22362ca13ca..80b538c3267 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4663,7 +4663,7 @@ See the subroutine `basic-save-buffer' for more information." ;; then Rmail-mbox never displays it due to buffer swapping. If ;; the test is ever re-introduced, be sure to handle saving of ;; Rmail files. - (if (and modp (buffer-file-name)) + (if (and modp (buffer-file-name) (not noninteractive)) (message "Saving file %s..." (buffer-file-name))) (basic-save-buffer) (and modp (memq arg '(4 64)) (setq buffer-backed-up nil)))) @@ -4805,7 +4805,7 @@ Before and after saving the buffer, this function runs ;; Support VC `implicit' locking. (vc-after-save) (run-hooks 'after-save-hook)) - (message "(No changes need to be saved)")))) + (or noninteractive (message "(No changes need to be saved)"))))) ;; This does the "real job" of writing a buffer into its visited file ;; and making a backup file. This is what is normally done diff --git a/lisp/international/quail.el b/lisp/international/quail.el index f194b93526e..2755fd68bef 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2985,7 +2985,7 @@ of each directory." quail-dirs list-buf pkg-list pos) (if (not (file-writable-p leim-list)) (error "Can't write to file \"%s\"" leim-list)) - (message "Updating %s ..." leim-list) + (or noninteractive (message "Updating %s ..." leim-list)) (setq list-buf (find-file-noselect leim-list)) ;; At first, clean up the file. @@ -3077,7 +3077,7 @@ of each directory." (let ((coding-system-for-write 'utf-8)) (save-buffer 0))) (kill-buffer list-buf) - (message "Updating %s ... done" leim-list))) + (or noninteractive (message "Updating %s ... done" leim-list)))) (defun quail-advice (args) "Advise users about the characters input by the current Quail package. -- 2.39.2