(make-text-button): Add explicit `button' property.

(default-button): Don't put a `button' property on it.

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e17d73f174c..315e9853505 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * button.el (make-text-button): Add explicit `button' property.
+        (default-button): Don't put a `button' property on it.
+
         * progmodes/python.el (python-mode): Skip comments when parsing.
 
         * vc-arch.el (vc-with-current-file-buffer): New macro.
diff --git a/lisp/button.el b/lisp/button.el
index d3c4cd8ea9e..05ea7aec5e2 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -89,9 +89,6 @@ Mode-specific keymaps may want to use this as their parent keymap.")
 ;; Prevent insertions adjacent to the text-property buttons from
 ;; inheriting its properties.
 (put 'default-button 'rear-nonsticky t)
-;; Text property buttons don't have a `button' property of their own, so
-;; they inherit this.
-(put 'default-button 'button t)
 
 ;; A `category-symbol' property for the default button type
 (put 'button 'button-category-symbol 'default-button)
@@ -316,7 +313,11 @@ Also see `insert-text-button'."
       (setcar (cdr type-entry)
               (button-category-symbol (car (cdr type-entry))))))
   ;; Now add all the text properties at once
-  (add-text-properties beg end properties)
+  (add-text-properties beg end
+                       ;; Each button should have a non-eq `button'
+                       ;; property so that next-single-property-change can
+                       ;; detect boundaries reliably.
+                       (cons 'button (cons (list t) properties)))
   ;; Return something that can be used to get at the button.
   beg)