(dired-omit-expunge): Message if skipping omitting

because directory is too large; also unset dired-omit-files-p.
(dired-omit-size-limit): Increase default from 20000 to 30000.

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index b9c2d13b2ae9f58bd2b22892961b15ed08069aed..03c3e3f2f3c9f7e39be9415bbffa34aff47bac14 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -208,7 +208,7 @@ toggle between those two."
   :type 'boolean
   :group 'dired-x)
 
-(defcustom dired-omit-size-limit 20000
+(defcustom dired-omit-size-limit 30000
   "*Maximum size for the \"omitting\" feature.
 If nil, there is no maximum size."
   :type '(choice (const :tag "no maximum" nil) integer)
@@ -580,7 +580,12 @@ This functions works by temporarily binding `dired-marker-char' to
   (if (and dired-omit-files-p
            (or (interactive-p)
                (not dired-omit-size-limit)
-               (< (buffer-size) dired-omit-size-limit)))
+               (< (buffer-size) dired-omit-size-limit)
+              (progn
+                (message "Not omitting: directory larger than %d characters."
+                         dired-omit-size-limit)
+                (setq dired-omit-files-p nil)
+                nil)))
       (let ((omit-re (or regexp (dired-omit-regexp)))
             (old-modified-p (buffer-modified-p))
             count)