aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2019-11-08 17:07:13 -0800
committerPaul Eggert2019-11-08 17:11:01 -0800
commitf8284f1e408b38e6a3c0e2a1d5a465fefac6800a (patch)
tree968d78aea467a7f574227bdb46073a15e4372efb
parentb7f843adfd91bdbb24af7539a782d12767646fce (diff)
downloademacs-f8284f1e408b38e6a3c0e2a1d5a465fefac6800a.tar.gz
emacs-f8284f1e408b38e6a3c0e2a1d5a465fefac6800a.zip
Fix some quoting glitches in doc strings
This also fixes a misplaced "only".
-rw-r--r--lisp/files.el2
-rw-r--r--lisp/mouse.el6
-rw-r--r--lisp/progmodes/sql.el2
-rw-r--r--lisp/progmodes/vhdl-mode.el4
-rw-r--r--lisp/so-long.el8
-rw-r--r--lisp/subr.el10
-rw-r--r--lisp/tab-bar.el2
-rw-r--r--lisp/window.el70
-rw-r--r--src/nsfns.m2
-rw-r--r--src/process.c2
-rw-r--r--src/window.c8
11 files changed, 58 insertions, 58 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 7690357058b..f7726b566a9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6864,7 +6864,7 @@ regardless of the language.")
6864The return value is a cons (DIR . WILDCARDS); DIR is the 6864The return value is a cons (DIR . WILDCARDS); DIR is the
6865`default-directory' in the Dired buffer, and WILDCARDS are the wildcards. 6865`default-directory' in the Dired buffer, and WILDCARDS are the wildcards.
6866 6866
6867Valid wildcards are '*', '?', '[abc]' and '[a-z]'." 6867Valid wildcards are `*', `?', `[abc]' and `[a-z]'."
6868 (let ((wildcards "[?*")) 6868 (let ((wildcards "[?*"))
6869 (when (and (or (not (featurep 'ls-lisp)) 6869 (when (and (or (not (featurep 'ls-lisp))
6870 ls-lisp-support-shell-wildcards) 6870 ls-lisp-support-shell-wildcards)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 4a351f7be25..238852ffdc8 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -622,9 +622,9 @@ START-EVENT is the starting mouse event of the drag action. Its
622position window denotes the frame that will be dragged. 622position window denotes the frame that will be dragged.
623 623
624PART specifies the part that has been dragged and must be one of 624PART specifies the part that has been dragged and must be one of
625the symbols 'left', 'top', 'right', 'bottom', 'top-left', 625the symbols `left', `top', `right', `bottom', `top-left',
626'top-right', 'bottom-left', 'bottom-right' to drag an internal 626`top-right', `bottom-left', `bottom-right' to drag an internal
627border or edge. If PART equals 'move', this means to move the 627border or edge. If PART equals `move', this means to move the
628frame with the mouse." 628frame with the mouse."
629 ;; Give temporary modes such as isearch a chance to turn off. 629 ;; Give temporary modes such as isearch a chance to turn off.
630 (run-hooks 'mouse-leave-buffer-hook) 630 (run-hooks 'mouse-leave-buffer-hook)
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index b17364b08f3..aa42873a3dd 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -5418,7 +5418,7 @@ The default comes from `process-coding-system-alist' and
5418your might try undecided-dos as a coding system. If this doesn't help, 5418your might try undecided-dos as a coding system. If this doesn't help,
5419Try to set `comint-output-filter-functions' like this: 5419Try to set `comint-output-filter-functions' like this:
5420 5420
5421\(add-hook 'comint-output-filter-functions #\\='comint-strip-ctrl-m 'append) 5421\(add-hook \\='comint-output-filter-functions #\\='comint-strip-ctrl-m \\='append)
5422 5422
5423\(Type \\[describe-mode] in the SQL buffer for a list of commands.)" 5423\(Type \\[describe-mode] in the SQL buffer for a list of commands.)"
5424 (interactive "P") 5424 (interactive "P")
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 50b5ad0816e..16ddcdebc9f 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -4867,8 +4867,8 @@ Known problems:
4867 4867
4868- XEmacs: Incorrect start-up when automatically opening speedbar. 4868- XEmacs: Incorrect start-up when automatically opening speedbar.
4869- XEmacs: Indentation in XEmacs 21.4 (and higher). 4869- XEmacs: Indentation in XEmacs 21.4 (and higher).
4870- Indentation incorrect for new 'postponed' VHDL keyword. 4870- Indentation incorrect for new `postponed' VHDL keyword.
4871- Indentation incorrect for 'protected body' construct. 4871- Indentation incorrect for `protected body' construct.
4872 4872
4873 4873
4874 The VHDL Mode Authors 4874 The VHDL Mode Authors
diff --git a/lisp/so-long.el b/lisp/so-long.el
index e2467e4f0f3..43602b48313 100644
--- a/lisp/so-long.el
+++ b/lisp/so-long.el
@@ -1174,7 +1174,7 @@ enabled, and `so-long-predicate' has detected that the file contains long lines.
1174Many Emacs modes struggle with buffers which contain excessively long lines, 1174Many Emacs modes struggle with buffers which contain excessively long lines,
1175and may consequently cause unacceptable performance issues. 1175and may consequently cause unacceptable performance issues.
1176 1176
1177This is commonly on account of 'minified' code (i.e. code has been compacted 1177This is commonly on account of \"minified\" code (i.e., code compacted
1178into the smallest file size possible, which often entails removing newlines 1178into the smallest file size possible, which often entails removing newlines
1179should they not be strictly necessary). These kinds of files are typically 1179should they not be strictly necessary). These kinds of files are typically
1180not intended to be edited, so not providing the usual editing mode in these 1180not intended to be edited, so not providing the usual editing mode in these
@@ -1626,9 +1626,9 @@ Equivalent to calling (global-so-long-mode 0)"
1626Many Emacs modes struggle with buffers which contain excessively long lines, 1626Many Emacs modes struggle with buffers which contain excessively long lines,
1627and may consequently cause unacceptable performance issues. 1627and may consequently cause unacceptable performance issues.
1628 1628
1629This is commonly on account of 'minified' code (i.e. code that has been 1629This is commonly on account of \"minified\" code (i.e., code compacted into the
1630compacted into the smallest file size possible, which often entails removing 1630smallest file size possible, which often entails removing newlines should they
1631newlines should they not be strictly necessary). 1631not be strictly necessary).
1632 1632
1633When such files are detected by `so-long-predicate', we invoke the selected 1633When such files are detected by `so-long-predicate', we invoke the selected
1634`so-long-action' to mitigate potential performance problems in the buffer. 1634`so-long-action' to mitigate potential performance problems in the buffer.
diff --git a/lisp/subr.el b/lisp/subr.el
index 03cf3da278f..85e7187fb6b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -838,9 +838,9 @@ destructively modifying the list stored in ALIST.
838 838
839Example: 839Example:
840 840
841 (setq foo '((a . 0))) 841 (setq foo \\='((a . 0)))
842 (setf (alist-get 'a foo) 1 842 (setf (alist-get \\='a foo) 1
843 (alist-get 'b foo) 2) 843 (alist-get \\='b foo) 2)
844 844
845 foo => ((b . 2) (a . 1)) 845 foo => ((b . 2) (a . 1))
846 846
@@ -852,8 +852,8 @@ deleted from the alist).
852 852
853Example: 853Example:
854 854
855 (setq foo '((a . 1) (b . 2))) 855 (setq foo \\='((a . 1) (b . 2)))
856 (setf (alist-get 'b foo nil 'remove) nil) 856 (setf (alist-get \\='b foo nil \\='remove) nil)
857 857
858 foo => ((a . 1))" 858 foo => ((a . 1))"
859 (ignore remove) ;;Silence byte-compiler. 859 (ignore remove) ;;Silence byte-compiler.
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index e915930c274..e00839572c8 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -350,7 +350,7 @@ Also add the number of windows in the window configuration."
350 "Function to get a list of tabs to display in the tab bar. 350 "Function to get a list of tabs to display in the tab bar.
351This function should return a list of alists with parameters 351This function should return a list of alists with parameters
352that include at least the element (name . TAB-NAME). 352that include at least the element (name . TAB-NAME).
353For example, '((tab (name . \"Tab 1\")) (current-tab (name . \"Tab 2\"))) 353For example, \\='((tab (name . \"Tab 1\")) (current-tab (name . \"Tab 2\")))
354By default, use function `tab-bar-tabs'.") 354By default, use function `tab-bar-tabs'.")
355 355
356(defun tab-bar-tabs () 356(defun tab-bar-tabs ()
diff --git a/lisp/window.el b/lisp/window.el
index bf213547039..74780479393 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2292,14 +2292,14 @@ SIDE can be any of the symbols `left', `top', `right' or
2292 "Return window in DIRECTION as seen from WINDOW. 2292 "Return window in DIRECTION as seen from WINDOW.
2293More precisely, return the nearest window in direction DIRECTION 2293More precisely, return the nearest window in direction DIRECTION
2294as seen from the position of `window-point' in window WINDOW. 2294as seen from the position of `window-point' in window WINDOW.
2295DIRECTION should be one of 'above', 'below', 'left' or 'right'. 2295DIRECTION should be one of `above', `below', `left' or `right'.
2296WINDOW must be a live window and defaults to the selected one. 2296WINDOW must be a live window and defaults to the selected one.
2297 2297
2298Do not return a window whose 'no-other-window' parameter is 2298Do not return a window whose `no-other-window' parameter is
2299non-nil. If the nearest window's 'no-other-window' parameter is 2299non-nil. If the nearest window's `no-other-window' parameter is
2300non-nil, try to find another window in the indicated direction. 2300non-nil, try to find another window in the indicated direction.
2301If, however, the optional argument IGNORE is non-nil, return that 2301If, however, the optional argument IGNORE is non-nil, return that
2302window even if its 'no-other-window' parameter is non-nil. 2302window even if its `no-other-window' parameter is non-nil.
2303 2303
2304Optional argument SIGN a negative number means to use the right 2304Optional argument SIGN a negative number means to use the right
2305or bottom edge of WINDOW as reference position instead of 2305or bottom edge of WINDOW as reference position instead of
@@ -2308,7 +2308,7 @@ top edge of WINDOW as reference position.
2308 2308
2309Optional argument WRAP non-nil means to wrap DIRECTION around 2309Optional argument WRAP non-nil means to wrap DIRECTION around
2310frame borders. This means to return for WINDOW at the top of the 2310frame borders. This means to return for WINDOW at the top of the
2311frame and DIRECTION 'above' the minibuffer window if the frame 2311frame and DIRECTION `above' the minibuffer window if the frame
2312has one, and a window at the bottom of the frame otherwise. 2312has one, and a window at the bottom of the frame otherwise.
2313 2313
2314Optional argument MINI nil means to return the minibuffer window 2314Optional argument MINI nil means to return the minibuffer window
@@ -5058,29 +5058,29 @@ absolute value can be less than `window-min-height' or
5058small as one line or two columns. SIZE defaults to half of 5058small as one line or two columns. SIZE defaults to half of
5059WINDOW's size. 5059WINDOW's size.
5060 5060
5061Optional third argument SIDE nil (or 'below') specifies that the 5061Optional third argument SIDE nil (or `below') specifies that the
5062new window shall be located below WINDOW. SIDE 'above' means the 5062new window shall be located below WINDOW. SIDE `above' means the
5063new window shall be located above WINDOW. In both cases SIZE 5063new window shall be located above WINDOW. In both cases SIZE
5064specifies the new number of lines for WINDOW (or the new window 5064specifies the new number of lines for WINDOW (or the new window
5065if SIZE is negative) including space reserved for the mode and/or 5065if SIZE is negative) including space reserved for the mode and/or
5066header line. 5066header line.
5067 5067
5068SIDE t (or 'right') specifies that the new window shall be 5068SIDE t (or `right') specifies that the new window shall be
5069located on the right side of WINDOW. SIDE 'left' means the new 5069located on the right side of WINDOW. SIDE `left' means the new
5070window shall be located on the left of WINDOW. In both cases 5070window shall be located on the left of WINDOW. In both cases
5071SIZE specifies the new number of columns for WINDOW (or the new 5071SIZE specifies the new number of columns for WINDOW (or the new
5072window provided SIZE is negative) including space reserved for 5072window provided SIZE is negative) including space reserved for
5073fringes and the scrollbar or a divider column. 5073fringes and the scrollbar or a divider column.
5074 5074
5075For compatibility reasons, SIDE 'up' and 'down' are interpreted 5075For compatibility reasons, SIDE `up' and `down' are interpreted
5076as 'above' and 'below'. Any other non-nil value for SIDE is 5076as `above' and `below'. Any other non-nil value for SIDE is
5077currently handled like t (or 'right'). 5077currently handled like t (or `right').
5078 5078
5079PIXELWISE, if non-nil, means to interpret SIZE pixelwise. 5079PIXELWISE, if non-nil, means to interpret SIZE pixelwise.
5080 5080
5081If the variable `ignore-window-parameters' is non-nil or the 5081If the variable `ignore-window-parameters' is non-nil or the
5082'split-window' parameter of WINDOW equals t, do not process any 5082`split-window' parameter of WINDOW equals t, do not process any
5083parameters of WINDOW. Otherwise, if the 'split-window' parameter 5083parameters of WINDOW. Otherwise, if the `split-window' parameter
5084of WINDOW specifies a function, call that function with all three 5084of WINDOW specifies a function, call that function with all three
5085arguments and return the value returned by that function. 5085arguments and return the value returned by that function.
5086 5086
@@ -6896,18 +6896,18 @@ already before that action function was called or is a new window
6896created by that function. ALIST is a buffer display action alist 6896created by that function. ALIST is a buffer display action alist
6897as compiled by `display-buffer'. 6897as compiled by `display-buffer'.
6898 6898
6899TYPE must be one of the following symbols: 'reuse' (which means 6899TYPE must be one of the following symbols: `reuse' (which means
6900WINDOW existed before the call of `display-buffer' and may 6900WINDOW existed before the call of `display-buffer' and may
6901already show BUFFER or not), 'window' (WINDOW was created on an 6901already show BUFFER or not), `window' (WINDOW was created on an
6902existing frame) or 'frame' (WINDOW was created on a new frame). 6902existing frame) or `frame' (WINDOW was created on a new frame).
6903TYPE is passed unaltered to `display-buffer-record-window'. 6903TYPE is passed unaltered to `display-buffer-record-window'.
6904 6904
6905Handle WINDOW's dedicated flag as follows: If WINDOW already 6905Handle WINDOW's dedicated flag as follows: If WINDOW already
6906shows BUFFER, leave it alone. Otherwise, if ALIST contains a 6906shows BUFFER, leave it alone. Otherwise, if ALIST contains a
6907'dedicated' entry and WINDOW is either new or that entry's value 6907`dedicated' entry and WINDOW is either new or that entry's value
6908equals 'side', set WINDOW's dedicated flag to the value of that 6908equals `side', set WINDOW's dedicated flag to the value of that
6909entry. Otherwise, if WINDOW is new and the value of 6909entry. Otherwise, if WINDOW is new and the value of
6910'display-buffer-mark-dedicated' is non-nil, set WINDOW's 6910`display-buffer-mark-dedicated' is non-nil, set WINDOW's
6911dedicated flag to that value. In any other case, reset WINDOW's 6911dedicated flag to that value. In any other case, reset WINDOW's
6912dedicated flag to nil. 6912dedicated flag to nil.
6913 6913
@@ -7227,18 +7227,18 @@ Action functions and the action they try to perform are:
7227 have `display-buffer' return nil immediately. 7227 have `display-buffer' return nil immediately.
7228 7228
7229Action alist entries are: 7229Action alist entries are:
7230 'inhibit-same-window' -- A non-nil value prevents the same 7230 `inhibit-same-window' -- A non-nil value prevents the same
7231 window from being used for display. 7231 window from being used for display.
7232 'inhibit-switch-frame' -- A non-nil value prevents any frame 7232 `inhibit-switch-frame' -- A non-nil value prevents any frame
7233 used for showing the buffer from being raised or selected. 7233 used for showing the buffer from being raised or selected.
7234 'reusable-frames' -- The value specifies the set of frames to 7234 `reusable-frames' -- The value specifies the set of frames to
7235 search for a window that already displays the buffer. 7235 search for a window that already displays the buffer.
7236 Possible values are nil (the selected frame), t (any live 7236 Possible values are nil (the selected frame), t (any live
7237 frame), visible (any visible frame), 0 (any visible or 7237 frame), visible (any visible frame), 0 (any visible or
7238 iconified frame) or an existing live frame. 7238 iconified frame) or an existing live frame.
7239 'pop-up-frame-parameters' -- The value specifies an alist of 7239 `pop-up-frame-parameters' -- The value specifies an alist of
7240 frame parameters to give a new frame, if one is created. 7240 frame parameters to give a new frame, if one is created.
7241 'window-height' -- The value specifies the desired height of the 7241 `window-height' -- The value specifies the desired height of the
7242 window chosen and is either an integer (the total height of 7242 window chosen and is either an integer (the total height of
7243 the window), a floating point number (the fraction of its 7243 the window), a floating point number (the fraction of its
7244 total height with respect to the total height of the frame's 7244 total height with respect to the total height of the frame's
@@ -7247,23 +7247,23 @@ Action alist entries are:
7247 height of the window; its return value is ignored. Suitable 7247 height of the window; its return value is ignored. Suitable
7248 functions are `shrink-window-if-larger-than-buffer' and 7248 functions are `shrink-window-if-larger-than-buffer' and
7249 `fit-window-to-buffer'. 7249 `fit-window-to-buffer'.
7250 'window-width' -- The value specifies the desired width of the 7250 `window-width' -- The value specifies the desired width of the
7251 window chosen and is either an integer (the total width of 7251 window chosen and is either an integer (the total width of
7252 the window), a floating point number (the fraction of its 7252 the window), a floating point number (the fraction of its
7253 total width with respect to the width of the frame's root 7253 total width with respect to the width of the frame's root
7254 window) or a function to be called with one argument - the 7254 window) or a function to be called with one argument - the
7255 chosen window. The function is supposed to adjust the width 7255 chosen window. The function is supposed to adjust the width
7256 of the window; its return value is ignored. 7256 of the window; its return value is ignored.
7257 'preserve-size' -- The value should be either (t . nil) to 7257 `preserve-size' -- The value should be either (t . nil) to
7258 preserve the width of the chosen window, (nil . t) to 7258 preserve the width of the chosen window, (nil . t) to
7259 preserve its height or (t . t) to preserve its height and 7259 preserve its height or (t . t) to preserve its height and
7260 width in future changes of the window configuration. 7260 width in future changes of the window configuration.
7261 'window-parameters' -- The value specifies an alist of window 7261 `window-parameters' -- The value specifies an alist of window
7262 parameters to give the chosen window. 7262 parameters to give the chosen window.
7263 'allow-no-window' -- A non-nil value means that `display-buffer' 7263 `allow-no-window' -- A non-nil value means that `display-buffer'
7264 may not display the buffer and return nil immediately. 7264 may not display the buffer and return nil immediately.
7265 7265
7266The entries 'window-height', 'window-width' and 'preserve-size' 7266The entries `window-height', `window-width' and `preserve-size'
7267are applied only when the window used for displaying the buffer 7267are applied only when the window used for displaying the buffer
7268never showed another buffer before. 7268never showed another buffer before.
7269 7269
@@ -7710,16 +7710,16 @@ indirectly called by the latter."
7710(defun windows-sharing-edge (&optional window edge within) 7710(defun windows-sharing-edge (&optional window edge within)
7711 "Return list of live windows sharing the same edge with WINDOW. 7711 "Return list of live windows sharing the same edge with WINDOW.
7712WINDOW must be a valid window and defaults to the selected one. 7712WINDOW must be a valid window and defaults to the selected one.
7713EDGE stands for the edge to share and must be either 'left', 7713EDGE stands for the edge to share and must be either `left',
7714'above', 'right' or 'below'. Omitted or nil, EDGE defaults to 7714`above', `right' or `below'. Omitted or nil, EDGE defaults to
7715'left'. 7715`left'.
7716 7716
7717WITHIN nil means to find a live window that shares the opposite 7717WITHIN nil means to find a live window that shares the opposite
7718EDGE with WINDOW. For example, if EDGE equals 'left', WINDOW has 7718EDGE with WINDOW. For example, if EDGE equals `left', WINDOW has
7719to share (part of) the right edge of any window returned. WITHIN 7719to share (part of) the right edge of any window returned. WITHIN
7720non-nil means to find all live windows that share the same EDGE 7720non-nil means to find all live windows that share the same EDGE
7721with WINDOW (Window must be internal in this case). So if EDGE 7721with WINDOW (Window must be internal in this case). So if EDGE
7722equals 'left', WINDOW's left edge has to fully encompass the left 7722equals `left', WINDOW's left edge has to fully encompass the left
7723edge of any window returned." 7723edge of any window returned."
7724 (setq window (window-normalize-window window)) 7724 (setq window (window-normalize-window window))
7725 (setq edge (or edge 'left)) 7725 (setq edge (or edge 'left))
diff --git a/src/nsfns.m b/src/nsfns.m
index 184fd71678e..4c1fb76deae 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1971,7 +1971,7 @@ the active application. */)
1971 1971
1972DEFUN ("ns-emacs-info-panel", Fns_emacs_info_panel, Sns_emacs_info_panel, 1972DEFUN ("ns-emacs-info-panel", Fns_emacs_info_panel, Sns_emacs_info_panel,
1973 0, 0, 0, 1973 0, 0, 0,
1974 doc: /* Shows the 'Info' or 'About' panel for Emacs. */) 1974 doc: /* Shows the `Info' or `About' panel for Emacs. */)
1975 (void) 1975 (void)
1976{ 1976{
1977 check_window_system (NULL); 1977 check_window_system (NULL);
diff --git a/src/process.c b/src/process.c
index 8aa4811f7ed..9158cfd347c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3761,7 +3761,7 @@ host, and only clients connecting to that address will be accepted.
3761If all interfaces should be bound, an address of \"0.0.0.0\" (for 3761If all interfaces should be bound, an address of \"0.0.0.0\" (for
3762IPv4) or \"::\" (for IPv6) can be used. (On some operating systems, 3762IPv4) or \"::\" (for IPv6) can be used. (On some operating systems,
3763using \"::\" listens on both IPv4 and IPv6.) `local' will use IPv4 by 3763using \"::\" listens on both IPv4 and IPv6.) `local' will use IPv4 by
3764default, use a FAMILY of 'ipv6 to override this. 3764default, use a FAMILY of `ipv6' to override this.
3765 3765
3766:service SERVICE -- SERVICE is name of the service desired, or an 3766:service SERVICE -- SERVICE is name of the service desired, or an
3767integer specifying a port number to connect to. If SERVICE is t, 3767integer specifying a port number to connect to. If SERVICE is t,
diff --git a/src/window.c b/src/window.c
index 0fa0bdf7b92..e122649f59e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3539,8 +3539,8 @@ DEFUN ("run-window-scroll-functions", Frun_window_scroll_functions,
3539 doc: /* Run `window-scroll-functions' for WINDOW. 3539 doc: /* Run `window-scroll-functions' for WINDOW.
3540If WINDOW is omitted or nil, it defaults to the selected window. 3540If WINDOW is omitted or nil, it defaults to the selected window.
3541 3541
3542This function is curently only called by 'split-window' for the new 3542This function is called by `split-window' for the new window, after it
3543window after it has established the size of the new window. */) 3543has established the size of the new window. */)
3544 (Lisp_Object window) 3544 (Lisp_Object window)
3545{ 3545{
3546 struct window *w = decode_live_window (window); 3546 struct window *w = decode_live_window (window);
@@ -7661,7 +7661,7 @@ display marginal areas and the text area.
7661Optional fifth argument PERSISTENT non-nil means that fringe settings 7661Optional fifth argument PERSISTENT non-nil means that fringe settings
7662for WINDOW are persistent, i.e., remain unchanged when another buffer 7662for WINDOW are persistent, i.e., remain unchanged when another buffer
7663is shown in WINDOW. PERSISTENT nil means that fringes are reset from 7663is shown in WINDOW. PERSISTENT nil means that fringes are reset from
7664buffer local values when 'set-window-buffer' is called on WINDOW with 7664buffer local values when `set-window-buffer' is called on WINDOW with
7665the argument KEEP-MARGINS nil. 7665the argument KEEP-MARGINS nil.
7666 7666
7667Leave fringes unchanged if WINDOW is not large enough to accommodate 7667Leave fringes unchanged if WINDOW is not large enough to accommodate
@@ -7812,7 +7812,7 @@ order to show a scroll bar for mini windows.
7812Optional sixth argument PERSISTENT non-nil means that scroll bar 7812Optional sixth argument PERSISTENT non-nil means that scroll bar
7813settings for WINDOW are persistent, i.e., remain unchanged when 7813settings for WINDOW are persistent, i.e., remain unchanged when
7814another buffer is shown in WINDOW. PERSISTENT nil means that scroll 7814another buffer is shown in WINDOW. PERSISTENT nil means that scroll
7815bars are reset from buffer local values when 'set-window-buffer' is 7815bars are reset from buffer local values when `set-window-buffer' is
7816called on WINDOW with the argument KEEP-MARGINS nil. 7816called on WINDOW with the argument KEEP-MARGINS nil.
7817 7817
7818If WINDOW is not large enough to accommodate a scroll bar of the 7818If WINDOW is not large enough to accommodate a scroll bar of the