* lisp/mouse.el (mouse-select-region-move-to-beginning): Add :group.

[gnu-emacs] / lisp / descr-text.el

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index f81b08477bbc041cb88faa15b31e4f98939afeee..6c7983a1771208938aa76426f46ce5c073c93159 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -1,6 +1,6 @@
 ;;; descr-text.el --- describe text mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1994-1996, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1996, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -161,7 +161,7 @@ otherwise."
       ;; Buttons
       (when (and button (not (widgetp wid-button)))
        (newline)
-       (insert (format-message "Here is a ‘%S’ button labeled ‘%s’.\n\n"
+       (insert (format-message "Here is a `%S' button labeled `%s'.\n\n"
                                 button-type button-label)))
       ;; Overlays
       (when overlays
@@ -277,12 +277,12 @@ This function is semi-obsolete.  Use `get-char-code-property'."
                            'general-category (intern val))
                           val)))
               (list "Combining class"
-                    (let ((val (nth 1 fields)))
+                    (let ((val (nth 2 fields)))
                       (or (char-code-property-description
                            'canonical-combining-class (intern val))
                           val)))
               (list "Bidi category"
-                    (let ((val (nth 1 fields)))
+                    (let ((val (nth 3 fields)))
                       (or (char-code-property-description
                            'bidi-class (intern val))
                           val)))
@@ -322,7 +322,7 @@ This function is semi-obsolete.  Use `get-char-code-property'."
                                               (nth 13 fields) 16)))))))))))
 
 ;; Not defined on builds without X, but behind display-graphic-p.
-(declare-function internal-char-font "fontset.c" (position &optional ch))
+(declare-function internal-char-font "font.c" (position &optional ch))
 
 ;; Return information about how CHAR is displayed at the buffer
 ;; position POS.  If the selected frame is on a graphic display,
@@ -619,7 +619,7 @@ relevant to POS."
                           (let ((name
                                  (or (get-char-code-property char 'name)
                                      (get-char-code-property char 'old-name))))
-                            (if name
+                            (if (and name (assoc-string name (ucs-names)))
                                 (format
                                  "type \"C-x 8 RET %x\" or \"C-x 8 RET %s\""
                                  char name)
@@ -734,7 +734,7 @@ relevant to POS."
                 (when face
                   (insert (propertize " " 'display '(space :align-to 5))
                           "face: ")
-                  (insert (format-message "‘%s’\n" face))))))
+                  (insert (format-message "`%s'\n" face))))))
 
           (when composition
             (insert "\nComposed")
@@ -806,9 +806,16 @@ relevant to POS."
                         'describe-char-unidata-list))
              'follow-link t)
             (insert "\n")
-            (dolist (elt (if (eq describe-char-unidata-list t)
-                             (nreverse (mapcar 'car char-code-property-alist))
-                           describe-char-unidata-list))
+            (dolist (elt
+                     (cond ((eq describe-char-unidata-list t)
+                            (nreverse (mapcar 'car char-code-property-alist)))
+                           ((< char 32)
+                            ;; Temporary fix (2016-05-22): The
+                            ;; decomposition item for \n corrupts the
+                            ;; display on a Linux virtual terminal.
+                            ;; (Bug #23594).
+                            (remq 'decomposition describe-char-unidata-list))
+                           (t describe-char-unidata-list)))
               (let ((val (get-char-code-property char elt))
                     description)
                 (when val