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

[Miles Bader]

Index: emacs/lisp/ibuf-ext.el
diff -c emacs/lisp/ibuf-ext.el:1.23.2.5 emacs/lisp/ibuf-ext.el:1.23.2.6
*** emacs/lisp/ibuf-ext.el:1.23.2.5     Wed Oct  6 05:21:52 2004
--- emacs/lisp/ibuf-ext.el      Mon Oct 25 04:22:23 2004
***************
*** 645,660 ****
    (ibuffer-update nil t))
  
  ;;;###autoload
! (defun ibuffer-kill-line (&optional arg)
    "Kill the filter group at point.
  See also `ibuffer-kill-filter-group'."
!   (interactive "P")
    (ibuffer-aif (save-excursion
                 (ibuffer-forward-line 0)
                 (get-text-property (point) 'ibuffer-filter-group-name))
        (progn
        (ibuffer-kill-filter-group it))
!       (funcall (if (interactive-p) #'call-interactively #'funcall)
               #'kill-line arg)))
  
  (defun ibuffer-insert-filter-group-before (newgroup group)
--- 645,660 ----
    (ibuffer-update nil t))
  
  ;;;###autoload
! (defun ibuffer-kill-line (&optional arg interactive-p)
    "Kill the filter group at point.
  See also `ibuffer-kill-filter-group'."
!   (interactive "P\np")
    (ibuffer-aif (save-excursion
                 (ibuffer-forward-line 0)
                 (get-text-property (point) 'ibuffer-filter-group-name))
        (progn
        (ibuffer-kill-filter-group it))
!       (funcall (if interactive-p #'call-interactively #'funcall)
               #'kill-line arg)))
  
  (defun ibuffer-insert-filter-group-before (newgroup group)
***************
*** 1237,1289 ****
  If `ibuffer-jump-offer-only-visible-buffers' is non-nil, only offer
  visible buffers in the completion list.  Calling the command with
  a prefix argument reverses the meaning of that variable."
!   (interactive (list nil))
!   (let ((only-visible ibuffer-jump-offer-only-visible-buffers))
!     (when current-prefix-arg
!       (setq only-visible (not only-visible)))
!     (if only-visible
!       (let ((table (mapcar #'(lambda (x)
!                                (buffer-name (car x)))
!                            (ibuffer-current-state-list))))
!         (when (null table)
!           (error "No buffers!"))
!         (when (interactive-p)
!           (setq name (completing-read "Jump to buffer: "
!                                       table nil t))))
!       (when (interactive-p)
!       (setq name (read-buffer "Jump to buffer: " nil t))))
!     (when (not (string= "" name))
!       (let (buf-point)
!       ;; Blindly search for our buffer: it is very likely that it is
!       ;; not in a hidden filter group.
!       (ibuffer-map-lines #'(lambda (buf marks)
!                              (when (string= (buffer-name buf) name)
!                                (setq buf-point (point))
!                                nil))
!                          t nil)
!       (when (and
!              (null buf-point)
!              (not (null ibuffer-hidden-filter-groups)))
!         ;; We did not find our buffer.  It must be in a hidden filter
!         ;; group, so go through all hidden filter groups to find it.
!         (catch 'found
!           (dolist (group ibuffer-hidden-filter-groups)
!             (ibuffer-jump-to-filter-group group)
!             (ibuffer-toggle-filter-group)
!             (ibuffer-map-lines #'(lambda (buf marks)
!                                    (when (string= (buffer-name buf) name)
!                                      (setq buf-point (point))
!                                      nil))
!                                t group)
!             (if buf-point
!                 (throw 'found nil)
!               (ibuffer-toggle-filter-group)))))
!       (if (null buf-point)
!           ;; Still not found even though we expanded all hidden filter
!           ;; groups: that must be because it's hidden by predicate:
!           ;; we won't bother trying to display it.
!           (error "No buffer with name %s" name)
!         (goto-char buf-point))))))
  
  ;;;###autoload
  (defun ibuffer-diff-with-file ()
--- 1237,1287 ----
  If `ibuffer-jump-offer-only-visible-buffers' is non-nil, only offer
  visible buffers in the completion list.  Calling the command with
  a prefix argument reverses the meaning of that variable."
!   (interactive (list
!               (let ((only-visible ibuffer-jump-offer-only-visible-buffers))
!                 (when current-prefix-arg
!                   (setq only-visible (not only-visible)))
!                 (if only-visible
!                     (let ((table (mapcar #'(lambda (x)
!                                              (buffer-name (car x)))
!                                          (ibuffer-current-state-list))))
!                       (when (null table)
!                         (error "No buffers!"))
!                       (completing-read "Jump to buffer: "
!                                        table nil t))
!                   (read-buffer "Jump to buffer: " nil t)))))
!   (when (not (string= "" name))
!     (let (buf-point)
!       ;; Blindly search for our buffer: it is very likely that it is
!       ;; not in a hidden filter group.
!       (ibuffer-map-lines #'(lambda (buf marks)
!                            (when (string= (buffer-name buf) name)
!                              (setq buf-point (point))
!                              nil))
!                        t nil)
!       (when (and
!            (null buf-point)
!            (not (null ibuffer-hidden-filter-groups)))
!       ;; We did not find our buffer.  It must be in a hidden filter
!       ;; group, so go through all hidden filter groups to find it.
!       (catch 'found
!         (dolist (group ibuffer-hidden-filter-groups)
!           (ibuffer-jump-to-filter-group group)
!           (ibuffer-toggle-filter-group)
!           (ibuffer-map-lines #'(lambda (buf marks)
!                                  (when (string= (buffer-name buf) name)
!                                    (setq buf-point (point))
!                                    nil))
!                              t group)
!           (if buf-point
!               (throw 'found nil)
!             (ibuffer-toggle-filter-group)))))
!       (if (null buf-point)
!         ;; Still not found even though we expanded all hidden filter
!         ;; groups: that must be because it's hidden by predicate:
!         ;; we won't bother trying to display it.
!         (error "No buffer with name %s" name)
!       (goto-char buf-point)))))
  
  ;;;###autoload
  (defun ibuffer-diff-with-file ()