aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorYuuki Harano2020-12-14 01:52:10 +0900
committerYuuki Harano2020-12-14 01:52:10 +0900
commit3e30047ce3a81dd0879973012abbf570d3215dfd (patch)
treec7c10e82f2ff37705356a0c25b98d92c603c7983 /doc
parentaea5dbec2514811fb2e1cc44b2347a976a5b7de8 (diff)
parentfe50a8b9ba79b4ac14a3a352d8bf84eaee4f2122 (diff)
downloademacs-3e30047ce3a81dd0879973012abbf570d3215dfd.tar.gz
emacs-3e30047ce3a81dd0879973012abbf570d3215dfd.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/maintaining.texi10
-rw-r--r--doc/emacs/misc.texi25
-rw-r--r--doc/emacs/rmail.texi6
-rw-r--r--doc/lispref/backups.texi6
-rw-r--r--doc/lispref/display.texi44
-rw-r--r--doc/lispref/internals.texi18
-rw-r--r--doc/lispref/keymaps.texi7
-rw-r--r--doc/lispref/os.texi16
-rw-r--r--doc/lispref/streams.texi18
-rw-r--r--doc/lispref/text.texi16
-rw-r--r--doc/lispref/variables.texi10
-rw-r--r--doc/misc/calc.texi8
-rw-r--r--doc/misc/cl.texi13
-rw-r--r--doc/misc/efaq.texi61
-rw-r--r--doc/misc/gnus.texi55
15 files changed, 221 insertions, 92 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 1f10b68b8a7..aa4513e3175 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2199,12 +2199,22 @@ Display the reference on the current line.
2199Move to the next reference and display it in the other window 2199Move to the next reference and display it in the other window
2200(@code{xref-next-line}). 2200(@code{xref-next-line}).
2201 2201
2202@item N
2203@findex xref-next-group
2204Move to the first reference of the next reference group and display it
2205in the other window (@code{xref-next-group}).
2206
2202@item p 2207@item p
2203@itemx , 2208@itemx ,
2204@findex xref-prev-line 2209@findex xref-prev-line
2205Move to the previous reference and display it in the other window 2210Move to the previous reference and display it in the other window
2206(@code{xref-prev-line}). 2211(@code{xref-prev-line}).
2207 2212
2213@item P
2214@findex xref-prev-group
2215Move to the first reference of the previous reference group and
2216display it in the other window (@code{xref-prev-group}).
2217
2208@item C-o 2218@item C-o
2209@findex xref-show-location-at-point 2219@findex xref-show-location-at-point
2210Display the reference on the current line in the other window 2220Display the reference on the current line in the other window
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 5b5134b7c3f..c2c382ead0b 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1893,6 +1893,12 @@ with @kbd{C-x #}. But @kbd{C-x #} is the way to tell
1893window or a frame, @kbd{C-x #} always displays the next server buffer 1893window or a frame, @kbd{C-x #} always displays the next server buffer
1894in that window or in that frame. 1894in that window or in that frame.
1895 1895
1896@vindex server-client-instructions
1897 When @command{emacsclient} connects, the server will normally output
1898a message that says how to exit the client frame. If
1899@code{server-client-instructions} is set to @code{nil}, this message
1900is inhibited.
1901
1896@node emacsclient Options 1902@node emacsclient Options
1897@subsection @code{emacsclient} Options 1903@subsection @code{emacsclient} Options
1898@cindex @code{emacsclient} options 1904@cindex @code{emacsclient} options
@@ -2255,13 +2261,18 @@ off.
2255@vindex ps-print-color-p 2261@vindex ps-print-color-p
2256 If your printer doesn't support colors, you should turn off color 2262 If your printer doesn't support colors, you should turn off color
2257processing by setting @code{ps-print-color-p} to @code{nil}. By 2263processing by setting @code{ps-print-color-p} to @code{nil}. By
2258default, if the display supports colors, Emacs produces hardcopy output 2264default, if the display supports colors, Emacs produces hardcopy
2259with color information; on black-and-white printers, colors are emulated 2265output with color information; on black-and-white printers, colors are
2260with shades of gray. This might produce illegible output, even if your 2266emulated with shades of gray. This might produce barely-readable or
2261screen colors only use shades of gray. 2267even illegible output, even if your screen colors only use shades of
2262 2268gray.
2263 Alternatively, you can set @code{ps-print-color-p} to @code{black-white} to 2269
2264print colors on black/white printers. 2270@vindex ps-black-white-faces
2271 Alternatively, you can set @code{ps-print-color-p} to @code{black-white}
2272to have colors display better on black/white printers. This works by
2273using information in @code{ps-black-white-faces} to express colors by
2274customizable list of shades of gray, augmented by bold and italic
2275face attributes.
2265 2276
2266@vindex ps-use-face-background 2277@vindex ps-use-face-background
2267 By default, PostScript printing ignores the background colors of the 2278 By default, PostScript printing ignores the background colors of the
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 14ee062b6cf..467c5269866 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1273,9 +1273,9 @@ temporary buffer to display the current @acronym{MIME} message.
1273 1273
1274@findex rmail-epa-decrypt 1274@findex rmail-epa-decrypt
1275@cindex encrypted mails (reading in Rmail) 1275@cindex encrypted mails (reading in Rmail)
1276 If the current message is an encrypted one, use the command @kbd{M-x 1276 If the current message is an encrypted one, use the command
1277rmail-epa-decrypt} to decrypt it, using the EasyPG library 1277@kbd{C-c C-d} (@code{rmail-epa-decrypt}) to decrypt it, using the
1278(@pxref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}). 1278EasyPG library (@pxref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}).
1279 1279
1280 You can highlight and activate URLs in the Rmail buffer using Goto 1280 You can highlight and activate URLs in the Rmail buffer using Goto
1281Address mode: 1281Address mode:
diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi
index 379279575ca..c20ef6830ad 100644
--- a/doc/lispref/backups.texi
+++ b/doc/lispref/backups.texi
@@ -706,7 +706,11 @@ contents and the file contents are identical before the revert
706operation, reverting preserves all the markers. If they are not 706operation, reverting preserves all the markers. If they are not
707identical, reverting does change the buffer; in that case, it preserves 707identical, reverting does change the buffer; in that case, it preserves
708the markers in the unchanged text (if any) at the beginning and end of 708the markers in the unchanged text (if any) at the beginning and end of
709the buffer. Preserving any additional markers would be problematical. 709the buffer. Preserving any additional markers would be problematic.
710
711When reverting from non-file sources, markers are usually not
712preserved, but this is up to the specific @code{revert-buffer-function}
713implementation.
710@end deffn 714@end deffn
711 715
712@defvar revert-buffer-in-progress-p 716@defvar revert-buffer-in-progress-p
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index f86baf59360..2b3119ea590 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2632,10 +2632,12 @@ appearance of @var{face} will again be determined by its default face
2632spec. 2632spec.
2633 2633
2634@cindex @code{eval-defun}, and @code{defface} forms 2634@cindex @code{eval-defun}, and @code{defface} forms
2635@cindex @code{eval-last-sexp}, and @code{defface} forms
2635As an exception, if you evaluate a @code{defface} form with 2636As an exception, if you evaluate a @code{defface} form with
2636@kbd{C-M-x} in Emacs Lisp mode (@code{eval-defun}), a special feature 2637@kbd{C-M-x} (@code{eval-defun}) or with @kbd{C-x C-e}
2637of @code{eval-defun} overrides any custom face specs on the face, 2638(@code{eval-last-sexp}) in Emacs Lisp mode, a special feature of these
2638causing the face to reflect exactly what the @code{defface} says. 2639commands overrides any custom face specs on the face, causing the face
2640to reflect exactly what the @code{defface} says.
2639 2641
2640The @var{spec} argument is a @dfn{face spec}, which states how the 2642The @var{spec} argument is a @dfn{face spec}, which states how the
2641face should appear on different kinds of terminals. It should be an 2643face should appear on different kinds of terminals. It should be an
@@ -5898,6 +5900,26 @@ string containing the image data as raw bytes. @var{image-type} should be a
5898@end lisp 5900@end lisp
5899@end defun 5901@end defun
5900 5902
5903@defun svg-embed-base-uri-image svg relative-filename &rest args
5904To @var{svg} add an embedded (raster) image placed at
5905@var{relative-filename}. @var{relative-filename} is searched inside
5906@code{file-name-directory} of the @code{:base-uri} svg image property.
5907This improves the performance of embedding large images.
5908
5909@lisp
5910;; Embeding /tmp/subdir/rms.jpg and /tmp/another/rms.jpg
5911(svg-embed-base-uri-image svg "subdir/rms.jpg"
5912 :width "100px" :height "100px"
5913 :x "50px" :y "75px")
5914(svg-embed-base-uri-image svg "another/rms.jpg"
5915 :width "100px" :height "100px"
5916 :x "75px" :y "50px")
5917(svg-image svg :scale 1.0
5918 :base-uri "/tmp/dummy"
5919 :width 175 :height 175)
5920@end lisp
5921@end defun
5922
5901@defun svg-clip-path svg &rest args 5923@defun svg-clip-path svg &rest args
5902Add a clipping path to @var{svg}. If applied to a shape via the 5924Add a clipping path to @var{svg}. If applied to a shape via the
5903@var{:clip-path} property, parts of that shape which lie outside of 5925@var{:clip-path} property, parts of that shape which lie outside of
@@ -6575,6 +6597,12 @@ except when you explicitly clear it. This mode can be useful for
6575debugging. 6597debugging.
6576@end defvar 6598@end defvar
6577 6599
6600@defun image-cache-size
6601This function returns the total size of the current image cache, in
6602bytes. An image of size 200x100 with 24 bits per color will have a
6603cache size of 60000 bytes, for instance.
6604@end defun
6605
6578@node Xwidgets 6606@node Xwidgets
6579@section Embedded Native Widgets 6607@section Embedded Native Widgets
6580@cindex xwidget 6608@cindex xwidget
@@ -6879,6 +6907,16 @@ This inserts a button with the label @var{label} at point, using text
6879properties. 6907properties.
6880@end defun 6908@end defun
6881 6909
6910@defun button-buttonize string callback &optional data
6911Sometimes it's more convenient to make a string into a button without
6912inserting it into a buffer immediately, for instance when creating
6913data structures that may then, later, be inserted into a buffer. This
6914function makes @var{string} into such a string, and @var{callback}
6915will be called when the user clicks on the button. The optional
6916@var{data} parameter will be used as the parameter when @var{callback}
6917is called. If @code{nil}, the button is used as the parameter instead.
6918@end defun
6919
6882@node Manipulating Buttons 6920@node Manipulating Buttons
6883@subsection Manipulating Buttons 6921@subsection Manipulating Buttons
6884@cindex manipulating buttons 6922@cindex manipulating buttons
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index bb25983aa4b..28a5fdb3492 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -615,6 +615,19 @@ during garbage collection so far in this Emacs session, as a
615floating-point number. 615floating-point number.
616@end defvar 616@end defvar
617 617
618@defun memory-report
619It can sometimes be useful to see where Emacs is using memory (in
620various variables, buffers, and caches). This command will open a new
621buffer (called @samp{"*Memory Report*"}) that will give an overview,
622in addition to listing the ``largest'' buffers and variables.
623
624All the data here is approximate, because there's really no consistent
625way to compute the size of a variable. For instance, two variables
626may share parts of a data structure, and this will be counted twice,
627but this command may still give a useful high-level overview of which
628parts of Emacs is using memory.
629@end defun
630
618@node Stack-allocated Objects 631@node Stack-allocated Objects
619@section Stack-allocated Objects 632@section Stack-allocated Objects
620 633
@@ -1851,7 +1864,10 @@ byte, is @var{len}. The original string in @var{str} can be either an
1851it can include embedded null bytes, and doesn't have to end in a 1864it can include embedded null bytes, and doesn't have to end in a
1852terminating null byte at @code{@var{str}[@var{len}]}. The function 1865terminating null byte at @code{@var{str}[@var{len}]}. The function
1853raises the @code{overflow-error} error condition if @var{len} is 1866raises the @code{overflow-error} error condition if @var{len} is
1854negative or exceeds the maximum length of an Emacs string. 1867negative or exceeds the maximum length of an Emacs string. If
1868@var{len} is zero, then @var{str} can be @code{NULL}, otherwise it
1869must point to valid memory. For nonzero @var{len}, @code{make_string}
1870returns unique mutable string objects.
1855@end deftypefn 1871@end deftypefn
1856 1872
1857@deftypefn Function emacs_value make_unibyte_string (emacs_env *@var{env}, const char *@var{str}, ptrdiff_t @var{len}) 1873@deftypefn Function emacs_value make_unibyte_string (emacs_env *@var{env}, const char *@var{str}, ptrdiff_t @var{len})
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 130ff0d8671..6635f50960a 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2167,9 +2167,10 @@ string. Thus, the string need not be a constant.
2167 2167
2168The third element, @var{real-binding}, can be the command to execute 2168The third element, @var{real-binding}, can be the command to execute
2169(in which case you get a normal menu item). It can also be a keymap, 2169(in which case you get a normal menu item). It can also be a keymap,
2170which will result in a submenu. Finally, it can be @code{nil}, in 2170which will result in a submenu, and @var{item-name} is used as the
2171which case you will get a non-selectable menu item. This is mostly 2171submenu name. Finally, it can be @code{nil}, in which case you will
2172useful when creating separator lines and the like. 2172get a non-selectable menu item. This is mostly useful when creating
2173separator lines and the like.
2173 2174
2174The tail of the list, @var{item-property-list}, has the form of a 2175The tail of the list, @var{item-property-list}, has the form of a
2175property list which contains other information. 2176property list which contains other information.
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index f897cfa4eab..bc602205f5d 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2633,14 +2633,14 @@ calls @var{function} with no arguments, or @samp{--eval=@var{form}}.
2633 2633
2634 Any Lisp program output that would normally go to the echo area, 2634 Any Lisp program output that would normally go to the echo area,
2635either using @code{message}, or using @code{prin1}, etc., with 2635either using @code{message}, or using @code{prin1}, etc., with
2636@code{t} as the stream, goes instead to Emacs's standard descriptors 2636@code{t} as the stream (@pxref{Output Streams}), goes instead to
2637when in batch mode: @code{message} writes to the standard error 2637Emacs's standard descriptors when in batch mode: @code{message} writes
2638descriptor, while @code{prin1} and other print functions write to the 2638to the standard error descriptor, while @code{prin1} and other print
2639standard output. Similarly, input that would normally come from the 2639functions write to the standard output. Similarly, input that would
2640minibuffer is read from the standard input descriptor. Thus, Emacs 2640normally come from the minibuffer is read from the standard input
2641behaves much like a noninteractive application program. (The echo 2641descriptor. Thus, Emacs behaves much like a noninteractive
2642area output that Emacs itself normally generates, such as command 2642application program. (The echo area output that Emacs itself normally
2643echoing, is suppressed entirely.) 2643generates, such as command echoing, is suppressed entirely.)
2644 2644
2645Non-ASCII text written to the standard output or error descriptors is 2645Non-ASCII text written to the standard output or error descriptors is
2646by default encoded using @code{locale-coding-system} (@pxref{Locales}) 2646by default encoded using @code{locale-coding-system} (@pxref{Locales})
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi
index 0534afb67fa..5b4be832507 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -123,13 +123,13 @@ came from. In this case, it makes no difference what value
123@code{t} used as a stream means that the input is read from the 123@code{t} used as a stream means that the input is read from the
124minibuffer. In fact, the minibuffer is invoked once and the text 124minibuffer. In fact, the minibuffer is invoked once and the text
125given by the user is made into a string that is then used as the 125given by the user is made into a string that is then used as the
126input stream. If Emacs is running in batch mode, standard input is used 126input stream. If Emacs is running in batch mode (@pxref{Batch Mode}),
127instead of the minibuffer. For example, 127standard input is used instead of the minibuffer. For example,
128@example 128@example
129(message "%s" (read t)) 129(message "%s" (read t))
130@end example 130@end example
131will read a Lisp expression from standard input and print the result 131will in batch mode read a Lisp expression from standard input and
132to standard output. 132print the result to standard output.
133 133
134@item @code{nil} 134@item @code{nil}
135@cindex @code{nil} input stream 135@cindex @code{nil} input stream
@@ -392,13 +392,15 @@ is responsible for storing the characters wherever you want to put them.
392 392
393@item @code{t} 393@item @code{t}
394@cindex @code{t} output stream 394@cindex @code{t} output stream
395The output characters are displayed in the echo area. 395The output characters are displayed in the echo area. If Emacs is
396running in batch mode (@pxref{Batch Mode}), the output is written to
397the standard output descriptor instead.
396 398
397@item @code{nil} 399@item @code{nil}
398@cindex @code{nil} output stream 400@cindex @code{nil} output stream
399@code{nil} specified as an output stream means to use the value of 401@code{nil} specified as an output stream means to use the value of the
400@code{standard-output} instead; that value is the @dfn{default output 402@code{standard-output} variable instead; that value is the
401stream}, and must not be @code{nil}. 403@dfn{default output stream}, and must not be @code{nil}.
402 404
403@item @var{symbol} 405@item @var{symbol}
404A symbol as output stream is equivalent to the symbol's function 406A symbol as output stream is equivalent to the symbol's function
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index c6ca4eed2e1..b712768a213 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -2931,6 +2931,22 @@ used instead. Here is an example:
2931@end example 2931@end example
2932@end defvar 2932@end defvar
2933 2933
2934@defun object-intervals OBJECT
2935This function returns a copy of the intervals (i.e., text properties)
2936in @var{object} as a list of intervals. @var{object} must be a string
2937or a buffer. Altering the structure of this list does not change the
2938intervals in the object.
2939
2940@example
2941(object-intervals (propertize "foo" 'face 'bold))
2942 @result{} ((0 3 (face bold)))
2943@end example
2944
2945Each element in the returned list represents one interval. Each
2946interval has three parts: The first is the start, the second is the
2947end, and the third part is the text property itself.
2948@end defun
2949
2934@node Changing Properties 2950@node Changing Properties
2935@subsection Changing Text Properties 2951@subsection Changing Text Properties
2936@cindex changing text properties 2952@cindex changing text properties
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 095ea9dce24..b9ff0747382 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -481,10 +481,12 @@ form occurs in a @code{let} form with lexical binding enabled), then
481effect until its binding construct exits. @xref{Variable Scoping}. 481effect until its binding construct exits. @xref{Variable Scoping}.
482 482
483@cindex @code{eval-defun}, and @code{defvar} forms 483@cindex @code{eval-defun}, and @code{defvar} forms
484When you evaluate a top-level @code{defvar} form with @kbd{C-M-x} in 484@cindex @code{eval-last-sexp}, and @code{defvar} forms
485Emacs Lisp mode (@code{eval-defun}), a special feature of 485When you evaluate a top-level @code{defvar} form with @kbd{C-M-x}
486@code{eval-defun} arranges to set the variable unconditionally, without 486(@code{eval-defun}) or with @kbd{C-x C-e} (@code{eval-last-sexp}) in
487testing whether its value is void. 487Emacs Lisp mode, a special feature of these two commands arranges to
488set the variable unconditionally, without testing whether its value is
489void.
488 490
489If the @var{doc-string} argument is supplied, it specifies the 491If the @var{doc-string} argument is supplied, it specifies the
490documentation string for the variable (stored in the symbol's 492documentation string for the variable (stored in the symbol's
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 6a6f585ce20..1fa13e98b3c 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28047,13 +28047,7 @@ defined as the distance that light will travel in a vacuum in
28047vacuum is exactly 299792458 m/s. Many other units have been 28047vacuum is exactly 299792458 m/s. Many other units have been
28048redefined in terms of fundamental physical processes; a second, for 28048redefined in terms of fundamental physical processes; a second, for
28049example, is currently defined as 9192631770 periods of a certain 28049example, is currently defined as 9192631770 periods of a certain
28050radiation related to the cesium-133 atom. The only SI unit that is not 28050radiation related to the cesium-133 atom.
28051based on a fundamental physical process (although there are efforts to
28052change this) is the kilogram, which was originally defined as the mass
28053of one liter of water, but is now defined as the mass of the
28054international prototype of the kilogram (IPK), a cylinder of platinum-iridium
28055kept at the Bureau international des poids et mesures in Sèvres,
28056France. (There are several copies of the IPK throughout the world.)
28057The British imperial units, once defined in terms of physical objects, 28051The British imperial units, once defined in terms of physical objects,
28058were redefined in 1963 in terms of SI units. The US customary units, 28052were redefined in 1963 in terms of SI units. The US customary units,
28059which were the same as British units until the British imperial system 28053which were the same as British units until the British imperial system
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 084edd11b2d..742be28fe34 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1097,10 +1097,9 @@ by @var{x} if specified.
1097 1097
1098@defmac cl-pushnew x place @t{&key :test :test-not :key} 1098@defmac cl-pushnew x place @t{&key :test :test-not :key}
1099This macro inserts @var{x} at the front of the list stored in 1099This macro inserts @var{x} at the front of the list stored in
1100@var{place}, but only if @var{x} was not @code{eql} to any 1100@var{place}, but only if @var{x} isn't present in the list already.
1101existing element of the list. The optional keyword arguments 1101The optional keyword arguments are interpreted in the same way as for
1102are interpreted in the same way as for @code{cl-adjoin}. 1102@code{cl-adjoin}. @xref{Lists as Sets}.
1103@xref{Lists as Sets}.
1104@end defmac 1103@end defmac
1105 1104
1106@defmac cl-shiftf place@dots{} newvalue 1105@defmac cl-shiftf place@dots{} newvalue
@@ -3796,8 +3795,10 @@ This is a destructive version of @code{cl-sublis}.
3796@section Lists as Sets 3795@section Lists as Sets
3797 3796
3798@noindent 3797@noindent
3799These functions perform operations on lists that represent sets 3798These functions perform operations on lists that represent sets of
3800of elements. 3799elements. All these functions (unless otherwise specified) default to
3800using @code{eql} as the test function, but that can be modified by the
3801@code{:test} parameter.
3801 3802
3802@defun cl-member item list @t{&key :test :test-not :key} 3803@defun cl-member item list @t{&key :test :test-not :key}
3803This function searches @var{list} for an element matching @var{item}. 3804This function searches @var{list} for an element matching @var{item}.
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 1bc9d41f9bb..462eb4cf3ae 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -512,10 +512,10 @@ This chapter tells you how to get help with Emacs.
512@cindex Help system, entering the 512@cindex Help system, entering the
513 513
514Type @kbd{C-h t} to invoke the self-paced tutorial. Just typing 514Type @kbd{C-h t} to invoke the self-paced tutorial. Just typing
515@kbd{C-h} enters the help system. Starting with Emacs 22, the tutorial 515@kbd{C-h} enters the help system. The tutorial is available in many
516is available in many foreign languages such as French, German, Japanese, 516foreign languages such as French, German, Japanese, Russian, etc. Use
517Russian, etc. Use @kbd{M-x help-with-tutorial-spec-language @key{RET}} 517@kbd{M-x help-with-tutorial-spec-language @key{RET}} to choose your
518to choose your language and start the tutorial. 518language and start the tutorial.
519 519
520Your system administrator may have changed @kbd{C-h} to act like 520Your system administrator may have changed @kbd{C-h} to act like
521@key{DEL} to deal with local keyboards. You can use @kbd{M-x 521@key{DEL} to deal with local keyboards. You can use @kbd{M-x
@@ -966,9 +966,9 @@ latest features, you may want to stick to the releases.
966 966
967The following sections list some of the major new features in the last 967The following sections list some of the major new features in the last
968few Emacs releases. For full details of the changes in any version of 968few Emacs releases. For full details of the changes in any version of
969Emacs, type @kbd{C-h C-n} (@kbd{M-x view-emacs-news}). As of Emacs 22, 969Emacs, type @kbd{C-h C-n} (@kbd{M-x view-emacs-news}). You can give
970you can give this command a prefix argument to read about which features 970this command a prefix argument to read about which features were new
971were new in older versions. 971in older versions.
972 972
973@node New in Emacs 26 973@node New in Emacs 26
974@section What is different about Emacs 26? 974@section What is different about Emacs 26?
@@ -1725,14 +1725,6 @@ buffer by default, put this in your @file{.emacs} file:
1725 (setq abbrev-mode t))) 1725 (setq abbrev-mode t)))
1726@end lisp 1726@end lisp
1727 1727
1728@noindent If your Emacs version is older then 22.1, you will also need to use:
1729
1730@lisp
1731(condition-case ()
1732 (quietly-read-abbrev-file)
1733 (file-error nil))
1734@end lisp
1735
1736@node Associating modes with files 1728@node Associating modes with files
1737@section How do I make Emacs use a certain major mode for certain files? 1729@section How do I make Emacs use a certain major mode for certain files?
1738@cindex Associating modes with files 1730@cindex Associating modes with files
@@ -2583,16 +2575,14 @@ effective way of doing that. Emacs automatically intercepts the compile
2583error messages, inserts them into a special buffer called 2575error messages, inserts them into a special buffer called
2584@file{*compilation*}, and lets you visit the locus of each message in 2576@file{*compilation*}, and lets you visit the locus of each message in
2585the source. Type @kbd{C-x `} to step through the offending lines one by 2577the source. Type @kbd{C-x `} to step through the offending lines one by
2586one (starting with Emacs 22, you can also use @kbd{M-g M-p} and 2578one (you can also use @kbd{M-g M-p} and @kbd{M-g M-n} to go to the
2587@kbd{M-g M-n} to go to the previous and next matches directly). Click 2579previous and next matches directly). Click @kbd{mouse-2} or press
2588@kbd{mouse-2} or press @key{RET} on a message text in the 2580@key{RET} on a message text in the @file{*compilation*} buffer to go
2589@file{*compilation*} buffer to go to the line whose number is mentioned 2581to the line whose number is mentioned in that message.
2590in that message.
2591 2582
2592But if you indeed need to go to a certain text line, type @kbd{M-g M-g} 2583But if you indeed need to go to a certain text line, type @kbd{M-g M-g}
2593(which is the default binding of the @code{goto-line} function starting 2584(which is the default binding of the @code{goto-line} function).
2594with Emacs 22). Emacs will prompt you for the number of the line and go 2585Emacs will prompt you for the number of the line and go to that line.
2595to that line.
2596 2586
2597You can do this faster by invoking @code{goto-line} with a numeric 2587You can do this faster by invoking @code{goto-line} with a numeric
2598argument that is the line's number. For example, @kbd{C-u 286 M-g M-g} 2588argument that is the line's number. For example, @kbd{C-u 286 M-g M-g}
@@ -2825,13 +2815,13 @@ Add the following line to your @file{.emacs} file:
2825@cindex @code{ls} in Shell mode 2815@cindex @code{ls} in Shell mode
2826 2816
2827In many systems, @code{ls} is aliased to @samp{ls --color}, which 2817In many systems, @code{ls} is aliased to @samp{ls --color}, which
2828prints using ANSI color escape sequences. Emacs version 21.1 and 2818prints using ANSI color escape sequences. Emacs includes the
2829later includes the @code{ansi-color} package, which lets Shell mode 2819@code{ansi-color} package, which lets Shell mode recognize these
2830recognize these escape sequences. In Emacs 23.2 and later, the 2820escape sequences. In Emacs 23.2 and later, the package is enabled by
2831package is enabled by default; in earlier versions you can enable it 2821default; in earlier versions you can enable it by typing @kbd{M-x
2832by typing @kbd{M-x ansi-color-for-comint-mode} in the Shell buffer, or 2822ansi-color-for-comint-mode} in the Shell buffer, or by adding
2833by adding @code{(add-hook 'shell-mode-hook 2823@code{(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)} to
2834'ansi-color-for-comint-mode-on)} to your init file. 2824your init file.
2835 2825
2836@node Fullscreen mode on MS-Windows 2826@node Fullscreen mode on MS-Windows
2837@section How can I start Emacs in fullscreen mode on MS-Windows? 2827@section How can I start Emacs in fullscreen mode on MS-Windows?
@@ -3210,12 +3200,11 @@ arbitrary Emacs Lisp code evaluated when the file is visited.
3210Obviously, there is a potential for Trojan horses to exploit this 3200Obviously, there is a potential for Trojan horses to exploit this
3211feature. 3201feature.
3212 3202
3213As of Emacs 22, Emacs has a list of local variables that are known to 3203Emacs has a list of local variables that are known to be safe to set.
3214be safe to set. If a file tries to set any variable outside this 3204If a file tries to set any variable outside this list, it asks the
3215list, it asks the user to confirm whether the variables should be set. 3205user to confirm whether the variables should be set. You can also tell
3216You can also tell Emacs whether to allow the evaluation of Emacs Lisp 3206Emacs whether to allow the evaluation of Emacs Lisp code found at the
3217code found at the bottom of files by setting the variable 3207bottom of files by setting the variable @code{enable-local-eval}.
3218@code{enable-local-eval}.
3219 3208
3220@xref{File Variables,,, emacs, The GNU Emacs Manual}. 3209@xref{File Variables,,, emacs, The GNU Emacs Manual}.
3221 3210
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 4aa07ce3887..3743b497da8 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -5028,10 +5028,37 @@ Nothing if the article is a root and lots of spaces if it isn't (it
5028pushes everything after it off the screen). 5028pushes everything after it off the screen).
5029@item [ 5029@item [
5030Opening bracket, which is normally @samp{[}, but can also be @samp{<} 5030Opening bracket, which is normally @samp{[}, but can also be @samp{<}
5031for adopted articles (@pxref{Customizing Threading}). 5031for adopted articles (@pxref{Customizing Threading}). This can be
5032customized using following settings:
5033
5034@table @code
5035@item gnus-sum-opening-bracket
5036@vindex gnus-sum-opening-bracket
5037Opening bracket for normal (non-adopted) articles. The default is
5038@samp{[}.
5039
5040@item gnus-sum-opening-bracket-adopted
5041@vindex gnus-sum-opening-bracket-adopted
5042Opening bracket for adopted articles. The default is @samp{<}.
5043
5044@end table
5045
5032@item ] 5046@item ]
5033Closing bracket, which is normally @samp{]}, but can also be @samp{>} 5047Closing bracket, which is normally @samp{]}, but can also be @samp{>}
5034for adopted articles. 5048for adopted articles. This can be customised using following settings:
5049
5050@table @code
5051@item gnus-sum-closing-bracket
5052@vindex gnus-sum-closing-bracket
5053Closing bracket for normal (non-adopted) articles. The default is
5054@samp{]}.
5055
5056@item gnus-sum-closing-bracket-adopted
5057@vindex gnus-sum-opening-bracket-adopted
5058Closing bracket for adopted articles. The default is @samp{>}.
5059
5060@end table
5061
5035@item > 5062@item >
5036One space for each thread level. 5063One space for each thread level.
5037@item < 5064@item <
@@ -26260,6 +26287,16 @@ registry will keep. If the registry has reached or exceeded this
26260size, it will reject insertion of new entries. 26287size, it will reject insertion of new entries.
26261@end defvar 26288@end defvar
26262 26289
26290@defvar gnus-registry-register-all
26291If this option is non-nil, the registry will register all messages, as
26292you see them. This is important to making split-to-parent and
26293Message-ID references work correctly, as the registry needs to know
26294where all messages are, but it can slow down group opening and the
26295saving of Gnus. If this option is nil, entries must be created
26296manually, for instance by storing a custom flag or keyword for the
26297message.
26298@end defvar
26299
26263@defvar gnus-registry-prune-factor 26300@defvar gnus-registry-prune-factor
26264This option (a float between 0 and 1) controls how much the registry 26301This option (a float between 0 and 1) controls how much the registry
26265is cut back during pruning. In order to prevent constant pruning, the 26302is cut back during pruning. In order to prevent constant pruning, the
@@ -26349,8 +26386,14 @@ have to put a rule like this:
26349 "mail") 26386 "mail")
26350@end lisp 26387@end lisp
26351 26388
26352in your fancy split setup. In addition, you may want to customize the 26389in your fancy split setup.
26353following variables. 26390
26391If @code{gnus-registry-register-all} is non-nil (the default), the
26392registry will perform splitting for all messages. If it is nil,
26393splitting will only happen for children of messages you've explicitly
26394registered.
26395
26396In addition, you may want to customize the following variables.
26354 26397
26355@defvar gnus-registry-track-extra 26398@defvar gnus-registry-track-extra
26356This is a list of symbols, so it's best to change it from the 26399This is a list of symbols, so it's best to change it from the
@@ -26423,7 +26466,9 @@ Store @code{value} under @code{key} for message @code{id}.
26423@end defun 26466@end defun
26424 26467
26425@defun gnus-registry-get-id-key (id key) 26468@defun gnus-registry-get-id-key (id key)
26426Get the data under @code{key} for message @code{id}. 26469Get the data under @code{key} for message @code{id}. If the option
26470@code{gnus-registry-register-all} is non-nil, this function will also
26471create an entry for @code{id} if one doesn't exist.
26427@end defun 26472@end defun
26428 26473
26429@defvar gnus-registry-extra-entries-precious 26474@defvar gnus-registry-extra-entries-precious