[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100043: Minor appt-check fix.

[Glenn Morris]

------------------------------------------------------------
revno: 100043
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-09-14 19:46:00 -0700
message:
  Minor appt-check fix.
  * lisp/calendar/appt.el (appt-check): Rather than showing the diary,
  just turn off invisible display, and only if needed.
modified:
  lisp/ChangeLog
  lisp/calendar/appt.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-15 02:34:39 +0000
+++ b/lisp/ChangeLog    2010-09-15 02:46:00 +0000
@@ -1,5 +1,8 @@
 2010-09-15  Glenn Morris  <address@hidden>
 
+       * calendar/appt.el (appt-check): Rather than showing the diary,
+       just turn off invisible display, and only if needed.
+
        * calendar/diary-lib.el (diary-list-entries): Doc fix.  (Bug#7019)
 
 2010-09-14  Stefan Monnier  <address@hidden>

=== modified file 'lisp/calendar/appt.el'
--- a/lisp/calendar/appt.el     2010-09-14 07:21:03 +0000
+++ b/lisp/calendar/appt.el     2010-09-15 02:46:00 +0000
@@ -345,17 +345,27 @@
                          (selective
                           (if d-buff    ; diary buffer exists
                               (with-current-buffer d-buff
-                                diary-selective-display))))
+                                diary-selective-display)))
+                         d-buff2)
                     ;; FIXME why not using diary-list-entries with
                     ;; non-nil LIST-ONLY?
                     (diary)
                     ;; If the diary buffer existed before this command,
                     ;; restore its display state.  Otherwise, kill it.
-                    (if d-buff
-                        ;; Displays the diary buffer.
-                        (or selective (diary-show-all-entries))
-                      (and (setq d-buff (find-buffer-visiting diary-file))
-                           (kill-buffer d-buff)))))
+                    (and (setq d-buff2 (find-buffer-visiting diary-file))
+                         (if d-buff
+                             (or selective
+                                 (with-current-buffer d-buff2
+                                   (if diary-selective-display
+                                       ;; diary-show-all-entries displays
+                                       ;; the diary buffer.
+                                       (diary-unhide-everything))))
+                           ;; FIXME does not kill any included diary files.
+                           ;; The real issue is that (diary) should not
+                           ;; have the side effect of visiting all the
+                           ;; diary files.  It is not really appt.el's job to
+                           ;; clean up this mess...
+                           (kill-buffer d-buff2)))))
               (error nil)))
         (setq appt-prev-comp-time cur-comp-time
               appt-mode-string nil