[Emacs-diffs] master c120037 1/3: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit c120037be0029d2c28d73b0e5a672981e0fb2aad
Merge: c73e6a3 73bc6f8
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    73bc6f8 Fix a typo in describing input methods
    6b4bafe ; Add a comment to emacs-lisp-intro.texi
---
 doc/lispintro/emacs-lisp-intro.texi | 25 +++++++++++++++++++++++++
 lisp/help-mode.el                   |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi 
b/doc/lispintro/emacs-lisp-intro.texi
index 4d514aa..bca8e1f 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -198,6 +198,31 @@ supports it in developing GNU and promoting software 
freedom.''
 @end ifset
 @end ifnothtml
 
address@hidden If you think this manual is too large for an introduction, please
address@hidden consider this email exchange:
address@hidden
address@hidden       >> The intro is almost 300 pages in full.  I had expected 
60 pages.
address@hidden       >
address@hidden       > This is an important point in its own right.  Could you
address@hidden       > write a simplified introduction that is only 50 pages or 
so?
address@hidden       > That would be helpful to many potential users, I'd think.
address@hidden
address@hidden   > The problem with the introduction is that it was written when
address@hidden   > programming was only starting to be a skill "normal" people 
could
address@hidden   > have access to.  So the text is extremely verbose and is
address@hidden   > sometimes hard to follow because of that.  The gist of the
address@hidden   > document could be summarized in 50 pages.
address@hidden
address@hidden This book is intentionally addressed to people who don't know 
how to
address@hidden program.  That is its purpose.  We recommend people start 
learning to
address@hidden program using this book.
address@hidden
address@hidden If you DO know how to program in some other language, you can 
probably
address@hidden learn Emacs Lisp starting with the Emacs Lisp Reference Manual.
address@hidden
address@hidden        Richard Stallman <address@hidden>,
address@hidden        
https://lists.gnu.org/archive/html/emacs-devel/2018-05/msg00374.html
+
 @shortcontents
 @contents
 
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 4fb3fb8..56cb080 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -501,7 +501,7 @@ that."
                             (and sym (charsetp sym)
                                  (help-xref-button 7 'help-character-set sym)))
                            ((assoc data input-method-alist)
-                            (help-xref-button 7 'help-character-set data))
+                            (help-xref-button 7 'help-input-method data))
                            ((and sym (coding-system-p sym))
                             (help-xref-button 7 'help-coding-system sym))
                            ((and sym (charsetp sym))