emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Glenn Morris
Subject: [Emacs-diffs] emacs/lisp ChangeLog calendar/appt.el
Date: Thu, 03 Sep 2009 06:35:30 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/03 06:35:30

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

Log message:
        (appt-check): Don't call substitute-in-file-name on diary-file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16088&r2=1.16089
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/appt.el?cvsroot=emacs&r1=1.96&r2=1.97

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16088
retrieving revision 1.16089
diff -u -b -r1.16088 -r1.16089
--- ChangeLog   3 Sep 2009 02:21:37 -0000       1.16088
+++ ChangeLog   3 Sep 2009 06:35:25 -0000       1.16089
@@ -1,3 +1,13 @@
+2009-09-03  Glenn Morris  <address@hidden>
+
+       * calendar/appt.el (appt-check):
+       * calendar/diary-lib.el (diary-set-header, diary-live-p)
+       (diary-check-diary-file, diary-list-entries)
+       (diary-include-other-diary-files, diary-simple-display)
+       (diary-fancy-display, diary-print-entries)
+       (diary-mark-included-diary-files, diary-make-entry):
+       Don't call substitute-in-file-name on diary-file.
+
 2009-09-03  Eduard Wiebe  <address@hidden>
            Stefan Monnier  <address@hidden>
 

Index: calendar/appt.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/appt.el,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- calendar/appt.el    22 Jun 2009 06:30:02 -0000      1.96
+++ calendar/appt.el    3 Sep 2009 06:35:29 -0000       1.97
@@ -331,8 +331,7 @@
                              (cons 'appt-make-list diary-hook))))
                       (diary))
                   (let* ((diary-display-function 'appt-make-list)
-                         (d-buff (find-buffer-visiting
-                                  (substitute-in-file-name diary-file)))
+                         (d-buff (find-buffer-visiting diary-file))
                          (selective
                           (if d-buff    ; diary buffer exists
                               (with-current-buffer d-buff
@@ -343,8 +342,7 @@
                     (if d-buff
                         ;; Displays the diary buffer.
                         (or selective (diary-show-all-entries))
-                      (and (setq d-buff (find-buffer-visiting
-                                         (substitute-in-file-name diary-file)))
+                      (and (setq d-buff (find-buffer-visiting diary-file))
                            (kill-buffer d-buff)))))
               (error nil)))
         (setq appt-prev-comp-time cur-comp-time




reply via email to

[Prev in Thread] Current Thread [Next in Thread]