From: Colin Walters <walters@gnu.org>
Date: Fri, 29 Mar 2002 22:54:49 +0000 (+0000)
Subject: (ibuffer-mark-interactive): Use `ibuffer-forward-line' instead of
X-Git-Tag: ttn-vms-21-2-B4~15903
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=214b39be9a09aaaf43ad763fd23c96f5f455513d;p=emacs.git

(ibuffer-mark-interactive): Use `ibuffer-forward-line' instead of
`forward-line'.
(ibuffer-forward-line): Be sure to skip over special properties
before moving, too.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 773ffc385a9..d60a0485aa0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2002-03-29  Colin Walters  <walters@verbum.org>
+
+	* ibuffer.el (ibuffer-mark-interactive): Use
+	`ibuffer-forward-line' instead of `forward-line'.
+	(ibuffer-forward-line): Be sure to skip over special properties
+	before moving, too.
+
+	* calc/calc.el (calc-was-split): Var deleted.
+	(calc): Remove reference to it.
+	(calc): Ditto.
+	(calc-quit): Ditto.
+
+	* calc/calc-misc.el (calc-delete-windows-keep): Function deleted.
+
 2002-03-29  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* files.el (auto-save-file-name-transforms): Don't run "\\2" via
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 34e53ae217b..02156cc51c6 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -823,6 +823,11 @@ width and the longest string in LIST."
   (unless arg
     (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)
+    (forward-line 1))
   (if (< arg 0)
       (ibuffer-backward-line (- arg))
     (while (> arg 0)
@@ -1144,20 +1149,11 @@ become unmarked."
   (assert (eq major-mode 'ibuffer-mode))
   (unless arg
     (setq arg 1))
-  (while (and (get-text-property (line-beginning-position)
-				 'ibuffer-title)
-	      (not (eobp)))
-    (forward-line 1))
-
+  (ibuffer-forward-line 0)
   (let ((inhibit-read-only t))
     (while (> arg 0)
       (ibuffer-set-mark mark)
-      (forward-line movement)
-      (when (or (get-text-property (line-beginning-position)
-				   'ibuffer-title)
-		(eobp))
-	(forward-line (- movement))
-	(setq arg 0))
+      (ibuffer-forward-line movement)
       (setq arg (1- arg)))))
 
 (defun ibuffer-set-mark (mark)