# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1175052031 0
# Node ID 45b86f4ac0f664f53ba351c3cf3fd5a463e5c229
# Parent  e359709ed895825173448c25eb2537951000e704
(make-text-button): Add explicit `button' property.
(default-button): Don't put a `button' property on it.

diff -r e359709ed895 -r 45b86f4ac0f6 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 28 01:21:47 2007 +0000
+++ b/lisp/ChangeLog	Wed Mar 28 03:20:31 2007 +0000
@@ -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 -r e359709ed895 -r 45b86f4ac0f6 lisp/button.el
--- a/lisp/button.el	Wed Mar 28 01:21:47 2007 +0000
+++ b/lisp/button.el	Wed Mar 28 03:20:31 2007 +0000
@@ -89,9 +89,6 @@
 ;; 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 @@
       (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)