Show the exact C-x 8 RET invocation in describe-char.

* lisp/descr-text.el (describe-char): Show the exact C-x 8 RET
invocation instead of a template.  (Bug#20522)

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index d6f64c77e61f9faa744fbf00f87f8e55d9d59e63..484b8cc43adf0f7a30e863ed8e61f9b8820cf8e2 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -618,7 +618,14 @@ relevant to POS."
                                    'help-args '(,current-input-method))
                                 "input method")
                         (list
-                         "type \"C-x 8 RET HEX-CODEPOINT\" or \"C-x 8 RET NAME\"")))))
+                          (let ((name
+                                 (or (get-char-code-property char 'name)
+                                     (get-char-code-property char 'old-name))))
+                            (if name
+                                (format
+                                 "type \"C-x 8 RET %x\" or \"C-x 8 RET %s\""
+                                 char name)
+                              (format "type \"C-x 8 RET %x\"" char))))))))
               ("buffer code"
                ,(if multibyte-p
                     (encoded-string-description