aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2012-11-10 16:43:54 -0800
committerGlenn Morris2012-11-10 16:43:54 -0800
commit6ba6a3e51f72d00d89583b86349b918b5ff3e793 (patch)
tree99b546f6df41bd4d5e6f3ade2eaf909a16bc8faf /lisp
parent68146aa5abeb41ea6f535e6d2cad6a5211ba49e0 (diff)
downloademacs-6ba6a3e51f72d00d89583b86349b918b5ff3e793.tar.gz
emacs-6ba6a3e51f72d00d89583b86349b918b5ff3e793.zip
Fix more custom :versions
* lisp/help.el (temp-buffer-max-height): * lisp/window.el (fit-frame-to-buffer, fit-frame-to-buffer-bottom-margin): Fix :version.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/help.el2
-rw-r--r--lisp/window.el4
3 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88ecfddffb2..0207a4f903f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-11-11 Glenn Morris <rgm@gnu.org> 12012-11-11 Glenn Morris <rgm@gnu.org>
2 2
3 * help.el (temp-buffer-max-height):
4 * window.el (fit-frame-to-buffer, fit-frame-to-buffer-bottom-margin):
3 * emacs-lisp/debug.el (debugger-bury-or-kill): Fix :version. 5 * emacs-lisp/debug.el (debugger-bury-or-kill): Fix :version.
4 6
52012-11-10 Leo Liu <sdl.web@gmail.com> 72012-11-10 Leo Liu <sdl.web@gmail.com>
diff --git a/lisp/help.el b/lisp/help.el
index 449818207b3..de2a22714f9 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -979,7 +979,7 @@ buffer, and should return a positive integer. At the time the
979function is called, the window to be resized is selected." 979function is called, the window to be resized is selected."
980 :type '(choice integer function) 980 :type '(choice integer function)
981 :group 'help 981 :group 'help
982 :version "24.2") 982 :version "24.3")
983 983
984(define-minor-mode temp-buffer-resize-mode 984(define-minor-mode temp-buffer-resize-mode
985 "Toggle auto-resizing temporary buffer windows (Temp Buffer Resize Mode). 985 "Toggle auto-resizing temporary buffer windows (Temp Buffer Resize Mode).
diff --git a/lisp/window.el b/lisp/window.el
index be6ddf8ab9e..b3a66ca1dd3 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6065,7 +6065,7 @@ A frame can be resized if and only if its root window is a live
6065window. The height of the root window is subject to the values 6065window. The height of the root window is subject to the values
6066of `fit-frame-to-buffer-max-height' and `window-min-height'." 6066of `fit-frame-to-buffer-max-height' and `window-min-height'."
6067 :type 'boolean 6067 :type 'boolean
6068 :version "24.2" 6068 :version "24.3"
6069 :group 'help) 6069 :group 'help)
6070 6070
6071(defcustom fit-frame-to-buffer-bottom-margin 4 6071(defcustom fit-frame-to-buffer-bottom-margin 4
@@ -6073,7 +6073,7 @@ of `fit-frame-to-buffer-max-height' and `window-min-height'."
6073This is the number of lines `fit-frame-to-buffer' leaves free at the 6073This is the number of lines `fit-frame-to-buffer' leaves free at the
6074bottom of the display in order to not obscure the system task bar." 6074bottom of the display in order to not obscure the system task bar."
6075 :type 'integer 6075 :type 'integer
6076 :version "24.2" 6076 :version "24.3"
6077 :group 'windows) 6077 :group 'windows)
6078 6078
6079(defun fit-frame-to-buffer (&optional frame max-height min-height) 6079(defun fit-frame-to-buffer (&optional frame max-height min-height)