Make "C-x =" show display properties from overlays.

 lisp/simple.el (what-cursor-position): Use get-char-property-change
 and next-single-char-property-change, to be able to show display
 properties that come from overlays as well as text properties.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8017e711203ffbb96d1cc4224ce3732a9699d1dc..cfa2035db912a618f85c8e020aac8c3c845ae168 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+       * simple.el (what-cursor-position): Use get-char-property-change
+       and next-single-char-property-change, to be able to show display
+       properties that come from overlays as well as text properties.
+
 2011-09-22  Chong Yidong  <cyd@stupidchicken.com>
 
        * window.el (pop-to-buffer-same-window): New (reinstated) fun.

diff --git a/lisp/simple.el b/lisp/simple.el
index 4db0aae25ad0d17a57384bf20cda5ec19012f32c..3cd46bf284c7fd6e713082dda53b7969b722f86c 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1054,9 +1054,9 @@ in *Help* buffer.  See also the command `describe-char'."
          ;; Check if the character is displayed with some `display'
          ;; text property.  In that case, set under-display to the
          ;; buffer substring covered by that property.
-         (setq display-prop (get-text-property pos 'display))
+         (setq display-prop (get-char-property pos 'display))
          (if display-prop
-             (let ((to (or (next-single-property-change pos 'display)
+             (let ((to (or (next-single-char-property-change pos 'display)
                            (point-max))))
                (if (< to (+ pos 4))
                    (setq under-display "")