From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 17 Jun 2008 16:33:29 +0000 (+0000)
Subject: (split-height-threshold): Remove spurious extra line.
X-Git-Tag: emacs-pretest-23.0.90~4694
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1662c19ba9560f68761fafef1d633e6439e2fa6a;p=emacs.git

(split-height-threshold): Remove spurious extra line.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e270cea3d7..d19aba13544 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-17  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (split-height-threshold): Remove spurious extra line.
+
 2008-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
diff --git a/lisp/window.el b/lisp/window.el
index ccb2e242266..4a29f45164e 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -751,7 +751,6 @@ only if it has at least as many lines.  If the value is nil,
 If the window is the only window on its frame, `display-buffer'
 can split it regardless of this value."
   :type '(choice (const nil) (number :tag "lines"))
-  :type 'number
   :version "23.1"
   :group 'windows)