aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorBastien Guerry2012-08-13 16:05:24 +0200
committerBastien Guerry2012-08-13 16:05:24 +0200
commit31cd32c9053ae6dc25281b031563ed38b7ef25f2 (patch)
treeb8188fad0af0b5be81503248bc07f9af9f4f87ac /lisp
parent31e54db06aefd333f9f69d1ad2c3f01868e60db4 (diff)
downloademacs-31cd32c9053ae6dc25281b031563ed38b7ef25f2.tar.gz
emacs-31cd32c9053ae6dc25281b031563ed38b7ef25f2.zip
window.el: Minor dosctring enhancement (Bug#12172).
* window.el (special-display-popup-frame): Minor docstring enhancement. (Bug#12172)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46c534d2454..5880b4da9aa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-08-13 Bastien Guerry <bzg@gnu.org>
2
3 * window.el (special-display-popup-frame): Small docstring
4 enhancement. (Bug#12172)
5
12012-08-13 Andreas Schwab <schwab@linux-m68k.org> 62012-08-13 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * tar-mode.el (tar-header-data-end): Only ignore size for files of 8 * tar-mode.el (tar-header-data-end): Only ignore size for files of
diff --git a/lisp/window.el b/lisp/window.el
index 9006a5c3cc9..5682e7e909a 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4238,7 +4238,7 @@ These supersede the values given in `default-frame-alist'."
4238 :group 'frames) 4238 :group 'frames)
4239 4239
4240(defun special-display-popup-frame (buffer &optional args) 4240(defun special-display-popup-frame (buffer &optional args)
4241 "Display BUFFER and return the window chosen. 4241 "Pop up a frame displaying BUFFER and return its window.
4242If BUFFER is already displayed in a visible or iconified frame, 4242If BUFFER is already displayed in a visible or iconified frame,
4243raise that frame. Otherwise, display BUFFER in a new frame. 4243raise that frame. Otherwise, display BUFFER in a new frame.
4244 4244