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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/07 01:59:37

Index: cal-x.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-x.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- cal-x.el    6 Apr 2008 20:53:45 -0000       1.41
+++ cal-x.el    7 Apr 2008 01:59:36 -0000       1.42
@@ -100,10 +100,10 @@
         (get-file-buffer diary-file)
       ;; If there are no diary entries, there won't be a fancy-diary
       ;; to dedicate, so make a basic one.
-      (or (get-buffer fancy-diary-buffer)
-          (calendar-in-read-only-buffer fancy-diary-buffer
+      (or (get-buffer diary-fancy-buffer)
+          (calendar-in-read-only-buffer diary-fancy-buffer
             (calendar-set-mode-line "Diary Entries")))
-      fancy-diary-buffer))
+      diary-fancy-buffer))
    t))
 
 ;;;###cal-autoload
@@ -124,7 +124,7 @@
     (if (frame-live-p calendar-frame) (delete-frame calendar-frame))
     (unless (eq config 'calendar-only)
       (if (frame-live-p diary-frame) (delete-frame diary-frame)))
-    (let ((view-diary-entries-initially (eq config 'one-frame))
+    (let ((calendar-view-diary-initially-flag (eq config 'one-frame))
           ;; For calendar-dedicate-diary in two-frames case.
           (pop-up-windows nil))
       (save-window-excursion