Mercurial > emacs
annotate lisp/calendar/cal-x.el @ 108906:387729300909
Synch with Gnus trunk.
2010-06-07 Teodor Zlatanov <tzz@lifelogs.com>
* gnus.texi (Interactive): Explain effect of gnus-expert-user better.
2010-06-07 Teemu Likonen <tlikonen@iki.fi> (tiny change)
* gnus-agent.el (gnus-agent-expire-unagentized-dirs): Don't ask about
deleting unused directories when gnus-expert-user is t.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Mon, 07 Jun 2010 23:01:34 +0000 |
parents | 1d1d5d9bd884 |
children | 280c8ae2476d 376148b31b5e |
rev | line source |
---|---|
93483
a4a2b2f63116
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93226
diff
changeset
|
1 ;;; cal-x.el --- calendar windows in dedicated frames |
10088 | 2 |
92623
fce91e69b8d6
(calendar-frame-parameters, calendar-and-diary-frame-parameters): Fix
Glenn Morris <rgm@gnu.org>
parents:
92605
diff
changeset
|
3 ;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
10088 | 5 |
6 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
92857 | 7 ;; Edward M. Reingold <reingold@cs.uiuc.edu> |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
64085
diff
changeset
|
8 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
10088 | 9 ;; Keywords: calendar |
93483
a4a2b2f63116
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93226
diff
changeset
|
10 ;; Human-Keywords: calendar, dedicated frames |
10088 | 11 |
12 ;; This file is part of GNU Emacs. | |
13 | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94021
diff
changeset
|
14 ;; GNU Emacs is free software: you can redistribute it and/or modify |
10088 | 15 ;; it under the terms of the GNU General Public License as published by |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94021
diff
changeset
|
16 ;; the Free Software Foundation, either version 3 of the License, or |
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94021
diff
changeset
|
17 ;; (at your option) any later version. |
10088 | 18 |
19 ;; GNU Emacs is distributed in the hope that it will be useful, | |
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 ;; GNU General Public License for more details. | |
23 | |
24 ;; You should have received a copy of the GNU General Public License | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94021
diff
changeset
|
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
10088 | 26 |
27 ;;; Commentary: | |
28 | |
93483
a4a2b2f63116
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93226
diff
changeset
|
29 ;; See calendar.el. |
10088 | 30 |
31 ;;; Code: | |
32 | |
13441 | 33 (require 'calendar) |
34 | |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
35 (defcustom diary-frame-parameters |
23552
905aab3037e8
Add title parameters to frames.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22262
diff
changeset
|
36 '((name . "Diary") (title . "Diary") (height . 10) (width . 80) |
905aab3037e8
Add title parameters to frames.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22262
diff
changeset
|
37 (unsplittable . t) (minibuffer . nil)) |
10088 | 38 "Parameters of the diary frame, if the diary is in its own frame. |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
39 Relevant if `calendar-setup' has the value `two-frames'." |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
40 :type 'alist |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
41 :options '((name string) (title string) (height integer) (width integer) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
42 (unsplittable boolean) (minibuffer boolean) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
43 (vertical-scroll-bars boolean)) |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
44 :group 'calendar) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37431
diff
changeset
|
45 |
92623
fce91e69b8d6
(calendar-frame-parameters, calendar-and-diary-frame-parameters): Fix
Glenn Morris <rgm@gnu.org>
parents:
92605
diff
changeset
|
46 (defcustom calendar-frame-parameters |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
47 '((name . "Calendar") (title . "Calendar") (height . 10) (width . 80) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
48 (unsplittable . t) (minibuffer . nil) (vertical-scroll-bars . nil)) |
10088 | 49 "Parameters of the calendar frame, if the calendar is in a separate frame. |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
50 Relevant if `calendar-setup' has the value `calendar-only' or `two-frames'." |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
51 :type 'alist |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
52 :options '((name string) (title string) (height integer) (width integer) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
53 (unsplittable boolean) (minibuffer boolean) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
54 (vertical-scroll-bars boolean)) |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
55 :group 'calendar) |
10088 | 56 |
92623
fce91e69b8d6
(calendar-frame-parameters, calendar-and-diary-frame-parameters): Fix
Glenn Morris <rgm@gnu.org>
parents:
92605
diff
changeset
|
57 (defcustom calendar-and-diary-frame-parameters |
23552
905aab3037e8
Add title parameters to frames.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22262
diff
changeset
|
58 '((name . "Calendar") (title . "Calendar") (height . 28) (width . 80) |
905aab3037e8
Add title parameters to frames.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22262
diff
changeset
|
59 (minibuffer . nil)) |
10088 | 60 "Parameters of the frame that displays both the calendar and the diary. |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
61 Relevant if `calendar-setup' has the value `one-frame'." |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
62 :type 'alist |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
63 :options '((name string) (title string) (height integer) (width integer) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
64 (unsplittable boolean) (minibuffer boolean) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
65 (vertical-scroll-bars boolean)) |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
66 :group 'calendar) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37431
diff
changeset
|
67 |
94021
ae1387262a67
Move non-autoloaded define-obsolete-variable-alias calls for
Glenn Morris <rgm@gnu.org>
parents:
93949
diff
changeset
|
68 (define-obsolete-variable-alias 'calendar-after-frame-setup-hooks |
ae1387262a67
Move non-autoloaded define-obsolete-variable-alias calls for
Glenn Morris <rgm@gnu.org>
parents:
93949
diff
changeset
|
69 'calendar-after-frame-setup-hook "23.1") |
ae1387262a67
Move non-autoloaded define-obsolete-variable-alias calls for
Glenn Morris <rgm@gnu.org>
parents:
93949
diff
changeset
|
70 |
93226
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
71 (defcustom calendar-after-frame-setup-hook nil |
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
72 "List of functions to be run after creating a calendar and/or diary frame." |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
73 :type 'hook |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
74 :group 'calendar-hooks) |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
75 |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
76 ;;; End of user options. |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
77 |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
78 (defvar calendar-frame nil |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
79 "Frame in which the calendar was last displayed.") |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
80 |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
81 (defvar diary-frame nil |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
82 "Frame in which the diary was last displayed.") |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
83 |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
84 (defun calendar-frame-1 (frame) |
93226
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
85 "Subroutine used by `calendar-frame-setup'. |
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
86 Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed." |
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
87 (run-hooks 'calendar-after-frame-setup-hook) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
88 (select-frame frame) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
89 (if (eq 'icon (cdr (assoc 'visibility (frame-parameters frame)))) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
90 (iconify-or-deiconify-frame))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37431
diff
changeset
|
91 |
93949
1f90229f007f
(diary-display-hook): Declare for compiler.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
92 ;; c-d-d is only called after (diary) has been run. |
95412
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
93 (defvar diary-display-function) |
93949
1f90229f007f
(diary-display-hook): Declare for compiler.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
94 |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
95 (defun calendar-dedicate-diary () |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
96 "Display and dedicate the window associated with the diary buffer." |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
97 (set-window-dedicated-p |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
98 (display-buffer |
95412
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
99 (if (if (listp diary-display-function) |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
100 (or (memq 'diary-fancy-display diary-display-function) |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
101 (memq 'fancy-diary-display diary-display-function)) |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
102 (memq diary-display-function '(diary-fancy-display |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
103 fancy-diary-display))) |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
104 (progn |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
105 ;; If there are no diary entries, there won't be a fancy-diary |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
106 ;; to dedicate, so make a basic one. |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
107 (or (get-buffer diary-fancy-buffer) |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
108 (calendar-in-read-only-buffer diary-fancy-buffer |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
109 (calendar-set-mode-line "Diary Entries"))) |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
110 diary-fancy-buffer) |
f8723a1032ed
(calendar-dedicate-diary): Update for diary-display-function replacing
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
111 (get-file-buffer diary-file))) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
112 t)) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
113 |
92839
2daf404f568f
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92821
diff
changeset
|
114 ;;;###cal-autoload |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
115 (defun calendar-frame-setup (config &optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
116 "Display the calendar, and optionally the diary, in a separate frame. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
117 CONFIG should be one of: |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
118 `calendar-only' - just the calendar, no diary |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
119 `one-frame' - calendar and diary in a single frame |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
120 `two-frames' - calendar and diary each in a separate frame |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
121 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
122 If CONFIG has any other value, or if the display is not capable of |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
123 multiple frames, then `calendar-basic-setup' is called. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
124 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
125 If PROMPT is non-nil, prompt for the month and year to use." |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
126 (if (not (and (display-multi-frame-p) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
127 (memq config '(calendar-only one-frame two-frames)))) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
128 (calendar-basic-setup prompt) |
10088 | 129 (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
130 (unless (eq config 'calendar-only) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
131 (if (frame-live-p diary-frame) (delete-frame diary-frame))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93792
diff
changeset
|
132 (let ((calendar-view-diary-initially-flag (eq config 'one-frame)) |
93193 | 133 ;; For calendar-dedicate-diary in two-frames case. |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
134 (pop-up-windows nil)) |
10088 | 135 (save-window-excursion |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
136 ;; Do diary first so that calendar is always left current. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
137 (when (eq config 'two-frames) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
138 (calendar-frame-1 |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
139 (setq diary-frame (make-frame diary-frame-parameters))) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
140 (diary) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
141 (calendar-dedicate-diary)) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
142 (calendar-frame-1 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
143 (setq calendar-frame |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
144 (make-frame (if (eq config 'one-frame) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
145 calendar-and-diary-frame-parameters |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
146 calendar-frame-parameters)))) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
147 (calendar-basic-setup prompt (not (eq config 'one-frame))) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
148 (set-window-buffer (selected-window) calendar-buffer) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
149 (set-window-dedicated-p (selected-window) t) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
150 (if (eq config 'one-frame) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
151 (calendar-dedicate-diary)))))) |
12060
b163768a998f
Fix cal-x.el to create an empty fancy-diary-buffer, if needed.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
12049
diff
changeset
|
152 |
24890
5f37b93c8538
(calendar-only-one-frame-setup): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24860
diff
changeset
|
153 |
92839
2daf404f568f
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92821
diff
changeset
|
154 ;;;###cal-autoload |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
155 (defun calendar-one-frame-setup (&optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
156 "Display calendar and diary in a single dedicated frame. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
157 See `calendar-frame-setup' for more information." |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
158 (calendar-frame-setup 'one-frame prompt)) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
159 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
160 (make-obsolete 'calendar-one-frame-setup 'calendar-frame-setup "23.1") |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
161 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
162 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
163 ;;;###cal-autoload |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
164 (defun calendar-only-one-frame-setup (&optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
165 "Display calendar in a dedicated frame. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
166 See `calendar-frame-setup' for more information." |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
167 (calendar-frame-setup 'calendar-only prompt)) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
168 |
93193 | 169 (make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1") |
10088 | 170 |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
171 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
172 ;;;###cal-autoload |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
173 (defun calendar-two-frame-setup (&optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
174 "Display calendar and diary in separate, dedicated frames. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
175 See `calendar-frame-setup' for more information." |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
176 (calendar-frame-setup 'two-frames prompt)) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
177 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
178 (make-obsolete 'calendar-two-frame-setup 'calendar-frame-setup "23.1") |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
179 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
180 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
181 ;; Undocumented and probably useless. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
182 (defvar cal-x-load-hook nil |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
183 "Hook run on loading of the `cal-x' package.") |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
184 (make-obsolete-variable 'cal-x-load-hook "it will be removed in future." "23.1") |
10088 | 185 |
186 (run-hooks 'cal-x-load-hook) | |
187 | |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
188 |
10088 | 189 (provide 'cal-x) |
190 | |
82116
f8b17fd6cf74
Trivial comment style change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77279
diff
changeset
|
191 ;; arch-tag: c6dbddca-ae84-442d-87fc-244b76e38e17 |
10088 | 192 ;;; cal-x.el ends here |