[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/13 06:40:31

Index: diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- diary-lib.el        13 Mar 2008 06:29:03 -0000      1.141
+++ diary-lib.el        13 Mar 2008 06:40:31 -0000      1.142
@@ -1238,11 +1238,15 @@
           (if (bolp) (backward-char 1))
           (setq entry (buffer-substring-no-properties entry-start (point))))
         (calendar-for-loop date from first-date to last-date do
-                          (if (setq mark (diary-sexp-entry sexp entry
+                           (if (setq mark
+                                     (diary-sexp-entry sexp entry
                                                            
(calendar-gregorian-from-absolute date)))
                               (progn
-                                (setq marks (diary-pull-attrs entry 
file-glob-attrs)
-                                      marks (nth 1 (diary-pull-attrs entry 
file-glob-attrs)))
+                                 ;; FIXME what?
+                                 (setq marks (diary-pull-attrs
+                                              entry file-glob-attrs)
+                                       marks (nth 1 (diary-pull-attrs
+                                                     entry file-glob-attrs)))
                                 (mark-visible-calendar-date
                                  (calendar-gregorian-from-absolute date)
                                  (if (< 0 (length marks))