2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22fee77f584..b600537c9a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * man.el (Man-highlight-references0): Use make-button (Bug#7881).
+
 2011-01-22  Phil Hagelberg  <phil@evri.com>
 
         * pcmpl-unix.el (pcmpl-ssh-config-file): New option.
diff --git a/lisp/man.el b/lisp/man.el
index d22ea9cebb6..98257e62bfc 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1154,7 +1154,9 @@ default type, `Man-xref-man-page' is used for the buttons."
                  (goto-char (point-min))
                  nil)))
       (while (re-search-forward regexp end t)
-        (make-text-button
+        ;; An overlay button is preferable because the underlying text
+        ;; may have text property highlights (Bug#7881).
+        (make-button
          (match-beginning button-pos)
          (match-end button-pos)
          'type type