(ediff-wordify): Bind ediff-forward-word-function

outside the loop.
(ediff-goto-word): Take ediff-with-syntax-table outside the loop.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2fe221726d6e669ba4723dbdf14af6dd792a03f..9fe06e2b5f83e90cf2d8b80f5cf9e62a00fe9b42 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-03  Dave Love  <fx@gnu.org>
+
+       * ediff-diff.el (ediff-wordify): Bind ediff-forward-word-function
+       outside the loop.
+       (ediff-goto-word): Take ediff-with-syntax-table outside the loop.
+
 2002-07-03  Juanma Barranquero  <lektu@terra.es>
 
        * textmodes/reftex-vars.el (reftex-label-alist): Fix typo.
@@ -17,7 +23,8 @@
 
        * textmodes/reftex-cite.el (reftex-citation): Fix typo.
 
-       * progmodes/cperl-mode.el (cperl-break-one-line-blocks-when-indent): Fix typo.
+       * progmodes/cperl-mode.el (cperl-break-one-line-blocks-when-indent):
+       Fix typo.
 
 2002-06-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -4167,7 +4174,7 @@
        (toplevel): Add completion-list-mode-finish to temp-buffer-show-hook.
 
        * language/european.el ("Polish"): Change sample text.
-       From jsbien@mimuw.edu.pl (Janusz S. Bie\e,Bq\e(B).
+       From jsbien@mimuw.edu.pl (Janusz S. Bie\e$,1 d\e(B).
 
        * progmodes/sh-script.el (sh-indent-line): Add optional PREFIX-ARG
        parameter.

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 9a1d3c1c33156ab3830d7b0323402e4e2a743880..bc7c3cc7cee32af5b2cc38a9820b27ce08650690 100644 (file)
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -1,6 +1,6 @@
 ;;; ediff-diff.el --- diff-related utilities
 
-;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
 
@@ -1270,18 +1270,19 @@ arguments to `skip-chars-forward'."
      (skip-chars-forward ediff-whitespace)
      (delete-region (point-min) (point))
      
-     (while (not (eobp))
-       ;; eval in control buf to let user create local versions for
-       ;; different invocations
-       (if control-buf
-          (funcall 
-           (ediff-with-current-buffer control-buf
-             ediff-forward-word-function))
-        (funcall ediff-forward-word-function))
-       (setq sv-point (point))
-       (skip-chars-forward ediff-whitespace)
-       (delete-region sv-point (point))
-       (insert "\n")))))
+     (let ((ediff-forward-word-function
+           ;; eval in control buf to let user create local versions for
+           ;; different invocations
+           (if control-buf
+               (ediff-with-current-buffer control-buf
+                 ediff-forward-word-function)
+             ediff-forward-word-function)))
+       (while (not (eobp))
+        (funcall ediff-forward-word-function)
+        (setq sv-point (point))
+        (skip-chars-forward ediff-whitespace)
+        (delete-region sv-point (point))
+        (insert "\n"))))))
        
 ;; copy string from BEG END from IN-BUF to OUT-BUF
 (defun ediff-copy-to-buffer (beg end in-buffer out-buffer)
@@ -1305,11 +1306,11 @@ arguments to `skip-chars-forward'."
        (syntax-tbl ediff-syntax-table))
     (ediff-with-current-buffer buf
       (skip-chars-forward ediff-whitespace)
-      (while (> n 1)
-       (ediff-with-syntax-table syntax-tbl
-           (funcall fwd-word-fun))
-       (skip-chars-forward ediff-whitespace)
-       (setq n (1- n)))
+      (ediff-with-syntax-table syntax-tbl
+       (while (> n 1)
+         (funcall fwd-word-fun)
+         (skip-chars-forward ediff-whitespace)
+         (setq n (1- n))))
       (if (and flag (> n 0))
          (funcall fwd-word-fun))
       (point))))