[Emacs-diffs] /srv/bzr/emacs/trunk r101667: Minor diary include improvement.

[Glenn Morris]

------------------------------------------------------------
revno: 101667
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-09-28 21:00:50 -0700
message:
  Minor diary include improvement.
  * lisp/calendar/diary-lib.el (diary-include-other-diary-files):
  Trap some recursive includes.
modified:
  lisp/ChangeLog
  lisp/calendar/diary-lib.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-29 03:54:03 +0000
+++ b/lisp/ChangeLog    2010-09-29 04:00:50 +0000
@@ -1,5 +1,8 @@
 2010-09-29  Glenn Morris  <address@hidden>
 
+       * calendar/diary-lib.el (diary-include-other-diary-files):
+       Trap some recursive includes.
+
        * calendar/appt.el (appt-activate): Check diary file.
 
 2010-09-29  Katsumi Yamaoka  <address@hidden>

=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el        2010-09-15 02:34:39 +0000
+++ b/lisp/calendar/diary-lib.el        2010-09-29 04:00:50 +0000
@@ -848,16 +848,18 @@
           (diary-list-entries-hook 'diary-include-other-diary-files)
           (diary-display-function 'ignore)
           (diary-including t)
-          diary-hook diary-list-include-blanks)
+          diary-hook diary-list-include-blanks efile)
       (if (file-exists-p diary-file)
           (if (file-readable-p diary-file)
               (unwind-protect
-                  (setq diary-included-files
-                        (append diary-included-files
-                                (list (expand-file-name diary-file)))
-                        diary-entries-list
-                        (append diary-entries-list
-                                (diary-list-entries original-date number)))
+                  (if (member (setq efile (expand-file-name diary-file))
+                              diary-included-files)
+                      (error "Recursive diary include for %s" diary-file)
+                    (setq diary-included-files
+                          (append diary-included-files (list efile))
+                          diary-entries-list
+                          (append diary-entries-list
+                                  (diary-list-entries original-date number))))
                 (with-current-buffer (find-buffer-visiting diary-file)
                   (diary-unhide-everything)))
             (beep)