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

[Sam Steingold]

Index: emacs/lisp/calendar/diary-lib.el
diff -c emacs/lisp/calendar/diary-lib.el:1.64 
emacs/lisp/calendar/diary-lib.el:1.65
*** emacs/lisp/calendar/diary-lib.el:1.64       Tue Feb 11 18:25:15 2003
--- emacs/lisp/calendar/diary-lib.el    Thu Apr 24 21:58:48 2003
***************
*** 201,216 ****
                           ((string= "nil" attrvalue) nil)))))
  ;    (message "(%s)[%s]=[%s]" (print type) attrvalue ret)
      ret))
!       
  
  (defun diary-pull-attrs (entry fileglobattrs)
!   "Pull the face-related attributes off the entry, merge with the 
! fileglobattrs, and return the (possibly modified) entry and face 
! data in a list of attrname attrvalue values.  
  The entry will be modified to drop all tags that are used for face matching.
! If entry is nil, then the fileglobattrs are being searched for, 
! the fileglobattrs variable is ignored, and 
! diary-glob-file-regexp-prefix is prepended to the regexps before each 
  search."
    (save-excursion
      (let (regexp regnum attrname attr-list attrname attrvalue type)
--- 201,216 ----
                           ((string= "nil" attrvalue) nil)))))
  ;    (message "(%s)[%s]=[%s]" (print type) attrvalue ret)
      ret))
! 
  
  (defun diary-pull-attrs (entry fileglobattrs)
!   "Pull the face-related attributes off the entry, merge with the
! fileglobattrs, and return the (possibly modified) entry and face
! data in a list of attrname attrvalue values.
  The entry will be modified to drop all tags that are used for face matching.
! If entry is nil, then the fileglobattrs are being searched for,
! the fileglobattrs variable is ignored, and
! diary-glob-file-regexp-prefix is prepended to the regexps before each
  search."
    (save-excursion
      (let (regexp regnum attrname attr-list attrname attrvalue type)
***************
*** 248,254 ****
                  type (nth 3 attr))
            (setq attrvalue nil)
            (if (string-match regexp entry)
!               (progn 
                  (setq attrvalue (substring-no-properties entry
                                                           (match-beginning 
regnum)
                                                           (match-end regnum)))
--- 248,254 ----
                  type (nth 3 attr))
            (setq attrvalue nil)
            (if (string-match regexp entry)
!               (progn
                  (setq attrvalue (substring-no-properties entry
                                                           (match-beginning 
regnum)
                                                           (match-end regnum)))
***************
*** 258,265 ****
                (setq ret-attr (append ret-attr (list attrname attrvalue))))
            (setq attr-list (cdr attr-list)))))))
    (list entry ret-attr))
!   
!   
  
  (defun list-diary-entries (date number)
    "Create and display a buffer containing the relevant lines in diary-file.
--- 258,265 ----
                (setq ret-attr (append ret-attr (list attrname attrvalue))))
            (setq attr-list (cdr attr-list)))))))
    (list entry ret-attr))
! 
! 
  
  (defun list-diary-entries (date number)
    "Create and display a buffer containing the relevant lines in diary-file.
***************
*** 983,989 ****
                      temp (diary-pull-attrs entry file-glob-attrs)
                      marks (nth 1 temp))
                (mark-visible-calendar-date
!                (calendar-gregorian-from-absolute date) 
                 (if (< 0 (length marks))
                     marks
                   (if (consp mark)
--- 983,989 ----
                      temp (diary-pull-attrs entry file-glob-attrs)
                      marks (nth 1 temp))
                (mark-visible-calendar-date
!                (calendar-gregorian-from-absolute date)
                 (if (< 0 (length marks))
                     marks
                   (if (consp mark)
***************
*** 1339,1345 ****
                             entry
                             specifier
                             (if entry-start (copy-marker entry-start)
!                              nil) 
                             marks)
          (setq entry-found (or entry-found diary-entry)))))
      entry-found))
--- 1339,1345 ----
                             entry
                             specifier
                             (if entry-start (copy-marker entry-start)
!                              nil)
                             marks)
          (setq entry-found (or entry-found diary-entry)))))
      entry-found))
***************
*** 1733,1739 ****
    "Diary"
    "Major mode used while displaying diary entries using Fancy Display."
    (set (make-local-variable 'font-lock-defaults)
!        '(fancy-diary-font-lock-keywords t)))
  
  
  (defvar fancy-diary-font-lock-keywords
--- 1733,1740 ----
    "Diary"
    "Major mode used while displaying diary entries using Fancy Display."
    (set (make-local-variable 'font-lock-defaults)
!        '(fancy-diary-font-lock-keywords t))
!   (define-key (current-local-map) "q" 'quit-window))
  
  
  (defvar fancy-diary-font-lock-keywords