aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-12-09 04:12:38 +0100
committerJuanma Barranquero2011-12-09 04:12:38 +0100
commit382c953bbe26f97877d79a66d84282b3bd00d718 (patch)
treeb57331d8817586a8bef4d9723edd2efa3221f169
parent98449af85cfedd241576e35e15d523e38e472c3b (diff)
downloademacs-382c953bbe26f97877d79a66d84282b3bd00d718.tar.gz
emacs-382c953bbe26f97877d79a66d84282b3bd00d718.zip
Fix typos.
-rw-r--r--lisp/ChangeLog25
-rw-r--r--lisp/ChangeLog.92
-rw-r--r--lisp/emacs-lisp/syntax.el4
-rw-r--r--lisp/erc/ChangeLog.028
-rw-r--r--lisp/erc/ChangeLog.038
-rw-r--r--lisp/printing.el2
-rw-r--r--lisp/simple.el10
-rw-r--r--lisp/window.el86
8 files changed, 83 insertions, 62 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 828d67fc376..dac5d05e181 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
12011-12-09 Juanma Barranquero <lekktu@gmail.com>
2
3 * printing.el (pr-mode-alist):
4 * simple.el (filter-buffer-substring-functions)
5 (completion-list-insert-choice-function):
6 * window.el (window-with-parameter, window-atom-root)
7 (window-sides-slots, window-size-fixed, window-min-delta)
8 (window-max-delta, window--resize-mini-window)
9 (window--resize-child-windows-normal, window-tree)
10 (delete-other-windows, quit-window, split-window)
11 (display-buffer-record-window, special-display-buffer-names)
12 (special-display-regexps, special-display-popup-frame)
13 (same-window-p, split-window-sensibly)
14 (display-buffer-overriding-action, display-buffer-alist)
15 (display-buffer-base-action, display-buffer, switch-to-buffer)
16 (switch-to-buffer-other-window, switch-to-buffer-other-frame)
17 (fit-window-to-buffer, recenter-positions)
18 (mouse-autoselect-window-state, mouse-autoselect-window-select):
19 * emacs-lisp/syntax.el (syntax-propertize-function): Fix typos
20 and remove unneeded backslashes in docstrings.
21
12011-12-08 Stefan Monnier <monnier@iro.umontreal.ca> 222011-12-08 Stefan Monnier <monnier@iro.umontreal.ca>
2 23
3 * emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt (bug#10244). 24 * emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt (bug#10244).
@@ -172,11 +193,11 @@
172 (verilog-inject-sense, verilog-read-inst-pins) 193 (verilog-inject-sense, verilog-read-inst-pins)
173 (verilog-read-sub-decls, verilog-read-sub-decls-line): 194 (verilog-read-sub-decls, verilog-read-sub-decls-line):
174 Fix mismatching parenthesis inside commented out code when deleting 195 Fix mismatching parenthesis inside commented out code when deleting
175 AUTOINST, bug383. Reported by Jonathan Greenlaw. 196 AUTOINST, bug383. Reported by Jonathan Greenlaw.
176 (verilog-auto-ascii-enum): Fix AUTOASCIIENUM one-hot with 197 (verilog-auto-ascii-enum): Fix AUTOASCIIENUM one-hot with
177 non-numeric vector width. Reported by Alex Reed. 198 non-numeric vector width. Reported by Alex Reed.
178 (verilog-auto-ascii-enum): Add "onehot" option to work around not 199 (verilog-auto-ascii-enum): Add "onehot" option to work around not
179 detecting signals with parameter widths. Reported by Alex Reed. 200 detecting signals with parameter widths. Reported by Alex Reed.
180 (verilog-auto-delete-trailing-whitespace): 201 (verilog-auto-delete-trailing-whitespace):
181 With `verilog-auto-delete-trailing-whitespace' remove trailing 202 With `verilog-auto-delete-trailing-whitespace' remove trailing
182 whitespace in auto expansion, bug371. Reported by Brad Dobbie. 203 whitespace in auto expansion, bug371. Reported by Brad Dobbie.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 1c38b4d9ac6..252b3854f7a 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -6620,7 +6620,7 @@
6620 (ansi-color-process-output): New function. It is automatically 6620 (ansi-color-process-output): New function. It is automatically
6621 added to comint-output-filter-functions if this is XEmacs. 6621 added to comint-output-filter-functions if this is XEmacs.
6622 (ansi-color-unfontify-region): New optional parameter for XEmacs 6622 (ansi-color-unfontify-region): New optional parameter for XEmacs
6623 compatibility. Check wether font-lock-syntactic-keywords is 6623 compatibility. Check whether font-lock-syntactic-keywords is
6624 boundp before removing the syntax table text property, as XEmacs 6624 boundp before removing the syntax table text property, as XEmacs
6625 doesn't have it. 6625 doesn't have it.
6626 (ansi-color-filter-region): Doc change. 6626 (ansi-color-filter-region): Doc change.
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index c65cbc39eab..85fa4772eb6 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -56,7 +56,7 @@
56 ;; syntax-ppss-flush-cache since that would not only flush the cache but also 56 ;; syntax-ppss-flush-cache since that would not only flush the cache but also
57 ;; reset syntax-propertize--done which should not be done in this case). 57 ;; reset syntax-propertize--done which should not be done in this case).
58 "Mode-specific function to apply the syntax-table properties. 58 "Mode-specific function to apply the syntax-table properties.
59Called with 2 arguments: START and END. 59Called with two arguments: START and END.
60This function can call `syntax-ppss' on any position before END, but it 60This function can call `syntax-ppss' on any position before END, but it
61should not call `syntax-ppss-flush-cache', which means that it should not 61should not call `syntax-ppss-flush-cache', which means that it should not
62call `syntax-ppss' on some position and later modify the buffer on some 62call `syntax-ppss' on some position and later modify the buffer on some
@@ -248,7 +248,7 @@ Note: back-references in REGEXPs do not work."
248 (if syntax 248 (if syntax
249 (put-text-property 249 (put-text-property
250 mb me 'syntax-table syntax)))))))) 250 mb me 'syntax-table syntax))))))))
251 251
252 (if (or (not (cddr rule)) (zerop gn)) 252 (if (or (not (cddr rule)) (zerop gn))
253 (setq code (nconc (nreverse thiscode) code)) 253 (setq code (nconc (nreverse thiscode) code))
254 (push `(if (match-beginning ,gn) 254 (push `(if (match-beginning ,gn)
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 3364af531f5..d20b6ca35a7 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -75,7 +75,7 @@
75 everything but the last character. 75 everything but the last character.
76 76
77 * erc.el(erc-send-current-line): 77 * erc.el(erc-send-current-line):
78 Check wether point is in the input line. If 78 Check whether point is in the input line. If
79 not, just beep and do nothing. 79 not, just beep and do nothing.
80 80
812002-12-28 Alex Schroeder <alex@gnu.org> 812002-12-28 Alex Schroeder <alex@gnu.org>
@@ -98,7 +98,7 @@
982002-12-28 Jorgen Schaefer <forcer@users.sourceforge.net> 982002-12-28 Jorgen Schaefer <forcer@users.sourceforge.net>
99 99
100 * erc.el(erc-log-irc-protocol): 100 * erc.el(erc-log-irc-protocol):
101 Removed check wether get-buffer-create 101 Removed check whether get-buffer-create
102 returned nil. "The value is never nil", says the docstring. 102 returned nil. "The value is never nil", says the docstring.
103 103
104 * erc.el: Day Of The Small Changes 104 * erc.el: Day Of The Small Changes
@@ -245,7 +245,7 @@
245 (erc-process-alive): Check erc-process for boundp and processp. 245 (erc-process-alive): Check erc-process for boundp and processp.
246 246
247 * erc.el(erc-kill-buffer-function): 247 * erc.el(erc-kill-buffer-function):
248 Do not check wether the process is 248 Do not check whether the process is
249 alive before running the hook, because there might be functions on 249 alive before running the hook, because there might be functions on
250 the hook that need to run even when the process is dead. And 250 the hook that need to run even when the process is dead. And
251 function that wants to check this, should use (erc-process-alive). 251 function that wants to check this, should use (erc-process-alive).
@@ -1037,7 +1037,7 @@
1037 * (erc-away-p): new function 1037 * (erc-away-p): new function
1038 1038
1039 erc-fill.el: 1039 erc-fill.el:
1040 * (erc-fill-variable): Check wether erc-timestamp-format is bound before 1040 * (erc-fill-variable): Check whether erc-timestamp-format is bound before
1041 using it (erc-fill.el does not require erc-stamp). 1041 using it (erc-fill.el does not require erc-stamp).
1042 1042
10432002-11-10 Alex Schroeder <alex@gnu.org> 10432002-11-10 Alex Schroeder <alex@gnu.org>
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index fc7fd09e76c..135d8f788f8 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -693,10 +693,10 @@
6932003-04-29 Jorgen Schaefer <forcer@users.sourceforge.net> 6932003-04-29 Jorgen Schaefer <forcer@users.sourceforge.net>
694 694
695 * erc.el(erc): 695 * erc.el(erc):
696 Check wether erc-save-buffer-in-logs is bound, too 696 Check whether erc-save-buffer-in-logs is bound, too
697 697
698 * erc.el(erc): 698 * erc.el(erc):
699 Check wether erc-logging-enabled is bound before using it - not 699 Check whether erc-logging-enabled is bound before using it - not
700 everyone is using erc-log.el! 700 everyone is using erc-log.el!
701 701
7022003-04-28 Andreas Fuchs <asf@void.at> 7022003-04-28 Andreas Fuchs <asf@void.at>
@@ -1166,7 +1166,7 @@
1166 1166
1167 (erc-person): Call erc-downcase before getting 1167 (erc-person): Call erc-downcase before getting
1168 something from the hash. 1168 something from the hash.
1169 (erc-nick-in-channel): Checking wether erc-process must be used is 1169 (erc-nick-in-channel): Checking whether erc-process must be used is
1170 unnecessary -- this will be done in erc-person. 1170 unnecessary -- this will be done in erc-person.
1171 (erc-nick-channels): New. 1171 (erc-nick-channels): New.
1172 (erc-add-nick-to-channel, erc-update-member): Call erc-downcase 1172 (erc-add-nick-to-channel, erc-update-member): Call erc-downcase
@@ -1678,7 +1678,7 @@
16782003-01-11 Jorgen Schaefer <forcer@users.sourceforge.net> 16782003-01-11 Jorgen Schaefer <forcer@users.sourceforge.net>
1679 1679
1680 * erc-stamp.el(erc-insert-timestamp-right): 1680 * erc-stamp.el(erc-insert-timestamp-right):
1681 Check wether erc-fill-column is 1681 Check whether erc-fill-column is
1682 available before using it. Else default to fill-column or if 1682 available before using it. Else default to fill-column or if
1683 everything else fails, the window width of the current window. For the 1683 everything else fails, the window width of the current window. For the
1684 fill-columns, use them directly as the starting position for the 1684 fill-columns, use them directly as the starting position for the
diff --git a/lisp/printing.el b/lisp/printing.el
index 2dea24149a7..dab57d16dca 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -2536,7 +2536,7 @@ LPR-PRINT It's a symbol function for text printing. It's invoked with
2536 nil, it's used (point-max). 2536 nil, it's used (point-max).
2537 2537
2538PS-PRINT It's a symbol function for PostScript printing. It's invoked 2538PS-PRINT It's a symbol function for PostScript printing. It's invoked
2539 with 3 arguments: n-up printing, file name and the list: 2539 with three arguments: n-up printing, file name and the list:
2540 (HEADER-LINES LEFT-HEADER RIGHT-HEADER DEFAULT...). 2540 (HEADER-LINES LEFT-HEADER RIGHT-HEADER DEFAULT...).
2541 2541
2542 Usually PS-PRINT function prepares the environment or buffer 2542 Usually PS-PRINT function prepares the environment or buffer
diff --git a/lisp/simple.el b/lisp/simple.el
index e9d88a210cf..c9ac32e0f9e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2915,11 +2915,11 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]."
2915 2915
2916(defvar filter-buffer-substring-functions nil 2916(defvar filter-buffer-substring-functions nil
2917 "Wrapper hook around `filter-buffer-substring'. 2917 "Wrapper hook around `filter-buffer-substring'.
2918The functions on this special hook are called with 4 arguments: 2918The functions on this special hook are called with four arguments:
2919 NEXT-FUN BEG END DELETE 2919 NEXT-FUN BEG END DELETE
2920NEXT-FUN is a function of 3 arguments (BEG END DELETE) 2920NEXT-FUN is a function of three arguments (BEG END DELETE)
2921that performs the default operation. The other 3 arguments are like 2921that performs the default operation. The other three arguments
2922the ones passed to `filter-buffer-substring'.") 2922are like the ones passed to `filter-buffer-substring'.")
2923 2923
2924(defvar buffer-substring-filters nil 2924(defvar buffer-substring-filters nil
2925 "List of filter functions for `filter-buffer-substring'. 2925 "List of filter functions for `filter-buffer-substring'.
@@ -6023,7 +6023,7 @@ of the text to replace. If END is nil, point is used instead.")
6023 6023
6024(defvar completion-list-insert-choice-function #'completion--replace 6024(defvar completion-list-insert-choice-function #'completion--replace
6025 "Function to use to insert the text chosen in *Completions*. 6025 "Function to use to insert the text chosen in *Completions*.
6026Called with 3 arguments (BEG END TEXT), it should replace the text 6026Called with three arguments (BEG END TEXT), it should replace the text
6027between BEG and END with TEXT. Expected to be set buffer-locally 6027between BEG and END with TEXT. Expected to be set buffer-locally
6028in the *Completions* buffer.") 6028in the *Completions* buffer.")
6029 6029
diff --git a/lisp/window.el b/lisp/window.el
index 112caeeaf0f..138fb7bcb2a 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -296,7 +296,7 @@ is unpredictable."
296 "Return first window on FRAME with PARAMETER non-nil. 296 "Return first window on FRAME with PARAMETER non-nil.
297FRAME defaults to the selected frame. Optional argument VALUE 297FRAME defaults to the selected frame. Optional argument VALUE
298non-nil means only return a window whose window-parameter value 298non-nil means only return a window whose window-parameter value
299for PARAMETER equals VALUE \(comparison is done with `equal'). 299for PARAMETER equals VALUE (comparison is done with `equal').
300Optional argument ANY non-nil means consider internal windows 300Optional argument ANY non-nil means consider internal windows
301too." 301too."
302 (let (this-value windows) 302 (let (this-value windows)
@@ -312,7 +312,7 @@ too."
312(defun window-atom-root (&optional window) 312(defun window-atom-root (&optional window)
313 "Return root of atomic window WINDOW is a part of. 313 "Return root of atomic window WINDOW is a part of.
314WINDOW can be any window and defaults to the selected one. 314WINDOW can be any window and defaults to the selected one.
315Return nil if WINDOW is not part of a atomic window." 315Return nil if WINDOW is not part of an atomic window."
316 (setq window (window-normalize-window window)) 316 (setq window (window-normalize-window window))
317 (let (root) 317 (let (root)
318 (while (and window (window-parameter window 'window-atom)) 318 (while (and window (window-parameter window 'window-atom))
@@ -380,7 +380,7 @@ Otherwise, top and bottom side windows are full width."
380(defcustom window-sides-slots '(nil nil nil nil) 380(defcustom window-sides-slots '(nil nil nil nil)
381 "Maximum number of side window slots. 381 "Maximum number of side window slots.
382The value is a list of four elements specifying the number of 382The value is a list of four elements specifying the number of
383side window slots on \(in this order) the left, top, right and 383side window slots on (in this order) the left, top, right and
384bottom side of each frame. If an element is a number, this means 384bottom side of each frame. If an element is a number, this means
385to display at most that many side windows on the corresponding 385to display at most that many side windows on the corresponding
386side. If an element is nil, this means there's no bound on the 386side. If an element is nil, this means there's no bound on the
@@ -504,7 +504,7 @@ If the value is `width', then only the window's width is fixed.
504Any other non-nil value fixes both the width and the height. 504Any other non-nil value fixes both the width and the height.
505 505
506Emacs won't change the size of any window displaying that buffer, 506Emacs won't change the size of any window displaying that buffer,
507unless it has no other choice \(like when deleting a neighboring 507unless it has no other choice (like when deleting a neighboring
508window).") 508window).")
509(make-variable-buffer-local 'window-size-fixed) 509(make-variable-buffer-local 'window-size-fixed)
510 510
@@ -749,7 +749,7 @@ Optional argument NOUP non-nil means don't go up in the window
749tree but try to enlarge windows within WINDOW's combination only. 749tree but try to enlarge windows within WINDOW's combination only.
750 750
751Optional argument NODOWN non-nil means don't check whether WINDOW 751Optional argument NODOWN non-nil means don't check whether WINDOW
752itself \(and its child windows) can be shrunk; check only whether 752itself (and its child windows) can be shrunk; check only whether
753at least one other window can be enlarged appropriately." 753at least one other window can be enlarged appropriately."
754 (setq window (window-normalize-window window)) 754 (setq window (window-normalize-window window))
755 (let ((size (window-total-size window horizontal)) 755 (let ((size (window-total-size window horizontal))
@@ -831,7 +831,7 @@ tree but try to obtain the entire space from windows within
831WINDOW's combination. 831WINDOW's combination.
832 832
833Optional argument NODOWN non-nil means do not check whether 833Optional argument NODOWN non-nil means do not check whether
834WINDOW itself \(and its child windows) can be enlarged; check 834WINDOW itself (and its child windows) can be enlarged; check
835only whether other windows can be shrunk appropriately." 835only whether other windows can be shrunk appropriately."
836 (setq window (window-normalize-window window)) 836 (setq window (window-normalize-window window))
837 (if (and (not (window--size-ignore window ignore)) 837 (if (and (not (window--size-ignore window ignore))
@@ -1418,7 +1418,7 @@ windows."
1418;; window and is currently used, for example, by ispell.el. 1418;; window and is currently used, for example, by ispell.el.
1419(defun window--resize-mini-window (window delta) 1419(defun window--resize-mini-window (window delta)
1420 "Resize minibuffer window WINDOW by DELTA lines. 1420 "Resize minibuffer window WINDOW by DELTA lines.
1421If WINDOW cannot be resized by DELTA lines make it as large \(or 1421If WINDOW cannot be resized by DELTA lines make it as large (or
1422as small) as possible but don't signal an error." 1422as small) as possible but don't signal an error."
1423 (when (window-minibuffer-p window) 1423 (when (window-minibuffer-p window)
1424 (let* ((frame (window-frame window)) 1424 (let* ((frame (window-frame window))
@@ -1513,12 +1513,12 @@ instead."
1513 "Recursively set new normal height of child windows of window PARENT. 1513 "Recursively set new normal height of child windows of window PARENT.
1514HORIZONTAL non-nil means set the new normal width of these 1514HORIZONTAL non-nil means set the new normal width of these
1515windows. WINDOW specifies a child window of PARENT that has been 1515windows. WINDOW specifies a child window of PARENT that has been
1516resized by THIS-DELTA lines \(columns). 1516resized by THIS-DELTA lines (columns).
1517 1517
1518Optional argument TRAIL either 'before or 'after means set values 1518Optional argument TRAIL either 'before or 'after means set values
1519for windows before or after WINDOW only. Optional argument 1519for windows before or after WINDOW only. Optional argument
1520OTHER-DELTA a number specifies that this many lines \(columns) 1520OTHER-DELTA a number specifies that this many lines (columns)
1521have been obtained from \(or returned to) an ancestor window of 1521have been obtained from (or returned to) an ancestor window of
1522PARENT in order to resize WINDOW." 1522PARENT in order to resize WINDOW."
1523 (let* ((delta-normal 1523 (let* ((delta-normal
1524 (if (and (= (- this-delta) (window-total-size window horizontal)) 1524 (if (and (= (- this-delta) (window-total-size window horizontal))
@@ -2190,7 +2190,7 @@ for a horizontal split, and t for a vertical split. EDGES gives
2190the combined size and position of the child windows in the split, 2190the combined size and position of the child windows in the split,
2191and the rest of the elements are the child windows in the split. 2191and the rest of the elements are the child windows in the split.
2192Each of the child windows may again be a window or a list 2192Each of the child windows may again be a window or a list
2193representing a window split, and so on. EDGES is a list \(LEFT 2193representing a window split, and so on. EDGES is a list (LEFT
2194TOP RIGHT BOTTOM) as returned by `window-edges'." 2194TOP RIGHT BOTTOM) as returned by `window-edges'."
2195 (setq frame (window-normalize-frame frame)) 2195 (setq frame (window-normalize-frame frame))
2196 (window--subtree (frame-root-window frame) t)) 2196 (window--subtree (frame-root-window frame) t))
@@ -2430,7 +2430,7 @@ the value returned by that function.
2430Otherwise, if WINDOW is part of an atomic window, call this 2430Otherwise, if WINDOW is part of an atomic window, call this
2431function with the root of the atomic window as its argument. If 2431function with the root of the atomic window as its argument. If
2432WINDOW is a non-side window, make WINDOW the only non-side window 2432WINDOW is a non-side window, make WINDOW the only non-side window
2433on the frame. Side windows are not deleted. If WINDOW is a side 2433on the frame. Side windows are not deleted. If WINDOW is a side
2434window signal an error." 2434window signal an error."
2435 (interactive) 2435 (interactive)
2436 (setq window (window-normalize-window window)) 2436 (setq window (window-normalize-window window))
@@ -2938,9 +2938,9 @@ With prefix argument KILL non-nil, kill the buffer instead of
2938burying it. 2938burying it.
2939 2939
2940According to information stored in WINDOW's `quit-restore' window 2940According to information stored in WINDOW's `quit-restore' window
2941parameter either \(1) delete WINDOW and its frame, \(2) delete 2941parameter either (1) delete WINDOW and its frame, (2) delete
2942WINDOW, \(3) restore the buffer previously displayed in WINDOW, 2942WINDOW, (3) restore the buffer previously displayed in WINDOW,
2943or \(4) make WINDOW display some other buffer than the present 2943or (4) make WINDOW display some other buffer than the present
2944one. If non-nil, reset `quit-restore' parameter to nil." 2944one. If non-nil, reset `quit-restore' parameter to nil."
2945 (interactive "P") 2945 (interactive "P")
2946 (setq window (window-normalize-window window t)) 2946 (setq window (window-normalize-window window t))
@@ -3047,14 +3047,14 @@ WINDOW's size. Interactively, SIZE is the prefix argument.
3047Optional third argument SIDE nil (or `below') specifies that the 3047Optional third argument SIDE nil (or `below') specifies that the
3048new window shall be located below WINDOW. SIDE `above' means the 3048new window shall be located below WINDOW. SIDE `above' means the
3049new window shall be located above WINDOW. In both cases SIZE 3049new window shall be located above WINDOW. In both cases SIZE
3050specifies the new number of lines for WINDOW \(or the new window 3050specifies the new number of lines for WINDOW (or the new window
3051if SIZE is negative) including space reserved for the mode and/or 3051if SIZE is negative) including space reserved for the mode and/or
3052header line. 3052header line.
3053 3053
3054SIDE t (or `right') specifies that the new window shall be 3054SIDE t (or `right') specifies that the new window shall be
3055located on the right side of WINDOW. SIDE `left' means the new 3055located on the right side of WINDOW. SIDE `left' means the new
3056window shall be located on the left of WINDOW. In both cases 3056window shall be located on the left of WINDOW. In both cases
3057SIZE specifies the new number of columns for WINDOW \(or the new 3057SIZE specifies the new number of columns for WINDOW (or the new
3058window provided SIZE is negative) including space reserved for 3058window provided SIZE is negative) including space reserved for
3059fringes and the scrollbar or a divider column. Any other non-nil 3059fringes and the scrollbar or a divider column. Any other non-nil
3060value for SIDE is currently handled like t (or `right'). 3060value for SIDE is currently handled like t (or `right').
@@ -3870,10 +3870,10 @@ windows can get as small as `window-safe-min-height' and
3870(defun display-buffer-record-window (type window buffer) 3870(defun display-buffer-record-window (type window buffer)
3871 "Record information for window used by `display-buffer'. 3871 "Record information for window used by `display-buffer'.
3872TYPE specifies the type of the calling operation and must be one 3872TYPE specifies the type of the calling operation and must be one
3873of the symbols 'reuse \(when WINDOW existed already and was 3873of the symbols 'reuse (when WINDOW existed already and was
3874reused for displaying BUFFER), 'window \(when WINDOW was created 3874reused for displaying BUFFER), 'window (when WINDOW was created
3875on an already existing frame), or 'frame \(when WINDOW was 3875on an already existing frame), or 'frame (when WINDOW was
3876created on a new frame). WINDOW is the window used for or created 3876created on a new frame). WINDOW is the window used for or created
3877by the `display-buffer' routines. BUFFER is the buffer that 3877by the `display-buffer' routines. BUFFER is the buffer that
3878shall be displayed. 3878shall be displayed.
3879 3879
@@ -3968,7 +3968,7 @@ the buffer as first, and nil as second argument.
3968 3968
3969Alternatively, an element of this list can be specified as 3969Alternatively, an element of this list can be specified as
3970\(BUFFER-NAME FRAME-PARAMETERS), where BUFFER-NAME is a buffer 3970\(BUFFER-NAME FRAME-PARAMETERS), where BUFFER-NAME is a buffer
3971name and FRAME-PARAMETERS an alist of \(PARAMETER . VALUE) pairs. 3971name and FRAME-PARAMETERS an alist of (PARAMETER . VALUE) pairs.
3972`special-display-popup-frame' will interpret such pairs as frame 3972`special-display-popup-frame' will interpret such pairs as frame
3973parameters when it creates a special frame, overriding the 3973parameters when it creates a special frame, overriding the
3974corresponding values from `special-display-frame-alist'. 3974corresponding values from `special-display-frame-alist'.
@@ -4044,7 +4044,7 @@ name matches REGEXP, overriding the corresponding values from
4044 4044
4045As a special case, if FRAME-PARAMETERS contains (same-window . t) 4045As a special case, if FRAME-PARAMETERS contains (same-window . t)
4046`special-display-popup-frame' displays buffers matching REGEXP in 4046`special-display-popup-frame' displays buffers matching REGEXP in
4047the selected window. \(same-frame . t) in FRAME-PARAMETERS means 4047the selected window. (same-frame . t) in FRAME-PARAMETERS means
4048to display such buffers in a window on the selected frame. 4048to display such buffers in a window on the selected frame.
4049 4049
4050If `special-display-function' specifies some other function than 4050If `special-display-function' specifies some other function than
@@ -4139,8 +4139,8 @@ Optional argument ARGS is a list specifying additional
4139information. 4139information.
4140 4140
4141If ARGS is an alist, use it as a list of frame parameters. If 4141If ARGS is an alist, use it as a list of frame parameters. If
4142these parameters contain \(same-window . t), display BUFFER in 4142these parameters contain (same-window . t), display BUFFER in
4143the selected window. If they contain \(same-frame . t), display 4143the selected window. If they contain (same-frame . t), display
4144BUFFER in a window of the selected frame. 4144BUFFER in a window of the selected frame.
4145 4145
4146If ARGS is a list whose car is a symbol, use (car ARGS) as a 4146If ARGS is a list whose car is a symbol, use (car ARGS) as a
@@ -4234,7 +4234,7 @@ See also `same-window-buffer-names'."
4234 "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window. 4234 "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
4235This function returns non-nil if `display-buffer' or 4235This function returns non-nil if `display-buffer' or
4236`pop-to-buffer' would show a buffer named BUFFER-NAME in the 4236`pop-to-buffer' would show a buffer named BUFFER-NAME in the
4237selected rather than \(as usual\) some other window. See 4237selected rather than (as usual) some other window. See
4238`same-window-buffer-names' and `same-window-regexps'." 4238`same-window-buffer-names' and `same-window-regexps'."
4239 (cond 4239 (cond
4240 ((not (stringp buffer-name))) 4240 ((not (stringp buffer-name)))
@@ -4396,11 +4396,11 @@ the largest or least recently used window. To change the default
4396customize the option `split-window-preferred-function'. 4396customize the option `split-window-preferred-function'.
4397 4397
4398You can enforce this function to not split WINDOW horizontally, 4398You can enforce this function to not split WINDOW horizontally,
4399by setting \(or binding) the variable `split-width-threshold' to 4399by setting (or binding) the variable `split-width-threshold' to
4400nil. If, in addition, you set `split-height-threshold' to zero, 4400nil. If, in addition, you set `split-height-threshold' to zero,
4401chances increase that this function does split WINDOW vertically. 4401chances increase that this function does split WINDOW vertically.
4402 4402
4403In order to not split WINDOW vertically, set \(or bind) the 4403In order to not split WINDOW vertically, set (or bind) the
4404variable `split-height-threshold' to nil. Additionally, you can 4404variable `split-height-threshold' to nil. Additionally, you can
4405set `split-width-threshold' to zero to make a horizontal split 4405set `split-width-threshold' to zero to make a horizontal split
4406more likely to occur. 4406more likely to occur.
@@ -4565,7 +4565,7 @@ BUFFER-OR-NAME and return that buffer."
4565(defvar display-buffer-overriding-action '(nil . nil) 4565(defvar display-buffer-overriding-action '(nil . nil)
4566 "Overriding action to perform to display a buffer. 4566 "Overriding action to perform to display a buffer.
4567It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a 4567It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
4568function or a list of functions. Each function should accept 2 4568function or a list of functions. Each function should accept two
4569arguments: a buffer to display and an alist similar to ALIST. 4569arguments: a buffer to display and an alist similar to ALIST.
4570See `display-buffer' for details.") 4570See `display-buffer' for details.")
4571(put 'display-buffer-overriding-action 'risky-local-variable t) 4571(put 'display-buffer-overriding-action 'risky-local-variable t)
@@ -4579,7 +4579,7 @@ This is a list of elements (CONDITION . ACTION), where:
4579 4579
4580 ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is a 4580 ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is a
4581 function or a list of functions. Each such function should 4581 function or a list of functions. Each such function should
4582 accept 2 arguments: a buffer to display and an alist of the 4582 accept two arguments: a buffer to display and an alist of the
4583 same form as ALIST. See `display-buffer' for details." 4583 same form as ALIST. See `display-buffer' for details."
4584 :type `(alist :key-type 4584 :type `(alist :key-type
4585 (choice :tag "Condition" 4585 (choice :tag "Condition"
@@ -4593,7 +4593,7 @@ This is a list of elements (CONDITION . ACTION), where:
4593(defcustom display-buffer-base-action '(nil . nil) 4593(defcustom display-buffer-base-action '(nil . nil)
4594 "User-specified default action for `display-buffer'. 4594 "User-specified default action for `display-buffer'.
4595It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a 4595It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
4596function or a list of functions. Each function should accept 2 4596function or a list of functions. Each function should accept two
4597arguments: a buffer to display and an alist similar to ALIST. 4597arguments: a buffer to display and an alist similar to ALIST.
4598See `display-buffer' for details." 4598See `display-buffer' for details."
4599 :type display-buffer--action-custom-type 4599 :type display-buffer--action-custom-type
@@ -4648,8 +4648,8 @@ or nil if no such window is found.
4648 4648
4649Optional argument ACTION should have the form (FUNCTION . ALIST). 4649Optional argument ACTION should have the form (FUNCTION . ALIST).
4650FUNCTION is either a function or a list of functions. Each such 4650FUNCTION is either a function or a list of functions. Each such
4651function is called with 2 arguments: the buffer to display and an 4651function is called with two arguments: the buffer to display and
4652alist. It should either display the buffer and return the 4652an alist. It should either display the buffer and return the
4653window, or return nil if unable to display the buffer. 4653window, or return nil if unable to display the buffer.
4654 4654
4655The `display-buffer' function builds a function list and an alist 4655The `display-buffer' function builds a function list and an alist
@@ -4996,7 +4996,7 @@ minibuffer. The variable `confirm-nonexistent-file-or-buffer'
4996determines whether to request confirmation before creating a new 4996determines whether to request confirmation before creating a new
4997buffer. 4997buffer.
4998 4998
4999BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or 4999BUFFER-OR-NAME may be a buffer, a string (a buffer name), or
5000nil. If BUFFER-OR-NAME is a string that does not identify an 5000nil. If BUFFER-OR-NAME is a string that does not identify an
5001existing buffer, create a buffer with that name. If 5001existing buffer, create a buffer with that name. If
5002BUFFER-OR-NAME is nil, switch to the buffer returned by 5002BUFFER-OR-NAME is nil, switch to the buffer returned by
@@ -5036,7 +5036,7 @@ Return the buffer switched to."
5036 5036
5037(defun switch-to-buffer-other-window (buffer-or-name &optional norecord) 5037(defun switch-to-buffer-other-window (buffer-or-name &optional norecord)
5038 "Select the buffer specified by BUFFER-OR-NAME in another window. 5038 "Select the buffer specified by BUFFER-OR-NAME in another window.
5039BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or 5039BUFFER-OR-NAME may be a buffer, a string (a buffer name), or
5040nil. Return the buffer switched to. 5040nil. Return the buffer switched to.
5041 5041
5042If called interactively, prompt for the buffer name using the 5042If called interactively, prompt for the buffer name using the
@@ -5060,7 +5060,7 @@ documentation for additional customization information."
5060 5060
5061(defun switch-to-buffer-other-frame (buffer-or-name &optional norecord) 5061(defun switch-to-buffer-other-frame (buffer-or-name &optional norecord)
5062 "Switch to buffer BUFFER-OR-NAME in another frame. 5062 "Switch to buffer BUFFER-OR-NAME in another frame.
5063BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or 5063BUFFER-OR-NAME may be a buffer, a string (a buffer name), or
5064nil. Return the buffer switched to. 5064nil. Return the buffer switched to.
5065 5065
5066If called interactively, prompt for the buffer name using the 5066If called interactively, prompt for the buffer name using the
@@ -5169,7 +5169,7 @@ WINDOW can be any live window and defaults to the selected one.
5169Optional argument MAX-HEIGHT specifies the maximum height of 5169Optional argument MAX-HEIGHT specifies the maximum height of
5170WINDOW and defaults to the height of WINDOW's frame. Optional 5170WINDOW and defaults to the height of WINDOW's frame. Optional
5171argument MIN-HEIGHT specifies the minimum height of WINDOW and 5171argument MIN-HEIGHT specifies the minimum height of WINDOW and
5172defaults to `window-min-height'. Both, MAX-HEIGHT and MIN-HEIGHT 5172defaults to `window-min-height'. Both MAX-HEIGHT and MIN-HEIGHT
5173are specified in lines and include the mode line and header line, 5173are specified in lines and include the mode line and header line,
5174if any. 5174if any.
5175 5175
@@ -5332,7 +5332,7 @@ A list of elements with possible values `top', `middle', `bottom',
5332integer or float numbers that define the cycling order for 5332integer or float numbers that define the cycling order for
5333the command `recenter-top-bottom'. 5333the command `recenter-top-bottom'.
5334 5334
5335Top and bottom destinations are `scroll-margin' lines the from true 5335Top and bottom destinations are `scroll-margin' lines from the true
5336window top and bottom. Middle redraws the frame and centers point 5336window top and bottom. Middle redraws the frame and centers point
5337vertically within the window. Integer number moves current line to 5337vertically within the window. Integer number moves current line to
5338the specified absolute window-line. Float number between 0.0 and 1.0 5338the specified absolute window-line. Float number between 0.0 and 1.0
@@ -5571,9 +5571,9 @@ With arg N, put point N/10 of the way from the true end."
5571 5571
5572(defvar mouse-autoselect-window-state nil 5572(defvar mouse-autoselect-window-state nil
5573 "When non-nil, special state of delayed window autoselection. 5573 "When non-nil, special state of delayed window autoselection.
5574Possible values are `suspend' \(suspend autoselection after a menu or 5574Possible values are `suspend' (suspend autoselection after a menu or
5575scrollbar interaction\) and `select' \(the next invocation of 5575scrollbar interaction) and `select' (the next invocation of
5576'handle-select-window' shall select the window immediately\).") 5576`handle-select-window' shall select the window immediately).")
5577 5577
5578(defun mouse-autoselect-window-cancel (&optional force) 5578(defun mouse-autoselect-window-cancel (&optional force)
5579 "Cancel delayed window autoselection. 5579 "Cancel delayed window autoselection.
@@ -5610,8 +5610,8 @@ means suspend autoselection."
5610(defun mouse-autoselect-window-select () 5610(defun mouse-autoselect-window-select ()
5611 "Select window with delayed window autoselection. 5611 "Select window with delayed window autoselection.
5612If the mouse position has stabilized in a non-selected window, select 5612If the mouse position has stabilized in a non-selected window, select
5613that window. The minibuffer window is selected only if the minibuffer is 5613that window. The minibuffer window is selected only if the minibuffer
5614active. This function is run by `mouse-autoselect-window-timer'." 5614is active. This function is run by `mouse-autoselect-window-timer'."
5615 (ignore-errors 5615 (ignore-errors
5616 (let* ((mouse-position (mouse-position)) 5616 (let* ((mouse-position (mouse-position))
5617 (window 5617 (window