aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2013-12-11 18:54:09 +0100
committerMartin Rudalics2013-12-11 18:54:09 +0100
commit3c29190fbed76238c719718c9149762bfe8fd372 (patch)
treec6a12caecead053e8e91ad84e0b567af3f6b22fb
parent0cd616a2d872e4ce6df868e25dc5d19eeaaa3064 (diff)
downloademacs-3c29190fbed76238c719718c9149762bfe8fd372.tar.gz
emacs-3c29190fbed76238c719718c9149762bfe8fd372.zip
Fix doc-string of display-buffer-in-side-window (Bug#16115).
* window.el (display-buffer-in-side-window): Fix doc-string (Bug#16115).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6479e197bf7..bb812f13ade 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-12-11 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (display-buffer-in-side-window): Fix doc-string
4 (Bug#16115).
5
12013-12-11 Juanma Barranquero <lekktu@gmail.com> 62013-12-11 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * vc/vc-git.el: Silence byte-compiler warnings. 8 * vc/vc-git.el: Silence byte-compiler warnings.
diff --git a/lisp/window.el b/lisp/window.el
index 24fe6a27895..714979d8df1 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -807,13 +807,13 @@ SIDE. Return the new window, nil if its creation window failed."
807 (delete-window window))) 807 (delete-window window)))
808 808
809(defun display-buffer-in-side-window (buffer alist) 809(defun display-buffer-in-side-window (buffer alist)
810 "Display BUFFER in a window on side SIDE of the selected frame. 810 "Display BUFFER in a side window of the selected frame.
811ALIST is an association list of symbols and values. The 811ALIST is an association list of symbols and values. The
812following symbols can be used: 812following special symbols can be used in ALIST.
813 813
814`side' denotes the side of the existing window where the new 814`side' denotes the side of the frame where the new window shall
815 window shall be located. Valid values are `bottom', `right', 815 be located. Valid values are `bottom', `right', `top' and
816 `top' and `left'. The default is `bottom'. 816 `left'. The default is `bottom'.
817 817
818`slot' if non-nil, specifies the window slot where to display 818`slot' if non-nil, specifies the window slot where to display
819 BUFFER. A value of zero or nil means use the middle slot on 819 BUFFER. A value of zero or nil means use the middle slot on