From: Glenn Morris <rgm@gnu.org>
Date: Sat, 11 Jul 2020 16:25:04 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7021
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=398a2680616112675afe26478706a3cea9e76158;p=emacs.git

Merge from origin/emacs-27

c04b92104c Add commentary in gtkutil.c
6290850dac Consistently stylize eldoc as ElDoc in prose
136e931189 Improve documentation of "C-u C-x ="
1f52771fd3 Mention floating rounding issues
c892ae65b4 Repair global-auto-revert-ignore-modes (bug#42271)
3a446a02fb ; * src/xdisp.c (decode_mode_spec): Fix commentary.
79f381b4a6 One more improvement of left/right-fringe display spec docs
1279bdb072 Another clarification of left/right-fringe display spec

# Conflicts:
#	doc/emacs/programs.texi
---

398a2680616112675afe26478706a3cea9e76158
diff --cc doc/emacs/programs.texi
index 2757c84b53a,b976f2e7b12..1c33d7dccc7
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@@ -1268,30 -1268,10 +1268,30 @@@ documentation.  When it is enabled, th
  information whenever there is a Lisp function or variable at point;
  for a function, it shows the argument list, and for a variable it
  shows the first line of the variable's documentation string.  To
- toggle Eldoc mode, type @kbd{M-x eldoc-mode}.  There's also a Global
- Eldoc mode, which is turned on by default, and affects buffers whose
+ toggle ElDoc mode, type @kbd{M-x eldoc-mode}.  There's also a Global
 -ElDoc mode, which is turned on by default, and affects buffers, such
 -as @samp{*scratch*}, whose major mode is Emacs Lisp or Lisp
 -Interaction (@w{@kbd{M-x global-eldoc-mode}} to turn it off globally).
++ElDoc mode, which is turned on by default, and affects buffers whose
 +major mode sets the variables described below.  Use @w{@kbd{M-x
 +global-eldoc-mode}} to turn it off globally.
 +
 +@vindex eldoc-documentation-strategy
 +@vindex eldoc-documentation-functions
 +  These variables can be used to configure ElDoc mode:
 +
 +@table @code
 +@item eldoc-documentation-strategy
 +This variable holds the function which is used to retrieve
 +documentation for the item at point from the functions in the hook
 +@code{eldoc-documentation-functions}.  By default,
 +@code{eldoc-documentation-strategy} returns the first documentation
 +string produced by the @code{eldoc-documentation-functions} hook, but
 +it may be customized to compose those functions' results in other
 +ways.
 +
 +@item eldoc-documentation-functions
 +This abnormal hook holds documentation functions.  It acts as a
 +collection of backends for ElDoc.  This is what modes should use to
 +register their documentation functions with ElDoc.
 +@end table
  
  @node Hideshow
  @section Hideshow minor mode