Mercurial > emacs
comparison lisp/calendar/cal-x.el @ 90133:4da4a09e8b1b
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-31
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 206-222)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 45-52)
- Update from CVS
- Update from CVS: texi Makefile.in CVS keyw cruft
- Update from CVS: ChangeLog tweaks
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 31 Mar 2005 09:58:14 +0000 |
| parents | 68c22ea6027c 1b5d0d3282a7 |
| children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
| 90132:4080fe8b4f0f | 90133:4da4a09e8b1b |
|---|---|
| 1 ;;; cal-x.el --- calendar windows in dedicated frames in X | 1 ;;; cal-x.el --- calendar windows in dedicated frames in X |
| 2 | 2 |
| 3 ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1994, 1995, 2005 Free Software Foundation, Inc. |
| 4 | 4 |
| 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> |
| 6 ;; Edward M. Reingold <reingold@cs.uiuc.edu> | 6 ;; Edward M. Reingold <reingold@cs.uiuc.edu> |
| 7 ;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk> | |
| 7 ;; Keywords: calendar | 8 ;; Keywords: calendar |
| 8 ;; Human-Keywords: calendar, dedicated frames, X Window System | 9 ;; Human-Keywords: calendar, dedicated frames, X Window System |
| 9 | 10 |
| 10 ;; This file is part of GNU Emacs. | 11 ;; This file is part of GNU Emacs. |
| 11 | 12 |
| 86 (select-frame calendar-frame) | 87 (select-frame calendar-frame) |
| 87 (if (eq 'icon (cdr (assoc 'visibility | 88 (if (eq 'icon (cdr (assoc 'visibility |
| 88 (frame-parameters calendar-frame)))) | 89 (frame-parameters calendar-frame)))) |
| 89 (iconify-or-deiconify-frame)) | 90 (iconify-or-deiconify-frame)) |
| 90 (calendar-basic-setup arg) | 91 (calendar-basic-setup arg) |
| 91 (set-window-dedicated-p (selected-window) 'calendar) | 92 (set-window-dedicated-p (selected-window) t) |
| 92 (set-window-dedicated-p | 93 (set-window-dedicated-p |
| 93 (display-buffer | 94 (display-buffer |
| 94 (if (not (memq 'fancy-diary-display diary-display-hook)) | 95 (if (not (memq 'fancy-diary-display diary-display-hook)) |
| 95 (get-file-buffer diary-file) | 96 (get-file-buffer diary-file) |
| 96 (if (not (bufferp (get-buffer fancy-diary-buffer))) | 97 (if (not (bufferp (get-buffer fancy-diary-buffer))) |
| 97 (make-fancy-diary-buffer)) | 98 (make-fancy-diary-buffer)) |
| 98 fancy-diary-buffer)) | 99 fancy-diary-buffer)) |
| 99 'diary)))))) | 100 t)))))) |
| 100 | 101 |
| 101 (defun calendar-only-one-frame-setup (&optional arg) | 102 (defun calendar-only-one-frame-setup (&optional arg) |
| 102 "Start calendar and display it in a dedicated frame. | 103 "Start calendar and display it in a dedicated frame. |
| 103 This function requires a display capable of multiple frames, else | 104 This function requires a display capable of multiple frames, else |
| 104 `calendar-basic-setup' is used instead." | 105 `calendar-basic-setup' is used instead." |
| 115 (select-frame calendar-frame) | 116 (select-frame calendar-frame) |
| 116 (if (eq 'icon (cdr (assoc 'visibility | 117 (if (eq 'icon (cdr (assoc 'visibility |
| 117 (frame-parameters calendar-frame)))) | 118 (frame-parameters calendar-frame)))) |
| 118 (iconify-or-deiconify-frame)) | 119 (iconify-or-deiconify-frame)) |
| 119 (calendar-basic-setup arg) | 120 (calendar-basic-setup arg) |
| 120 (set-window-dedicated-p (selected-window) 'calendar)))))) | 121 (set-window-dedicated-p (selected-window) t)))))) |
| 121 | 122 |
| 122 (defun calendar-two-frame-setup (&optional arg) | 123 (defun calendar-two-frame-setup (&optional arg) |
| 123 "Start calendar and diary in separate, dedicated frames. | 124 "Start calendar and diary in separate, dedicated frames. |
| 124 This function requires a display capable of multiple frames, else | 125 This function requires a display capable of multiple frames, else |
| 125 `calendar-basic-setup' is used instead." | 126 `calendar-basic-setup' is used instead." |
| 137 (select-frame calendar-frame) | 138 (select-frame calendar-frame) |
| 138 (if (eq 'icon (cdr (assoc 'visibility | 139 (if (eq 'icon (cdr (assoc 'visibility |
| 139 (frame-parameters calendar-frame)))) | 140 (frame-parameters calendar-frame)))) |
| 140 (iconify-or-deiconify-frame)) | 141 (iconify-or-deiconify-frame)) |
| 141 (display-buffer calendar-buffer) | 142 (display-buffer calendar-buffer) |
| 142 (set-window-dedicated-p (selected-window) 'calendar) | 143 (set-window-dedicated-p (selected-window) t) |
| 143 (setq diary-frame (make-frame diary-frame-parameters)) | 144 (setq diary-frame (make-frame diary-frame-parameters)) |
| 144 (run-hooks 'calendar-after-frame-setup-hooks) | 145 (run-hooks 'calendar-after-frame-setup-hooks) |
| 145 (select-frame diary-frame) | 146 (select-frame diary-frame) |
| 146 (if (eq 'icon (cdr (assoc 'visibility | 147 (if (eq 'icon (cdr (assoc 'visibility |
| 147 (frame-parameters diary-frame)))) | 148 (frame-parameters diary-frame)))) |
| 152 (if (not (memq 'fancy-diary-display diary-display-hook)) | 153 (if (not (memq 'fancy-diary-display diary-display-hook)) |
| 153 (get-file-buffer diary-file) | 154 (get-file-buffer diary-file) |
| 154 (if (not (bufferp (get-buffer fancy-diary-buffer))) | 155 (if (not (bufferp (get-buffer fancy-diary-buffer))) |
| 155 (make-fancy-diary-buffer)) | 156 (make-fancy-diary-buffer)) |
| 156 fancy-diary-buffer)) | 157 fancy-diary-buffer)) |
| 157 'diary))))) | 158 t))))) |
| 158 | 159 |
| 159 ;; Formerly (get-file-buffer diary-file) was added to the list here, | 160 ;; Formerly (get-file-buffer diary-file) was added to the list here, |
| 160 ;; but that isn't clean, and the value could even be nil. | 161 ;; but that isn't clean, and the value could even be nil. |
| 161 (setq special-display-buffer-names | 162 (setq special-display-buffer-names |
| 162 (append special-display-buffer-names | 163 (append special-display-buffer-names |