Merge from origin/emacs-24

[gnu-emacs] / lisp / international / quail.el

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index f194b93526ec6b3342070993914523051f354fef..2755fd68bef00dcfebe10d9f7b3f2f058a0ddfa4 100644 (file)
--- 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))))
 \f
 (defun quail-advice (args)
   "Advise users about the characters input by the current Quail package.