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

[Miles Bader]

Index: emacs/lisp/calendar/cal-x.el
diff -c emacs/lisp/calendar/cal-x.el:1.13 emacs/lisp/calendar/cal-x.el:1.14
*** emacs/lisp/calendar/cal-x.el:1.13   Mon Apr 23 10:20:55 2001
--- emacs/lisp/calendar/cal-x.el        Tue Feb  4 07:49:33 2003
***************
*** 42,48 ****
  (defvar calendar-frame nil "Frame in which to display the calendar.")
  
  (defvar diary-frame nil "Frame in which to display the diary.")
!   
  ;; This should not specify the font.  That's up to the user.
  ;; Certainly it should not specify auto-lower and auto-raise
  ;; since most users won't like that.
--- 42,48 ----
  (defvar calendar-frame nil "Frame in which to display the calendar.")
  
  (defvar diary-frame nil "Frame in which to display the diary.")
! 
  ;; This should not specify the font.  That's up to the user.
  ;; Certainly it should not specify auto-lower and auto-raise
  ;; since most users won't like that.
***************
*** 51,57 ****
      (unsplittable . t) (minibuffer . nil))
    "Parameters of the diary frame, if the diary is in its own frame.
  Location and color should be set in .Xdefaults.")
!                                  
  (defvar calendar-frame-parameters
    '((name . "Calendar") (title . "Calendar") (minibuffer . nil)
      (height . 10) (width . 80) (unsplittable . t) (vertical-scroll-bars . 
nil))
--- 51,57 ----
      (unsplittable . t) (minibuffer . nil))
    "Parameters of the diary frame, if the diary is in its own frame.
  Location and color should be set in .Xdefaults.")
! 
  (defvar calendar-frame-parameters
    '((name . "Calendar") (title . "Calendar") (minibuffer . nil)
      (height . 10) (width . 80) (unsplittable . t) (vertical-scroll-bars . 
nil))
***************
*** 63,73 ****
      (minibuffer . nil))
    "Parameters of the frame that displays both the calendar and the diary.
  Location and color should be set in .Xdefaults.")
!   
  (defvar calendar-after-frame-setup-hooks nil
    "Hooks to be run just after setting up a calendar frame.
  Can be used to change frame parameters, such as font, color, location, etc.")
!   
  (defun calendar-one-frame-setup (&optional arg)
    "Start calendar and display it in a dedicated frame together with the 
diary."
    (if (not (display-multi-frame-p))
--- 63,73 ----
      (minibuffer . nil))
    "Parameters of the frame that displays both the calendar and the diary.
  Location and color should be set in .Xdefaults.")
! 
  (defvar calendar-after-frame-setup-hooks nil
    "Hooks to be run just after setting up a calendar frame.
  Can be used to change frame parameters, such as font, color, location, etc.")
! 
  (defun calendar-one-frame-setup (&optional arg)
    "Start calendar and display it in a dedicated frame together with the 
diary."
    (if (not (display-multi-frame-p))