diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-07-15 23:13:59 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-07-15 23:13:59 +0200 |
| commit | 907618b3b51a653d111d7f5764da586fcee6da5e (patch) | |
| tree | ddde8eb9f40da415fc7699d16948eb9638804588 /doc | |
| parent | 2c2cc21f1be721e5ba30fa22aedeb5c254791193 (diff) | |
| parent | 85eaa8373bb0a91013af503d333670788ec5a956 (diff) | |
| download | emacs-907618b3b51a653d111d7f5764da586fcee6da5e.tar.gz emacs-907618b3b51a653d111d7f5764da586fcee6da5e.tar.bz2 emacs-907618b3b51a653d111d7f5764da586fcee6da5e.zip | |
Merge remote-tracking branch 'savahnna/master' into HEAD
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/mule.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 0f07d286cda..6eff0ca0d22 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -202,7 +202,7 @@ terminal, the code(s) sent to the terminal. @item If the character was composed on display with any following characters to form one or more grapheme clusters, the composition information: -the font glyphs if the frame is on a graphical display, else the +the font glyphs if the frame is on a graphical display, and the characters that were composed. @item diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 17e96079ab9..33a07c9fb4d 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -469,7 +469,7 @@ variable @code{imenu-generic-expression}, for the two variables @code{imenu-create-index-function} (@pxref{Imenu}). @item -The mode can tell Eldoc mode how to retrieve different types of +The mode can tell ElDoc mode how to retrieve different types of documentation for whatever is at point, by adding one or more buffer-local entries to the special hook @code{eldoc-documentation-functions}. |