summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2012-06-08 11:44:45 +0300
committerEli Zaretskii <eliz@gnu.org>2012-06-08 11:44:45 +0300
commite9f66fcb51971f4cc138979b7f65eac588ee133d (patch)
tree474a6e3b81dc04acbb1b56de300646704599aded /lisp
parentf3372c8789c843a00912e7fc9793ded4beb9a35a (diff)
downloademacs-e9f66fcb51971f4cc138979b7f65eac588ee133d.tar.gz
Mention in "C-u C-x =" display how to insert the character w/o input methods.
lisp/descr-text.el (describe-char): Mention how to insert the character, if the current input method doesn't support it. See the discussion in this thread for the details: http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00533.html.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/descr-text.el5
-rw-r--r--lisp/emacs-lisp/cl-loaddefs.el2
3 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d9ccc0cd32..2698374ed8a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-08 Eli Zaretskii <eliz@gnu.org>
+
+ * descr-text.el (describe-char): Mention how to insert the
+ character, if the current input method doesn't support it.
+ See the discussion in this thread for the details:
+ http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00533.html.
+
2012-06-08 Sam Steingold <sds@gnu.org>
* bindings.el (global-map): Bind XF86Forward to next-buffer and
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 50b32fc8f2e..bcb95a54ad6 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -597,7 +597,10 @@ relevant to POS."
`(insert-text-button
,current-input-method
'type 'help-input-method
- 'help-args '(,current-input-method)))))))
+ 'help-args '(,current-input-method))
+ "input method")
+ (list
+ "type \"C-x 8 RET HEX-CODEPOINT\" or \"C-x 8 RET NAME\"")))))
("buffer code"
,(if multibyte-p
(encoded-string-description
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 95716ae2e29..cd26660f4f5 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -263,7 +263,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
;;;;;; cl-do* cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase
;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
-;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "4c0f605e3c7454488cc9d498b611f422")
+;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "ce1ef5c6c925f03cb425d9a46cfa6d5f")
;;; Generated autoloads from cl-macs.el
(autoload 'cl-gensym "cl-macs" "\