Changeset 4148 for trunk/lisp/compare-w.el

Timestamp:

08/18/06 08:35:31 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/compare-w.el (modified) (3 diffs)

trunk/lisp/compare-w.el

@@ -168 +168 @@
-on third call it again advances points to the next difference and so on."
-  (interactive "P")
+  (if compare-ignore-whitespace
+      (setq ignore-whitespace (not ignore-whitespace)))
-  (let* (p1 p2 maxp1 maxp2 b1 b2 w2
-            (progress 1)
-            (opoint1 (point))
-            opoint2
-
-
-
-
-
-
+
+
-            (sync-func (if (stringp compare-windows-sync)
-                           'compare-windows-sync-regexp
@@ -191 +189 @@
-    (setq opoint2 p2)
-    (setq maxp1 (point-max))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      (push-mark p2 t)
-      (setq maxp2 (point-max)))
@@ -200 +211 @@
-      ;; If both windows have whitespace next to point,
-      ;; optionally skip over it.
-
+-1
-           (save-excursion
-             (let (p1a p2a w1 w2 result1 result2)
-
+-1
-               (setq p1a (point))
-               (set-buffer b2)
-               (goto-char p2)
-
+-2
-               (setq p2a (point))
-
-
+
-                   (setq p1 p1a
-                         p2 p2a)))))