* dired-x.el (dired-omit-verbose): New defcustom that allows

disabling the omit messages.
(dired-omit-expunge): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a465244a4dd8544a90be91e3e9b551971b5a1486..b7e1ed62d7bec1aa38e7d20ad3da6bb138e3c123 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-13  Tassilo Horn  <tassilo@member.fsf.org>
+
+       * dired-x.el (dired-omit-verbose): New defcustom that allows
+       disabling the omit messages.
+       (dired-omit-expunge): Use it.
+
 2011-01-13  Christian Ohler  <ohler@gnu.org>
 
        * emacs-lisp/ert.el, emacs-lisp/ert-x.el: New files.

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 45fdda71356994cf79018a1fa0bcc2e024745b87..a0b3bf38c037fd6b318b4f927073dfdce47637a2 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -189,6 +189,12 @@ files and lock files."
   :type 'regexp
   :group 'dired-x)
 
+(defcustom dired-omit-verbose t
+  "When non-nil, show messages when omitting files.
+When nil, don't show messages."
+  :type 'boolean
+  :group 'dired-x)
+
 (defcustom dired-find-subdir nil           ; t is pretty near to DWIM...
   "If non-nil, Dired always finds a directory in a buffer of its own.
 If nil, Dired finds the directory as a subdirectory in some other buffer
@@ -613,8 +619,9 @@ This functions works by temporarily binding `dired-marker-char' to
                (not dired-omit-size-limit)
                (< (buffer-size) dired-omit-size-limit)
               (progn
-                (message "Not omitting: directory larger than %d characters."
-                         dired-omit-size-limit)
+                (when dired-omit-verbose
+                  (message "Not omitting: directory larger than %d characters."
+                           dired-omit-size-limit))
                 (setq dired-omit-mode nil)
                 nil)))
       (let ((omit-re (or regexp (dired-omit-regexp)))
@@ -622,12 +629,14 @@ This functions works by temporarily binding `dired-marker-char' to
             count)
         (or (string= omit-re "")
             (let ((dired-marker-char dired-omit-marker-char))
-              (message "Omitting...")
+              (when dired-omit-verbose (message "Omitting..."))
               (if (dired-mark-unmarked-files omit-re nil nil dired-omit-localp)
                   (progn
-                    (setq count (dired-do-kill-lines nil "Omitted %d line%s."))
+                    (setq count (dired-do-kill-lines
+                                nil
+                                (if dired-omit-verbose "Omitted %d line%s." "")))
                     (force-mode-line-update))
-                (message "(Nothing to omit)"))))
+                (when dired-omit-verbose (message "(Nothing to omit)")))))
         ;; Try to preserve modified state of buffer.  So `%*' doesn't appear
         ;; in mode-line of omitted buffers.
         (set-buffer-modified-p (and old-modified-p