emacs: lisp/ibuffer.el comparison

comparison lisp/ibuffer.el @ 44571:be1cb50b8859

(ibuffer-forward-line): Just skip header if we're only moving one line forward. (ibuffer-map-lines): Preserve point position even if we delete lines. Only call mapping functions with buffer and mark arguments; the other two were unused. (ibuffer-redisplay, ibuffer-update): Always skip special areas.

author	Colin Walters <walters@gnu.org>
date	Sun, 14 Apr 2002 01:50:57 +0000
parents	5fa7b088231f
children	9d84a456037d

comparison

equal deleted inserted replaced

-:30d170360f38
+:be1cb50b8859
 (setq arg 1))
 (beginning-of-line)
 (when (or (eobp)
 	    (get-text-property (point) 'ibuffer-summary))
 (goto-char (point-min)))
-(while (get-text-property (point) 'ibuffer-title)
+(when (get-text-property (point) 'ibuffer-title)
-(forward-line 1))
+(if (> arg 0)
+	(decf arg))
+(while (get-text-property (point) 'ibuffer-title)
+(forward-line 1)))
 (if (< arg 0)
 (ibuffer-backward-line (- arg))
 (while (> arg 0)
 (forward-line 1)
 (when (or (eobp)
 (ibuffer-map-lines function t))
 (defun ibuffer-buffer-names-with-mark (mark)
 (let ((ibuffer-buffer-names-with-mark-result nil))
 (ibuffer-map-lines-nomodify
-#'(lambda (buf mk beg end)
+#'(lambda (buf mk)
 	 (when (char-equal mark mk)
 	   (push (buffer-name buf)
 		 ibuffer-buffer-names-with-mark-result))))
 ibuffer-buffer-names-with-mark-result))
 (ibuffer-buffer-names-with-mark ibuffer-deletion-char))
 (defun ibuffer-count-marked-lines (&optional all)
 (if all
 (ibuffer-map-lines-nomodify
-#'(lambda (buf mark beg end)
+#'(lambda (buf mark)
 	   (not (char-equal mark ? ))))
 (ibuffer-map-lines-nomodify
-#'(lambda (buf mark beg end)
+#'(lambda (buf mark)
 	 (char-equal mark ibuffer-marked-char)))))
 (defsubst ibuffer-count-deletion-lines ()
 (ibuffer-map-lines-nomodify
-#'(lambda (buf mark beg end)
+#'(lambda (buf mark)
 (char-equal mark ibuffer-deletion-char))))
 (defsubst ibuffer-map-deletion-lines (func)
 (ibuffer-map-on-mark ibuffer-deletion-char func))
 (if (= (ibuffer-count-marked-lines t) 0)
 (message "No buffers marked; use 'm' to mark a buffer")
 (cond
 ((char-equal mark ibuffer-marked-char)
 (ibuffer-map-marked-lines
-#'(lambda (buf mark beg end)
+#'(lambda (buf mark)
 	   (ibuffer-set-mark-1 ? )
 	   t)))
 ((char-equal mark ibuffer-deletion-char)
 (ibuffer-map-deletion-lines
-#'(lambda (buf mark beg end)
+#'(lambda (buf mark)
 	   (ibuffer-set-mark-1 ? )
 	   t)))
 (t
 (ibuffer-map-lines
-#'(lambda (buf mark beg end)
+#'(lambda (buf mark)
 	   (when (not (char-equal mark ? ))
 	     (ibuffer-set-mark-1 ? ))
 	   t)))))
 (ibuffer-redisplay t))
 In other words, unmarked buffers become marked, and marked buffers
 become unmarked."
 (interactive)
 (let ((count
 	 (ibuffer-map-lines
-	  #'(lambda (buf mark beg end)
+	  #'(lambda (buf mark)
 	      (cond ((eq mark ibuffer-marked-char)
 		     (ibuffer-set-mark-1 ? )
 		     nil)
 		    ((eq mark ? )
 		     (ibuffer-set-mark-1 ibuffer-marked-char)
 	  (when ibuffer-shrink-to-minimum-size
 	    (ibuffer-shrink-to-fit)))))))
 (defun ibuffer-map-on-mark (mark func)
 (ibuffer-map-lines
-#'(lambda (buf mk beg end)
+#'(lambda (buf mk)
 (if (char-equal mark mk)
-	   (funcall func buf mark beg end)
+	   (funcall func buf mark)
 	 nil))))
 (defun ibuffer-map-lines (function &optional nomodify)
 "Call FUNCTION for each buffer in an ibuffer.
 Don't set the ibuffer modification flag iff NOMODIFY is non-nil.
 FUNCTION is called with four arguments: the buffer object itself, the
 current mark symbol, and the beginning and ending line positions."
 (assert (eq major-mode 'ibuffer-mode))
-(let ((curline (count-lines (point-min)
+(let ((orig-target-line (count-lines (point-min)
-			      (line-beginning-position)))
+				       (line-beginning-position)))
-	(deleted-lines-count 0)
+	(target-buf-count 0)
 	(ibuffer-map-lines-total 0)
 (ibuffer-map-lines-count 0))
 (unwind-protect
-(progn
+	(progn
-(setq buffer-read-only nil)
+	  (setq buffer-read-only nil)
-(goto-char (point-min))
+	  (goto-char (point-min))
-(while (and (get-text-property (point) 'ibuffer-title)
+	  (ibuffer-forward-line 0)
-(not (eobp)))
+	  (setq orig-target-line (1+ (- orig-target-line
-(forward-line 1))
+					(count-lines (point-min) (point))))
-(while (and (not (eobp))
+		target-buf-count orig-target-line)
-		       (not (get-text-property (point) 'ibuffer-summary)))
+	  (while (and (not (eobp))
-(let ((result
+		      (not (get-text-property (point) 'ibuffer-summary)))
-(if (buffer-live-p (ibuffer-current-buffer))
+	    (let ((result
-(save-excursion
+		   (if (buffer-live-p (ibuffer-current-buffer))
-(funcall function
+		       (save-excursion
-(ibuffer-current-buffer)
+			 (funcall function
-(ibuffer-current-mark)
+				  (ibuffer-current-buffer)
-(line-beginning-position)
+				  (ibuffer-current-mark)))
-(1+ (line-end-position))))
+		     ;; Kill the line if the buffer is dead
-;; Kill the line if the buffer is dead
+		     'kill)))
-'kill)))
+	      ;; A given mapping function should return:
-;; 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
-;; `kill' means the remove line from the buffer list
+	      ;; `t' otherwise
-;; `t' otherwise
+	      (incf ibuffer-map-lines-total)
-	       (incf ibuffer-map-lines-total)
+	      (cond ((null result)
-(cond ((null result)
+		     (forward-line 1))
-(forward-line 1))
+		    ((eq result 'kill)
-((eq result 'kill)
+		     (delete-region (line-beginning-position)
-(delete-region (line-beginning-position)
+				    (1+ (line-end-position)))
-(1+ (line-end-position)))
+		     (incf ibuffer-map-lines-count)
-		      (incf deleted-lines-count)
+		     (when (< ibuffer-map-lines-total
-(incf ibuffer-map-lines-count))
+			       orig-target-line)
-(t
+		       (decf target-buf-count)))
-(incf ibuffer-map-lines-count)
+		    (t
-(forward-line 1)))))
+		     (incf ibuffer-map-lines-count)
-ibuffer-map-lines-count)
+		     (forward-line 1)))))
+	  ibuffer-map-lines-count)
 (progn
 	(setq buffer-read-only t)
 	(unless nomodify
 	  (set-buffer-modified-p nil))
-	(goto-line (- (1+ curline) deleted-lines-count))))))
+	(goto-char (point-min))
+	(ibuffer-forward-line 0)
+	(ibuffer-forward-line (1- target-buf-count))))))
 (defun ibuffer-get-marked-buffers ()
 "Return a list of buffer objects currently marked."
 (delq nil
 	(mapcar #'(lambda (e)
 		    (when (eq (cdr e) ibuffer-marked-char)
 		      (car e)))
 		(ibuffer-current-state-list))))
-(defun ibuffer-current-state-list (&optional include-lines)
+(defun ibuffer-current-state-list ()
-"Return a list like (BUF . MARK) of all buffers in an ibuffer.
+"Return a list like (BUF . MARK) of all buffers in an ibuffer."
-If optional argument INCLUDE-LINES is non-nil, return a list like
-(BUF MARK BEGPOS)."
 (let ((ibuffer-current-state-list-tmp '()))
 ;; ah, if only we had closures.  I bet this will mysteriously
 ;; break later.  Don't blame me.
 (ibuffer-map-lines-nomodify
-(if include-lines
+#'(lambda (buf mark)
-	 #'(lambda (buf mark beg end)
+	 (when (buffer-live-p buf)
-	     (when (buffer-live-p buf)
+	   (push (cons buf mark) ibuffer-current-state-list-tmp))))
-	       (push (list buf mark beg) ibuffer-current-state-list-tmp)))
-#'(lambda (buf mark beg end)
-	   (when (buffer-live-p buf)
-	     (push (cons buf mark) ibuffer-current-state-list-tmp)))))
 (nreverse ibuffer-current-state-list-tmp)))
 (defun ibuffer-current-buffers-with-marks (curbufs)
 "Return a list like (BUF . MARK) of all open buffers."
 (let ((bufs (ibuffer-current-state-list)))
 This does not show new buffers; use `ibuffer-update' for that.
 If SILENT is non-`nil', do not generate progress messages."
 (interactive)
+(ibuffer-forward-line 0)
 (unless silent
 (message "Redisplaying current buffer list..."))
 (let ((blist (ibuffer-current-state-list)))
 (when (null blist)
 (if (and (featurep 'ibuf-ext)
 	  (message "No buffers! (note: filtering in effect)")
 	(error "No buffers!")))
 (ibuffer-insert-buffers-and-marks blist t)
 (ibuffer-update-mode-name)
 (unless silent
-(message "Redisplaying current buffer list...done"))))
+(message "Redisplaying current buffer list...done"))
+(ibuffer-forward-line 0)))
 (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.
 Do not display messages if SILENT is non-nil."
 (interactive "P")
+(ibuffer-forward-line 0)
 (let* ((bufs (buffer-list))
 	 (blist (ibuffer-filter-buffers
 		(current-buffer)
 		(if (and
 		     (cadr bufs)

Mercurial > emacs

comparison lisp/ibuffer.el @ 44571:be1cb50b8859