(appt-check): Use diary-selective-display var.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c179d40c424920fff3fb71d782c9ef3be4e3b97..df834d0fae963a8ff76e17ce91b38484e3c50a40 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * calendar/appt.el (appt-check): Use diary-selective-display var.
+
 2005-10-10  Richard M. Stallman  <rms@gnu.org>
 
        * net/newsticker.el (newsticker-start, newsticker-show-news):
@@ -130,10 +134,6 @@
        * progmodes/gud.el (gud-speedbar-menu-items): Use :visible
        instead of :active.
 
-2005-10-08  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * calendar/appt.el (appt-check): Use diary-selective-display var.
-
 2005-10-08  Eric Hanchrow  <offby1@blarg.net>
 
        * textmodes/ispell.el (ispell-check-version):

diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index ae2fc3bd8e1caa5292dcbb56eee4fb77ad1f68db..590fcc9b8711f425328c4c2b994e14e37b5ed493 100644 (file)
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -1,6 +1,6 @@
 ;;; appt.el --- appointment notification functions
 
-;; Copyright (C) 1989, 1990, 1994, 1998, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1990, 1994, 1998, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -337,13 +337,13 @@ displayed in a window:
                                  diary-hook
                                (cons 'appt-make-list diary-hook))))
                         (diary))
-                    (let ((diary-display-hook 'appt-make-list)
-                          (d-buff (find-buffer-visiting
-                                   (substitute-in-file-name diary-file)))
-                          selective)
-                      (if d-buff        ; diary buffer exists
-                          (with-current-buffer d-buff
-                            (setq selective selective-display)))
+                    (let* ((diary-display-hook 'appt-make-list)
+                           (d-buff (find-buffer-visiting
+                                    (substitute-in-file-name diary-file)))
+                           (selective
+                            (if d-buff        ; Diary buffer exists.
+                                (with-current-buffer d-buff
+                                  diary-selective-display))))
                       (diary)
                       ;; If the diary buffer existed before this command,
                       ;; restore its display state. Otherwise, kill it.