Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

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

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 005f5d8cb72825f73f1b68f16392526cb9f4592c..b3f78780bd3a0cf9dd78751daf9eb001a8ed1f90 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -375,6 +375,8 @@ This function is semi-obsolete.  Use `get-char-code-property'."
                 (format "%c:%s" x doc)))
             mnemonics ", ")))))
 
+(declare-function quail-find-key "quail" (char))
+
 ;;;###autoload
 (defun describe-char (pos &optional buffer)
   "Describe position POS (interactively, point) and the char after POS.