Mercurial > emacs
annotate lisp/calendar/cal-x.el @ 93710:07af23654bc8
(autoload-ensure-default-file): Provide a feature.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 05 Apr 2008 18:51:12 +0000 |
parents | 1471197c1a94 |
children | 1715d8011340 |
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, |
fce91e69b8d6
(calendar-frame-parameters, calendar-and-diary-frame-parameters): Fix
Glenn Morris <rgm@gnu.org>
parents:
92605
diff
changeset
|
4 ;; 2008 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 | |
14 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
15 ;; it under the terms of the GNU General Public License as published by | |
78216
93e11478c954
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
16 ;; the Free Software Foundation; either version 3, or (at your option) |
10088 | 17 ;; any later version. |
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 | |
14169 | 25 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 26 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
27 ;; Boston, MA 02110-1301, USA. | |
10088 | 28 |
29 ;;; Commentary: | |
30 | |
93483
a4a2b2f63116
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93226
diff
changeset
|
31 ;; See calendar.el. |
10088 | 32 |
33 ;;; Code: | |
34 | |
13441 | 35 (require 'calendar) |
36 | |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
37 (defcustom diary-frame-parameters |
23552
905aab3037e8
Add title parameters to frames.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22262
diff
changeset
|
38 '((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
|
39 (unsplittable . t) (minibuffer . nil)) |
10088 | 40 "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
|
41 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
|
42 :type 'alist |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
43 :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
|
44 (unsplittable boolean) (minibuffer boolean) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
45 (vertical-scroll-bars boolean)) |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
46 :group 'calendar) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37431
diff
changeset
|
47 |
92623
fce91e69b8d6
(calendar-frame-parameters, calendar-and-diary-frame-parameters): Fix
Glenn Morris <rgm@gnu.org>
parents:
92605
diff
changeset
|
48 (defcustom calendar-frame-parameters |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
49 '((name . "Calendar") (title . "Calendar") (height . 10) (width . 80) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
50 (unsplittable . t) (minibuffer . nil) (vertical-scroll-bars . nil)) |
10088 | 51 "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
|
52 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
|
53 :type 'alist |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
54 :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
|
55 (unsplittable boolean) (minibuffer boolean) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
56 (vertical-scroll-bars boolean)) |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
57 :group 'calendar) |
10088 | 58 |
92623
fce91e69b8d6
(calendar-frame-parameters, calendar-and-diary-frame-parameters): Fix
Glenn Morris <rgm@gnu.org>
parents:
92605
diff
changeset
|
59 (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
|
60 '((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
|
61 (minibuffer . nil)) |
10088 | 62 "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
|
63 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
|
64 :type 'alist |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
65 :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
|
66 (unsplittable boolean) (minibuffer boolean) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
67 (vertical-scroll-bars boolean)) |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
68 :group 'calendar) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37431
diff
changeset
|
69 |
93226
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
70 (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
|
71 "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
|
72 :type 'hook |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
73 :group 'calendar-hooks) |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
74 |
93226
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
75 (define-obsolete-variable-alias 'calendar-after-frame-setup-hooks |
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
76 'calendar-after-frame-setup-hook "23.1") |
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
77 |
92605
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
78 ;;; End of user options. |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
79 |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
80 (defvar calendar-frame nil |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
81 "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
|
82 |
5fb3b5d72071
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92593
diff
changeset
|
83 (defvar diary-frame nil |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
84 "Frame in which the diary was last displayed.") |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
85 |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
86 (defun calendar-frame-1 (frame) |
93226
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
87 "Subroutine used by `calendar-frame-setup'. |
41e41843fac2
(calendar-after-frame-setup-hook): New name for
Glenn Morris <rgm@gnu.org>
parents:
93193
diff
changeset
|
88 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
|
89 (run-hooks 'calendar-after-frame-setup-hook) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
90 (select-frame frame) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
91 (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
|
92 (iconify-or-deiconify-frame))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37431
diff
changeset
|
93 |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
94 (defun calendar-dedicate-diary () |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
95 "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
|
96 (set-window-dedicated-p |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
97 (display-buffer |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
98 (if (not (memq 'fancy-diary-display diary-display-hook)) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
99 (get-file-buffer diary-file) |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
100 ;; If there are no diary entries, there won't be a fancy-diary |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
101 ;; to dedicate, so make a basic one. |
93709
1471197c1a94
(calendar-dedicate-diary): Use get-buffer rather than buffer-live-p.
Glenn Morris <rgm@gnu.org>
parents:
93483
diff
changeset
|
102 (or (get-buffer fancy-diary-buffer) |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
103 (calendar-in-read-only-buffer fancy-diary-buffer |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
104 (calendar-set-mode-line "Diary Entries"))) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
105 fancy-diary-buffer)) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
106 t)) |
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
107 |
92839
2daf404f568f
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92821
diff
changeset
|
108 ;;;###cal-autoload |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
109 (defun calendar-frame-setup (config &optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
110 "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
|
111 CONFIG should be one of: |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
112 `calendar-only' - just the calendar, no diary |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
113 `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
|
114 `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
|
115 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
116 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
|
117 multiple frames, then `calendar-basic-setup' is called. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
118 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
119 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
|
120 (if (not (and (display-multi-frame-p) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
121 (memq config '(calendar-only one-frame two-frames)))) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
122 (calendar-basic-setup prompt) |
10088 | 123 (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
|
124 (unless (eq config 'calendar-only) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
125 (if (frame-live-p diary-frame) (delete-frame diary-frame))) |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
126 (let ((view-diary-entries-initially (eq config 'one-frame)) |
93193 | 127 ;; 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
|
128 (pop-up-windows nil)) |
10088 | 129 (save-window-excursion |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
130 ;; 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
|
131 (when (eq config 'two-frames) |
93028
531ac371602f
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
92857
diff
changeset
|
132 (calendar-frame-1 |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
133 (setq diary-frame (make-frame diary-frame-parameters))) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
134 (diary) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
135 (calendar-dedicate-diary)) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
136 (calendar-frame-1 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
137 (setq calendar-frame |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
138 (make-frame (if (eq config 'one-frame) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
139 calendar-and-diary-frame-parameters |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
140 calendar-frame-parameters)))) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
141 (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
|
142 (set-window-buffer (selected-window) calendar-buffer) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
143 (set-window-dedicated-p (selected-window) t) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
144 (if (eq config 'one-frame) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
145 (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
|
146 |
24890
5f37b93c8538
(calendar-only-one-frame-setup): New function.
Karl Heuer <kwzh@gnu.org>
parents:
24860
diff
changeset
|
147 |
92839
2daf404f568f
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92821
diff
changeset
|
148 ;;;###cal-autoload |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
149 (defun calendar-one-frame-setup (&optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
150 "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
|
151 See `calendar-frame-setup' for more information." |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
152 (calendar-frame-setup 'one-frame prompt)) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
153 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
154 (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
|
155 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
156 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
157 ;;;###cal-autoload |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
158 (defun calendar-only-one-frame-setup (&optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
159 "Display calendar in a dedicated frame. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
160 See `calendar-frame-setup' for more information." |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
161 (calendar-frame-setup 'calendar-only prompt)) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
162 |
93193 | 163 (make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1") |
10088 | 164 |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
165 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
166 ;;;###cal-autoload |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
167 (defun calendar-two-frame-setup (&optional prompt) |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
168 "Display calendar and diary in separate, dedicated frames. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
169 See `calendar-frame-setup' for more information." |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
170 (calendar-frame-setup 'two-frames prompt)) |
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 (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
|
173 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
174 |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
175 ;; Undocumented and probably useless. |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
176 (defvar cal-x-load-hook nil |
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
177 "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
|
178 (make-obsolete-variable 'cal-x-load-hook "it will be removed in future." "23.1") |
10088 | 179 |
180 (run-hooks 'cal-x-load-hook) | |
181 | |
93188
bb7e96e383ab
(diary-frame-parameters, calendar-frame-parameters)
Glenn Morris <rgm@gnu.org>
parents:
93028
diff
changeset
|
182 |
10088 | 183 (provide 'cal-x) |
184 | |
82116
f8b17fd6cf74
Trivial comment style change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77279
diff
changeset
|
185 ;; arch-tag: c6dbddca-ae84-442d-87fc-244b76e38e17 |
10088 | 186 ;;; cal-x.el ends here |