(widget-field-end):

  When checking for a `boundary' field, do so in the correct buffer.

2 files changed, 12 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73dc391a5ca..d971cbf9638 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-10-26  Miles Bader  <miles@lsi.nec.co.jp>
 
+        * wid-edit.el (widget-field-end): When checking for a `boundary'
+        field, do so in the correct buffer.
+
         * simple.el (undo): Correctly distinguish between numeric and
         non-numeric prefix args in non-transient-mark-mode, as per the doc
         string.  When in transient-mark-mode, treat all prefix-args as
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index f8bd157a8ee..afc0df372b3 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1077,13 +1077,15 @@ When not inside a field, move to the previous button or field."
     ;; Don't subtract one if local-map works at the end of the overlay,
     ;; or if a special `boundary' field has been added after the widget
     ;; field.
-    (and overlay (if (and (not (eq (get-char-property (overlay-end overlay)
-                                                      'field)
-                                   'boundary))
-                          (or widget-field-add-space
-                              (null (widget-get widget :size))))
-                     (1- (overlay-end overlay))
-                   (overlay-end overlay)))))
+    (and overlay
+         (if (and (not (eq (get-char-property (overlay-end overlay)
+                                              'field
+                                              (widget-field-buffer widget))
+                           'boundary))
+                  (or widget-field-add-space
+                      (null (widget-get widget :size))))
+             (1- (overlay-end overlay))
+           (overlay-end overlay)))))
 
 (defun widget-field-find (pos)
   "Return the field at POS.