diff options
| author | Glenn Morris | 2009-10-10 20:50:39 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-10-10 20:50:39 +0000 |
| commit | 58ae51ae02daccb32fca268155fa82b7355bd803 (patch) | |
| tree | 11a6fcce203b5f0aa4f21eb83db90b7908af0d90 | |
| parent | d751f122b6384c3f853fde7fe274a83f113ee3ae (diff) | |
| download | emacs-58ae51ae02daccb32fca268155fa82b7355bd803.tar.gz emacs-58ae51ae02daccb32fca268155fa82b7355bd803.zip | |
(calendar-split-width-threshold): New option.
(calendar-basic-setup): Use calendar-split-width-threshold.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calendar/calendar.el | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index adfbf9cad16..ea529794c74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-10-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar/calendar.el (calendar-split-width-threshold): New option. | ||
| 4 | (calendar-basic-setup): Use calendar-split-width-threshold. | ||
| 5 | |||
| 1 | 2009-10-10 Sascha Wilde <wilde@sha-bang.de> | 6 | 2009-10-10 Sascha Wilde <wilde@sha-bang.de> |
| 2 | 7 | ||
| 3 | * cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use | 8 | * cedet/ede/proj-shared.el (ede-proj-makefile-target-name): Use |
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index ddccc529568..75fe5abc3ca 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el | |||
| @@ -163,6 +163,16 @@ three options overrides the value of `calendar-view-diary-initially-flag'." | |||
| 163 | :version "22.1" | 163 | :version "22.1" |
| 164 | :group 'calendar) | 164 | :group 'calendar) |
| 165 | 165 | ||
| 166 | ;; See discussion in bug#1806. | ||
| 167 | (defcustom calendar-split-width-threshold nil | ||
| 168 | "Value to use for `split-width-threshold' when creating a calendar. | ||
| 169 | This only affects frames wider than the default value of | ||
| 170 | `split-width-threshold'." | ||
| 171 | :type '(choice (const nil) | ||
| 172 | (integer)) | ||
| 173 | :version "23.2" | ||
| 174 | :group 'calendar) | ||
| 175 | |||
| 166 | (defcustom calendar-week-start-day 0 | 176 | (defcustom calendar-week-start-day 0 |
| 167 | "The day of the week on which a week in the calendar begins. | 177 | "The day of the week on which a week in the calendar begins. |
| 168 | 0 means Sunday (default), 1 means Monday, and so on. | 178 | 0 means Sunday (default), 1 means Monday, and so on. |
| @@ -1287,6 +1297,7 @@ display the generated calendar." | |||
| 1287 | ;; Not really needed now, but means we use exactly the same | 1297 | ;; Not really needed now, but means we use exactly the same |
| 1288 | ;; behavior as before in the non-wide case (see below). | 1298 | ;; behavior as before in the non-wide case (see below). |
| 1289 | (split-height-threshold 1000) | 1299 | (split-height-threshold 1000) |
| 1300 | (split-width-threshold calendar-split-width-threshold) | ||
| 1290 | (date (if arg (calendar-read-date t) | 1301 | (date (if arg (calendar-read-date t) |
| 1291 | (calendar-current-date))) | 1302 | (calendar-current-date))) |
| 1292 | (month (calendar-extract-month date)) | 1303 | (month (calendar-extract-month date)) |