[Emacs-diffs] Changes to emacs/lisp/descr-text.el

[Andreas Schwab]

Index: emacs/lisp/descr-text.el
diff -c emacs/lisp/descr-text.el:1.41 emacs/lisp/descr-text.el:1.42
*** emacs/lisp/descr-text.el:1.41       Sun Nov 20 07:43:44 2005
--- emacs/lisp/descr-text.el    Sun Nov 20 15:25:35 2005
***************
*** 458,463 ****
--- 458,469 ----
         (multibyte-p enable-multibyte-characters)
         (overlays (mapcar #'(lambda (o) (overlay-properties o))
                           (overlays-at pos)))
+        (char-description (if (not multibyte-p)
+                              (single-key-description char)
+                            (if (< char 128)
+                                (single-key-description char)
+                              (string-to-multibyte
+                               (char-to-string char)))))
         item-list max-width unicode)
  
      (if (or (< char 256)
***************
*** 468,479 ****
      (setq item-list
          `(("character"
            ,(format "%s (%d, #o%o, #x%x%s)"
!                    (apply 'propertize (if (not multibyte-p)
!                                           (single-key-description char)
!                                         (if (< char 128)
!                                             (single-key-description char)
!                                           (string-to-multibyte
!                                            (char-to-string char))))
                            (text-properties-at pos))
                     char char char
                     (if unicode
--- 474,480 ----
      (setq item-list
          `(("character"
            ,(format "%s (%d, #o%o, #x%x%s)"
!                    (apply 'propertize char-description
                            (text-properties-at pos))
                     char char char
                     (if unicode
***************
*** 639,651 ****
          (goto-char (point-min))
          (re-search-forward "character:[ \t\n]+")
          (setq pos (point)))
!       (if overlays
!           (mapc #'(lambda (props)
!                     (let ((o (make-overlay pos (1+ pos))))
!                       (while props
!                         (overlay-put o (car props) (nth 1 props))
!                         (setq props (cddr props)))))
!                 overlays))
  
        (when disp-vector
          (insert
--- 640,653 ----
          (goto-char (point-min))
          (re-search-forward "character:[ \t\n]+")
          (setq pos (point)))
!       (let ((end (+ pos (length char-description))))
!         (if overlays
!             (mapc #'(lambda (props)
!                       (let ((o (make-overlay pos end)))
!                         (while props
!                           (overlay-put o (car props) (nth 1 props))
!                           (setq props (cddr props)))))
!                   overlays)))
  
        (when disp-vector
          (insert