diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-08-22 16:02:16 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-08-22 16:02:16 -0400 |
| commit | b0126eac41487b9bca5af5cbb2212ff5b2c58b80 (patch) | |
| tree | 680ba932d259776ebfdb6d424fa8f668e1001f7c /lisp/calendar | |
| parent | b613941ba003bbf5024415ac4f8c2a0e12434751 (diff) | |
| parent | bc7d7ea63ba9d98b3ecc3b6decf4392a651dcbfb (diff) | |
| download | emacs-b0126eac41487b9bca5af5cbb2212ff5b2c58b80.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 8fb464aa7e6..39354bd31e3 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -383,14 +383,14 @@ The format of the header is specified by `diary-header-line-format'." "Some text is hidden - press \"s\" in calendar \ before edit/copy" "Diary")) - ?\s (frame-width))) + ?\s (window-width))) "Format of the header line displayed by `diary-simple-display'. Only used if `diary-header-line-flag' is non-nil." :group 'diary :type 'sexp :initialize 'custom-initialize-default :set 'diary-set-header - :version "22.1") + :version "23.3") ; frame-width -> window-width ;; The first version of this also checked for diary-selective-display ;; in the non-fancy case. This was an attempt to distinguish between |