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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e270cea3d7d37c9ab9e9b93311a9c11da569188..d19aba135442ddc4b826090e40eddb8ca8da60bf 100644 (file)
--- 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 ccb2e2422668da07e8a95c1f1d016b5586724586..4a29f45164ec36b30f831bbb20a250152e12f815 100644 (file)
--- 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)