Un-revert changes mistakenly dropped by f9fabb2b

[gnu-emacs] / lisp / ibuffer.el

diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 5541bbb310eefb84177430f6cc69da3d70fc2ec9..c426976b29cad4e5bdf3189713088e6bec67fead 100644 (file)
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1,6 +1,6 @@
 ;;; ibuffer.el --- operate on buffers like dired  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
@@ -1908,9 +1908,9 @@ the buffer object itself and the current mark symbol."
                     ;; Kill the line if the buffer is dead
                     'kill)))
              ;; A given mapping function should return:
-             ;; `nil' if it chose not to affect the buffer
+             ;; nil if it chose not to affect the buffer
              ;; `kill' means the remove line from the buffer list
-             ;; `t' otherwise
+             ;; t otherwise
              (cl-incf ibuffer-map-lines-total)
              (cond ((null result)
                     (forward-line 1))
@@ -2162,7 +2162,7 @@ If optional arg SILENT is non-nil, do not display progress messages."
                      (eq ibuffer-always-show-last-buffer
                          :nomini)
                      (minibufferp (cadr bufs)))
-                    (cl-caddr bufs)
+                    (nth 2 bufs)
                   (cadr bufs))
                 (ibuffer-current-buffers-with-marks bufs)
                 ibuffer-display-maybe-show-predicates)))
@@ -2194,7 +2194,7 @@ If optional arg SILENT is non-nil, do not display progress messages."
     (require 'ibuf-ext))
   (let* ((sortdat (assq ibuffer-sorting-mode
                        ibuffer-sorting-functions-alist))
-        (func (cl-caddr sortdat)))
+        (func (nth 2 sortdat)))
     (let ((result
           ;; actually sort the buffers
           (if (and sortdat func)
@@ -2597,7 +2597,7 @@ will be inserted before the group at point."
 \f
 ;;; Start of automatically extracted autoloads.
 \f
-;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "0d2393d1b47136bc7b1ac41593527f02")
+;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "442bac528ce7a9a20bb191d0eb08cbd8")
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload 'ibuffer-auto-mode "ibuf-ext" "\