aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-09-26 16:11:18 +0200
committerJuanma Barranquero2012-09-26 16:11:18 +0200
commit42019c2e0c40c467250e7d73bed446b2bb19f287 (patch)
tree1bf5b8817902f42522c23f5fc893fa2863a93974
parentfb39b937b0628f4592b07d0aa61a41cf696abd30 (diff)
downloademacs-42019c2e0c40c467250e7d73bed446b2bb19f287.tar.gz
emacs-42019c2e0c40c467250e7d73bed446b2bb19f287.zip
lisp/window.el (temp-buffer-window-setup): Fix typo in docstring.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/window.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2168a33398..c69f8bc870b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-09-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * window.el (temp-buffer-window-setup): Fix typo in docstring.
4
12012-09-25 Wilson Snyder <wsnyder@wsnyder.org> 52012-09-25 Wilson Snyder <wsnyder@wsnyder.org>
2 6
3 * verilog-mode.el (verilog-auto-ascii-enum, verilog-auto-inout) 7 * verilog-mode.el (verilog-auto-ascii-enum, verilog-auto-inout)
diff --git a/lisp/window.el b/lisp/window.el
index 68f1370e9d1..b978eacc0be 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -84,7 +84,7 @@ This hook is run by `with-temp-buffer-window' with the buffer
84displayed and current and its window selected.") 84displayed and current and its window selected.")
85 85
86(defun temp-buffer-window-setup (buffer-or-name) 86(defun temp-buffer-window-setup (buffer-or-name)
87 "Set up temporary buffer specified by BUFFER-OR-NAME 87 "Set up temporary buffer specified by BUFFER-OR-NAME.
88Return the buffer." 88Return the buffer."
89 (let ((old-dir default-directory) 89 (let ((old-dir default-directory)
90 (buffer (get-buffer-create buffer-or-name))) 90 (buffer (get-buffer-create buffer-or-name)))
@@ -903,7 +903,7 @@ of all windows on FRAME to nil."
903 (if right (throw 'reset t) (setq right t))) 903 (if right (throw 'reset t) (setq right t)))
904 ((eq side 'bottom) 904 ((eq side 'bottom)
905 (if bottom (throw 'reset t) (setq bottom t))) 905 (if bottom (throw 'reset t) (setq bottom t)))
906 (t 906 (t
907 (throw 'reset t)))) 907 (throw 'reset t))))
908 frame t)) 908 frame t))
909 ;; If there's a side window, there must be at least one 909 ;; If there's a side window, there must be at least one