*** /home/fischman/cvs/emacs/lisp/calendar/calendar.el	2002-12-07 13:30:57.000000000 -0800
--- calendar.el	2002-12-12 09:57:10.000000000 -0800
***************
*** 496,503 ****
--- 496,520 ----
  See the documentation for the function `include-other-diary-files'."
    :type 'string
    :group 'diary)
  
+ (defcustom diary-glob-file-color-regexp "^#[ \t]*\\[color:\\([a-z]+\\)\\]$"
+   "*The regular expression that picks off the global file color for 
+ colored diary/calendar displays."
+   :type 'string
+   :group 'diary)
+ 
+ (defcustom diary-color-regexp "\\[color:\\([a-z]+\\)\\]$"
+   "*The regular expression that picks off the entry's color for 
+ colored diary/calendar displays."
+   :type 'string
+   :group 'diary)
+ 
+ (defcustom diary-file-name-prefix nil
+   "If non-nil then each entry in the diary list will be prefixed with the name of the file in which it was defined."
+   :type 'boolean
+   :group 'diary)
+ 
  ;;;###autoload
  (defcustom sexp-diary-entry-symbol "%%"
    "*The string used to indicate a sexp diary entry in `diary-file'.
  See the documentation for the function `list-sexp-diary-entries'."
***************
*** 2552,2574 ****
     (= (extract-calendar-year date1) (extract-calendar-year date2))))
  
  (defun mark-visible-calendar-date (date &optional mark)
    "Mark DATE in the calendar window with MARK.
! MARK is either a single-character string or a face.
  MARK defaults to `diary-entry-marker'."
    (if (calendar-date-is-legal-p date)
        (save-excursion
          (set-buffer calendar-buffer)
          (calendar-cursor-to-visible-date date)
!         (let ((mark (or mark diary-entry-marker)))
!           (if (stringp mark)
!               (let ((buffer-read-only nil))
!                 (forward-char 1)
!                 (delete-char 1)
!                 (insert mark)
!                 (forward-char -2))
! 	    (overlay-put
!              (make-overlay (1- (point)) (1+ (point))) 'face mark))))))
  
  (defun calendar-star-date ()
    "Replace the date under the cursor in the calendar window with asterisks.
  This function can be used with the `today-visible-calendar-hook' run after the
--- 2569,2600 ----
     (= (extract-calendar-year date1) (extract-calendar-year date2))))
  
  (defun mark-visible-calendar-date (date &optional mark)
    "Mark DATE in the calendar window with MARK.
! MARK is a single-character string, an x-color-name string, or a face.
  MARK defaults to `diary-entry-marker'."
    (if (calendar-date-is-legal-p date)
        (save-excursion
          (set-buffer calendar-buffer)
          (calendar-cursor-to-visible-date date)
! 	(let ((mark (or (and (stringp mark) (> (length mark) 0) mark)
! 			(and (not (stringp mark)) mark)
! 			diary-entry-marker)))
! 	  (if (stringp mark)
! 	      (if (= (length mark) 1)
! 		  (let ((buffer-read-only nil))
! 		    (forward-char 1)
! 		    (delete-char 1)
! 		    (insert mark)
! 		    (forward-char -2))
! 		(progn
! 		  (setq temp-face (make-symbol (concat "cal-col-face-" mark)))
! 		  (make-face temp-face)
! 		  (set-face-foreground temp-face mark)
! 		  (overlay-put
! 		   (make-overlay (1- (point)) (1+ (point))) 'face temp-face)))
!             (overlay-put
! 	     (make-overlay (1- (point)) (1+ (point))) 'face mark))))))
  
  (defun calendar-star-date ()
    "Replace the date under the cursor in the calendar window with asterisks.
  This function can be used with the `today-visible-calendar-hook' run after the