Mercurial > emacs

changeset 2011:eea183a35396

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(compare-windows): Use compare-buffer-substrings.
author Richard M. Stallman <rms@gnu.org>
date Fri, 05 Mar 1993 20:37:00 +0000
parents 50b1987ff38a
children a6d7c2f161cf
files lisp/compare-w.el
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/compare-w.el	Thu Mar 04 19:50:30 1993 +0000
+++ b/lisp/compare-w.el	Fri Mar 05 20:37:00 1993 +0000
@@ -106,24 +106,21 @@
       ;; Try advancing comparing 1000 chars at a time.
       ;; When that fails, go 500 chars at a time, and so on.
       (let ((size 1000)
-	    success-1)
+	    success-1
+	    (case-fold-search compare-ignore-case))
 	(while (> size 0)
 	  (setq success-1 t)
+	  ;; Try comparing SIZE chars at a time, repeatedly, till that fails.
 	  (while success-1
 	    (setq size (min size (- maxp1 p1) (- maxp2 p2)))
-	    (save-excursion
-	      (set-buffer b2)
-	      (setq s2 (buffer-substring p2 (+ size p2))))
 	    (setq success-1
 		  (and (> size 0)
-		       (if compare-ignore-case
-			   (let ((case-fold-search t))
-			     (save-excursion
-			       (search-forward s2 (+ p1 size) t)))
-			 (equal (buffer-substring p1 (+ size p1)) s2))))
+		       (= 0 (compare-buffer-substrings b2 p2 (+ size p2)
+						       b1 p1 (+ size p1)))))
 	    (if success-1
 		(setq p1 (+ p1 size) p2 (+ p2 size)
 		      success t)))
+	  ;; If SIZE chars don't match, try fewer.
 	  (setq size (/ size 2)))))
 
     (goto-char p1)