[Emacs-diffs] Changes to emacs/lisp/calendar/cal-x.el

[Glenn Morris]

Index: emacs/lisp/calendar/cal-x.el
diff -c emacs/lisp/calendar/cal-x.el:1.16 emacs/lisp/calendar/cal-x.el:1.17
*** emacs/lisp/calendar/cal-x.el:1.16   Sun Jan 11 22:25:58 2004
--- emacs/lisp/calendar/cal-x.el        Wed Mar 30 15:18:52 2005
***************
*** 1,9 ****
  ;;; cal-x.el --- calendar windows in dedicated frames in X
  
! ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
  
  ;; Author: Michael Kifer <address@hidden>
  ;;      Edward M. Reingold <address@hidden>
  ;; Keywords: calendar
  ;; Human-Keywords: calendar, dedicated frames, X Window System
  
--- 1,10 ----
  ;;; cal-x.el --- calendar windows in dedicated frames in X
  
! ;; Copyright (C) 1994, 1995, 2005  Free Software Foundation, Inc.
  
  ;; Author: Michael Kifer <address@hidden>
  ;;      Edward M. Reingold <address@hidden>
+ ;; Maintainer: Glenn Morris <address@hidden>
  ;; Keywords: calendar
  ;; Human-Keywords: calendar, dedicated frames, X Window System
  
***************
*** 88,94 ****
                                       (frame-parameters calendar-frame))))
                (iconify-or-deiconify-frame))
            (calendar-basic-setup arg)
!           (set-window-dedicated-p (selected-window) 'calendar)
            (set-window-dedicated-p
             (display-buffer
              (if (not (memq 'fancy-diary-display diary-display-hook))
--- 89,95 ----
                                       (frame-parameters calendar-frame))))
                (iconify-or-deiconify-frame))
            (calendar-basic-setup arg)
!           (set-window-dedicated-p (selected-window) t)
            (set-window-dedicated-p
             (display-buffer
              (if (not (memq 'fancy-diary-display diary-display-hook))
***************
*** 96,102 ****
                (if (not (bufferp (get-buffer fancy-diary-buffer)))
                    (make-fancy-diary-buffer))
                fancy-diary-buffer))
!            'diary))))))
  
  (defun calendar-only-one-frame-setup (&optional arg)
    "Start calendar and display it in a dedicated frame.
--- 97,103 ----
                (if (not (bufferp (get-buffer fancy-diary-buffer)))
                    (make-fancy-diary-buffer))
                fancy-diary-buffer))
!            t))))))
  
  (defun calendar-only-one-frame-setup (&optional arg)
    "Start calendar and display it in a dedicated frame.
***************
*** 117,123 ****
                                       (frame-parameters calendar-frame))))
                (iconify-or-deiconify-frame))
            (calendar-basic-setup arg)
!           (set-window-dedicated-p (selected-window) 'calendar))))))
  
  (defun calendar-two-frame-setup (&optional arg)
    "Start calendar and diary in separate, dedicated frames.
--- 118,124 ----
                                       (frame-parameters calendar-frame))))
                (iconify-or-deiconify-frame))
            (calendar-basic-setup arg)
!           (set-window-dedicated-p (selected-window) t))))))
  
  (defun calendar-two-frame-setup (&optional arg)
    "Start calendar and diary in separate, dedicated frames.
***************
*** 139,145 ****
                                    (frame-parameters calendar-frame))))
              (iconify-or-deiconify-frame))
          (display-buffer calendar-buffer)
!         (set-window-dedicated-p (selected-window) 'calendar)
          (setq diary-frame (make-frame diary-frame-parameters))
          (run-hooks 'calendar-after-frame-setup-hooks)
          (select-frame diary-frame)
--- 140,146 ----
                                    (frame-parameters calendar-frame))))
              (iconify-or-deiconify-frame))
          (display-buffer calendar-buffer)
!         (set-window-dedicated-p (selected-window) t)
          (setq diary-frame (make-frame diary-frame-parameters))
          (run-hooks 'calendar-after-frame-setup-hooks)
          (select-frame diary-frame)
***************
*** 154,160 ****
              (if (not (bufferp (get-buffer fancy-diary-buffer)))
                  (make-fancy-diary-buffer))
              fancy-diary-buffer))
!          'diary)))))
  
  ;; Formerly (get-file-buffer diary-file) was added to the list here,
  ;; but that isn't clean, and the value could even be nil.
--- 155,161 ----
              (if (not (bufferp (get-buffer fancy-diary-buffer)))
                  (make-fancy-diary-buffer))
              fancy-diary-buffer))
!          t)))))
  
  ;; Formerly (get-file-buffer diary-file) was added to the list here,
  ;; but that isn't clean, and the value could even be nil.