diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/ibuffer.el | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32393579676..b77dee17d56 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-12-04 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * ibuffer.el (ibuffer-sort-bufferlist): Require ibuf-ext | ||
| 4 | if the sorting functions are not loaded. (Bug#1432) | ||
| 5 | |||
| 1 | 2008-12-04 Sam Steingold <sds@gnu.org> | 6 | 2008-12-04 Sam Steingold <sds@gnu.org> |
| 2 | 7 | ||
| 3 | * progmodes/compile.el (compilation-read-command): Extracted from | 8 | * progmodes/compile.el (compilation-read-command): Extracted from |
| @@ -11817,7 +11822,6 @@ | |||
| 11817 | systems without 12 months per year. | 11822 | systems without 12 months per year. |
| 11818 | 11823 | ||
| 11819 | (calendar-date-is-visible-p): Doc fix. Simplify. | 11824 | (calendar-date-is-visible-p): Doc fix. Simplify. |
| 11820 | |||
| 11821 | * calendar/holidays.el (holiday-filter-visible-calendar): Return result | 11825 | * calendar/holidays.el (holiday-filter-visible-calendar): Return result |
| 11822 | from dolist. | 11826 | from dolist. |
| 11823 | 11827 | ||
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 262f2ad73ab..2aeaf7e1111 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el | |||
| @@ -2191,6 +2191,9 @@ If optional arg SILENT is non-nil, do not display progress messages." | |||
| 2191 | ibuffer-header-line-format))) | 2191 | ibuffer-header-line-format))) |
| 2192 | 2192 | ||
| 2193 | (defun ibuffer-sort-bufferlist (bmarklist) | 2193 | (defun ibuffer-sort-bufferlist (bmarklist) |
| 2194 | (unless ibuffer-sorting-functions-alist | ||
| 2195 | ;; make sure the sorting functions are loaded | ||
| 2196 | (require 'ibuf-ext)) | ||
| 2194 | (let* ((sortdat (assq ibuffer-sorting-mode | 2197 | (let* ((sortdat (assq ibuffer-sorting-mode |
| 2195 | ibuffer-sorting-functions-alist)) | 2198 | ibuffer-sorting-functions-alist)) |
| 2196 | (func (caddr sortdat))) | 2199 | (func (caddr sortdat))) |