[Emacs-diffs] emacs/lisp ChangeLog calendar/calendar.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/07 02:57:50

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : calendar.el 

Log message:
        (calendar-basic-setup): In the wide frame case, show the original
        buffer rather than a random one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16377&r2=1.16378
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.288&r2=1.289

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16377
retrieving revision 1.16378
diff -u -b -r1.16377 -r1.16378
--- ChangeLog   7 Oct 2009 02:52:37 -0000       1.16377
+++ ChangeLog   7 Oct 2009 02:57:46 -0000       1.16378
@@ -1,3 +1,8 @@
+2009-10-07  Glenn Morris  <address@hidden>
+
+       * calendar/calendar.el (calendar-basic-setup): In the wide frame case,
+       show the original buffer rather than a random one.
+
 2009-10-07  Markus Rost <address@hidden>
 
        * help.el (describe-no-warranty): Place point in a slightly better

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- calendar/calendar.el        6 Oct 2009 02:42:32 -0000       1.288
+++ calendar/calendar.el        7 Oct 2009 02:57:49 -0000       1.289
@@ -1280,6 +1280,7 @@
 and year, else uses the current date.  If NODISPLAY is non-nil, don't
 display the generated calendar."
   (interactive "P")
+  (let ((buff (current-buffer)))
   (set-buffer (get-buffer-create calendar-buffer))
   (calendar-mode)
   (let* ((pop-up-windows t)
@@ -1324,14 +1325,15 @@
       (when (and (not (window-dedicated-p))
                  (window-full-height-p))
         (let ((win (split-window-vertically)))
-          ;; Show something else in the upper window.
-          (switch-to-buffer (other-buffer))
+            ;; In the upper window, show whatever was visible before.
+            ;; This looks better than using other-buffer.
+            (switch-to-buffer buff)
           ;; Switch to the lower window with the calendar buffer.
           (select-window win))))
     (calendar-generate-window month year)
     (if (and calendar-view-diary-initially-flag
              (calendar-date-is-visible-p date))
-        (diary-view-entries)))
+          (diary-view-entries))))
   (if calendar-view-holidays-initially-flag
       (let* ((diary-buffer (get-file-buffer diary-file))
              (diary-window (if diary-buffer (get-buffer-window diary-buffer)))