* lisp/international/quail.el (quail-define-package): Doc fix.

* etc/NEWS: Related edit.

diff --git a/etc/NEWS b/etc/NEWS
index 6fda2c811ab50e284573b4872b5047364cc3988f..7f8907d3b1e7631b4a4578cd160174c36701eb29 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -166,7 +166,8 @@ implementations together with links to the source.  The old commands
 `describe-class', `describe-constructor' and `describe-generic' were
 removed.
 
-*** The command `quail-help' has been removed.
+---
+*** The function `quail-help' is no longer an interactive command.
 Use `C-h C-\' (`describe-input-method') instead.
 
 ** ImageMagick

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7edc13a74e9052eee1cea3592daf2aaac7da8b4..106e12e88b766a615391e32d302f571806756c96 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-22  Glenn Morris  <rgm@gnu.org>
 
+       * international/quail.el (quail-define-package): Doc fix.
+
        * emacs-lisp/authors.el (authors-valid-file-names):
        (authors-renamed-files-alist): Additions.
 

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 8c381e6430fbe627c6598a06beded35a0a6b9c7c..d670191bb7af67723c0bbd9ee462e45b9da0f3e6 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -445,10 +445,11 @@ user's keyboard layout to the standard keyboard layout.  See the
 documentation of `quail-keyboard-layout' and
 `quail-keyboard-layout-standard' for more detail.
 
-SHOW-LAYOUT non-nil means the `quail-help' command should show
-the user's keyboard layout visually with translated characters.
-If KBD-TRANSLATE is set, it is desirable to set also this flag unless
-this package defines no translations for single character keys.
+SHOW-LAYOUT non-nil means the function `quail-help' (as used by
+the command `describe-input-method') should show the user's keyboard
+layout visually with translated characters.  If KBD-TRANSLATE is
+set, it is desirable to also set this flag, unless this package
+defines no translations for single character keys.
 
 CREATE-DECODE-MAP non-nil means decode map is also created.  A decode
 map is an alist of translations and corresponding original keys.