[Emacs-diffs] Changes to emacs/lisp/ibuffer.el [lexbind]

[Miles Bader]

Index: emacs/lisp/ibuffer.el
diff -c emacs/lisp/ibuffer.el:1.32.2.7 emacs/lisp/ibuffer.el:1.32.2.8
*** emacs/lisp/ibuffer.el:1.32.2.7      Sat Sep  4 09:21:44 2004
--- emacs/lisp/ibuffer.el       Mon Oct 25 04:22:22 2004
***************
*** 213,224 ****
  If a function, it will be called with the buffer as an argument, and
  should return non-nil if this buffer should be shown.
  
! Viewing of buffers hidden because of these predicates is enabled by
! giving a non-nil prefix argument to `ibuffer-update'.  Note that this
! specialized filtering occurs before real filtering."
    :type '(repeat (choice regexp function))
    :group 'ibuffer)
  
  (defvar ibuffer-current-format nil)
  
  (defcustom ibuffer-movement-cycle t
--- 213,232 ----
  If a function, it will be called with the buffer as an argument, and
  should return non-nil if this buffer should be shown.
  
! Viewing of buffers hidden because of these predicates may be customized
! via `ibuffer-default-display-maybe-show-predicates' and is toggled by 
! giving a non-nil prefix argument to `ibuffer-update'.
! Note that this specialized filtering occurs before real filtering."
    :type '(repeat (choice regexp function))
    :group 'ibuffer)
  
+ (defcustom ibuffer-default-display-maybe-show-predicates nil
+   "Non-nil means show buffers that match `ibuffer-maybe-show-predicates'."
+   :type 'boolean
+   :group 'ibuffer)
+ 
+ (defvar ibuffer-display-maybe-show-predicates nil)
+ 
  (defvar ibuffer-current-format nil)
  
  (defcustom ibuffer-movement-cycle t
***************
*** 865,872 ****
                                    default-directory)
                                default-directory))))
       (list (read-file-name "Find file: " default-directory)
!          current-prefix-arg)))
!   (find-file file (or wildcards (interactive-p))))
  
  (defun ibuffer-mouse-visit-buffer (event)
    "Visit the buffer chosen with the mouse."
--- 873,880 ----
                                    default-directory)
                                default-directory))))
       (list (read-file-name "Find file: " default-directory)
!          t)))
!   (find-file file wildcards))
  
  (defun ibuffer-mouse-visit-buffer (event)
    "Visit the buffer chosen with the mouse."
***************
*** 2069,2079 ****
  
  (defun ibuffer-update (arg &optional silent)
    "Regenerate the list of all buffers.
! Display buffers whose name matches one of `ibuffer-maybe-show-predicates'
! iff arg ARG is non-nil.
  
  If optional arg SILENT is non-nil, do not display progress messages."
    (interactive "P")
    (ibuffer-forward-line 0)
    (let* ((bufs (buffer-list))
         (blist (ibuffer-filter-buffers
--- 2077,2091 ----
  
  (defun ibuffer-update (arg &optional silent)
    "Regenerate the list of all buffers.
! 
! Prefix arg non-nil means to toggle whether buffers that match
! `ibuffer-maybe-show-predicates' should be displayed.
  
  If optional arg SILENT is non-nil, do not display progress messages."
    (interactive "P")
+   (if arg
+       (setq ibuffer-display-maybe-show-predicates
+           (not ibuffer-display-maybe-show-predicates)))
    (ibuffer-forward-line 0)
    (let* ((bufs (buffer-list))
         (blist (ibuffer-filter-buffers
***************
*** 2086,2092 ****
                     (caddr bufs)
                   (cadr bufs))
                 (ibuffer-current-buffers-with-marks bufs)
!                arg)))
      (when (null blist)
        (if (and (featurep 'ibuf-ext)
               ibuffer-filtering-qualifiers)
--- 2098,2104 ----
                     (caddr bufs)
                   (cadr bufs))
                 (ibuffer-current-buffers-with-marks bufs)
!                ibuffer-display-maybe-show-predicates)))
      (when (null blist)
        (if (and (featurep 'ibuf-ext)
               ibuffer-filtering-qualifiers)
***************
*** 2148,2154 ****
       'ibuffer-filter-group
       name)))
  
! (defun ibuffer-redisplay-engine (bmarklist &optional all)
    (assert (eq major-mode 'ibuffer-mode))
    (let* ((--ibuffer-insert-buffers-and-marks-format
          (ibuffer-current-format))
--- 2160,2166 ----
       'ibuffer-filter-group
       name)))
  
! (defun ibuffer-redisplay-engine (bmarklist &optional ignore)
    (assert (eq major-mode 'ibuffer-mode))
    (let* ((--ibuffer-insert-buffers-and-marks-format
          (ibuffer-current-format))
***************
*** 2475,2480 ****
--- 2487,2494 ----
         ibuffer-default-sorting-reversep)
    (set (make-local-variable 'ibuffer-shrink-to-minimum-size)
         ibuffer-default-shrink-to-minimum-size)
+   (set (make-local-variable 'ibuffer-display-maybe-show-predicates)
+        ibuffer-default-display-maybe-show-predicates)
    (set (make-local-variable 'ibuffer-filtering-qualifiers) nil)
    (set (make-local-variable 'ibuffer-filter-groups) nil)
    (set (make-local-variable 'ibuffer-filter-group-kill-ring) nil)