emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Juanma Barranquero
Subject: [Emacs-diffs] Changes to emacs/lisp/ibuffer.el
Date: Wed, 24 Aug 2005 07:34:39 -0400

Index: emacs/lisp/ibuffer.el
diff -c emacs/lisp/ibuffer.el:1.71 emacs/lisp/ibuffer.el:1.72
*** emacs/lisp/ibuffer.el:1.71  Sat Aug  6 22:13:43 2005
--- emacs/lisp/ibuffer.el       Wed Aug 24 11:34:39 2005
***************
*** 40,45 ****
--- 40,55 ----
  
  (require 'font-core)
  
+ (eval-when-compile
+   ;; These come from ibuf-ext.el, which can not be require'd at compile time
+   ;; because it has a recursive dependency on ibuffer.el
+   (defvar ibuffer-auto-mode)               (defvar 
ibuffer-cached-filter-formats)
+   (defvar ibuffer-compiled-filter-formats) (defvar 
ibuffer-filter-format-alist)
+   (defvar ibuffer-filter-group-kill-ring)  (defvar ibuffer-filter-groups)
+   (defvar ibuffer-filtering-qualifiers)    (defvar 
ibuffer-hidden-filter-groups)
+   (defvar ibuffer-inline-columns)          (defvar 
ibuffer-show-empty-filter-groups)
+   (defvar ibuffer-tmp-hide-regexps)        (defvar ibuffer-tmp-show-regexps))
+ 
  (defgroup ibuffer nil
    "An advanced replacement for `buffer-menu'.
  
***************
*** 814,819 ****
--- 824,834 ----
  
  (defvar ibuffer-did-modification nil)
  
+ (defvar ibuffer-compiled-formats nil)
+ (defvar ibuffer-cached-formats nil)
+ (defvar ibuffer-cached-eliding-string nil)
+ (defvar ibuffer-cached-elide-long-columns 0)
+ 
  (defvar ibuffer-sorting-functions-alist nil
    "An alist of functions which describe how to sort buffers.
  
***************
*** 1394,1400 ****
  
  (defun ibuffer-compile-make-eliding-form (strvar elide from-end-p)
    (let ((ellipsis (propertize ibuffer-eliding-string 'font-lock-face 'bold)))
!     (if (or elide ibuffer-elide-long-columns)
        `(if (> strlen 5)
             ,(if from-end-p
                  `(concat ,ellipsis
--- 1409,1415 ----
  
  (defun ibuffer-compile-make-eliding-form (strvar elide from-end-p)
    (let ((ellipsis (propertize ibuffer-eliding-string 'font-lock-face 'bold)))
!     (if (or elide (with-no-warnings ibuffer-elide-long-columns))
        `(if (> strlen 5)
             ,(if from-end-p
                  `(concat ,ellipsis
***************
*** 1567,1577 ****
                                            '(tmp2)))
                              ,@(nreverse result))))))))
  
- (defvar ibuffer-compiled-formats nil)
- (defvar ibuffer-cached-formats nil)
- (defvar ibuffer-cached-eliding-string nil)
- (defvar ibuffer-cached-elide-long-columns 0)
- 
  (defun ibuffer-recompile-formats ()
    "Recompile `ibuffer-formats'."
    (interactive)
--- 1582,1587 ----
***************
*** 1603,1609 ****
              (not (equal ibuffer-cached-eliding-string ibuffer-eliding-string))
              (eql 0 ibuffer-cached-elide-long-columns)
              (not (eql ibuffer-cached-elide-long-columns
!                       ibuffer-elide-long-columns))
              (and ext-loaded
                   (not (eq ibuffer-cached-filter-formats
                            ibuffer-filter-format-alist))
--- 1613,1619 ----
              (not (equal ibuffer-cached-eliding-string ibuffer-eliding-string))
              (eql 0 ibuffer-cached-elide-long-columns)
              (not (eql ibuffer-cached-elide-long-columns
!                       (with-no-warnings ibuffer-elide-long-columns)))
              (and ext-loaded
                   (not (eq ibuffer-cached-filter-formats
                            ibuffer-filter-format-alist))
***************
*** 1613,1619 ****
        (ibuffer-recompile-formats)
        (setq ibuffer-cached-formats ibuffer-formats
            ibuffer-cached-eliding-string ibuffer-eliding-string
!           ibuffer-cached-elide-long-columns ibuffer-elide-long-columns)
        (when ext-loaded
        (setq ibuffer-cached-filter-formats ibuffer-filter-format-alist))
        (message "Formats have changed, recompiling...done"))))
--- 1623,1629 ----
        (ibuffer-recompile-formats)
        (setq ibuffer-cached-formats ibuffer-formats
            ibuffer-cached-eliding-string ibuffer-eliding-string
!           ibuffer-cached-elide-long-columns (with-no-warnings 
ibuffer-elide-long-columns))
        (when ext-loaded
        (setq ibuffer-cached-filter-formats ibuffer-filter-format-alist))
        (message "Formats have changed, recompiling...done"))))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]