[Emacs-diffs] emacs/lisp ChangeLog calendar/calendar.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/10 20:50:42

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : calendar.el 

Log message:
        (calendar-split-width-threshold): New option.
        (calendar-basic-setup): Use calendar-split-width-threshold.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16398&r2=1.16399
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.289&r2=1.290

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16398
retrieving revision 1.16399
diff -u -b -r1.16398 -r1.16399
--- ChangeLog   10 Oct 2009 19:15:50 -0000      1.16398
+++ ChangeLog   10 Oct 2009 20:50:39 -0000      1.16399
@@ -1,3 +1,8 @@
+2009-10-10  Glenn Morris  <address@hidden>
+
+       * calendar/calendar.el (calendar-split-width-threshold): New option.
+       (calendar-basic-setup): Use calendar-split-width-threshold.
+
 2009-10-10  Sascha Wilde <address@hidden>
 
        * cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -b -r1.289 -r1.290
--- calendar/calendar.el        7 Oct 2009 02:57:49 -0000       1.289
+++ calendar/calendar.el        10 Oct 2009 20:50:42 -0000      1.290
@@ -163,6 +163,16 @@
   :version "22.1"
   :group 'calendar)
 
+;; See discussion in bug#1806.
+(defcustom calendar-split-width-threshold nil
+  "Value to use for `split-width-threshold' when creating a calendar.
+This only affects frames wider than the default value of
+`split-width-threshold'."
+  :type '(choice (const nil)
+                 (integer))
+  :version "23.2"
+  :group 'calendar)
+
 (defcustom calendar-week-start-day 0
   "The day of the week on which a week in the calendar begins.
 0 means Sunday (default), 1 means Monday, and so on.
@@ -1287,6 +1297,7 @@
            ;; Not really needed now, but means we use exactly the same
            ;; behavior as before in the non-wide case (see below).
            (split-height-threshold 1000)
+           (split-width-threshold calendar-split-width-threshold)
            (date (if arg (calendar-read-date t)
                    (calendar-current-date)))
            (month (calendar-extract-month date))