aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2012-04-30 11:09:26 +0200
committerMartin Rudalics2012-04-30 11:09:26 +0200
commitd9558cadd46d652dc619a9340f751b217b988609 (patch)
tree8a93a371abe391061fdfd7380ca8c6ceddc89d98
parenta017d05f06b13add0164d6b3de9d96e2bad6d292 (diff)
downloademacs-d9558cadd46d652dc619a9340f751b217b988609.tar.gz
emacs-d9558cadd46d652dc619a9340f751b217b988609.zip
Fix entry in display-buffer--action-function-custom-type
-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 3b16a4c575a..eb1f5d22829 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-04-30 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (display-buffer--action-function-custom-type): Fix
4 entry.
5
12012-04-27 Alan Mackenzie <acm@muc.de> 62012-04-27 Alan Mackenzie <acm@muc.de>
2 7
3 * progmodes/cc-defs.el (c-version): Update to 5.32.3. 8 * progmodes/cc-defs.el (c-version): Update to 5.32.3.
diff --git a/lisp/window.el b/lisp/window.el
index 7abe3fbfe7f..49f84960078 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4607,7 +4607,7 @@ The actual non-nil value of this variable will be copied to the
4607 '(choice :tag "Function" 4607 '(choice :tag "Function"
4608 (const :tag "--" ignore) ; default for insertion 4608 (const :tag "--" ignore) ; default for insertion
4609 (const display-buffer-reuse-window) 4609 (const display-buffer-reuse-window)
4610 (const display-buffer-use-some-window) 4610 (const display-buffer-pop-up-window)
4611 (const display-buffer-same-window) 4611 (const display-buffer-same-window)
4612 (const display-buffer-pop-up-frame) 4612 (const display-buffer-pop-up-frame)
4613 (const display-buffer-use-some-window) 4613 (const display-buffer-use-some-window)