comparison lisp/calendar/calendar.el @ 48683:ead34b521994

(facemenu-unlisted-faces): Only update after facemenu was loaded. (calendar-font-lock-keywords): Accept non-ASCII month names. Use regexp-opt.

48682:a74dd42cf01d

  "*Determine how the calendar mode removes a frame no longer needed.
If nil, make an icon of the frame.  If non-nil, delete the frame."
  :type 'boolean
  :group 'view)

(add-to-list 'facemenu-unlisted-faces 'diary-face)
(defvar diary-face 'diary-face
  "Face name to use for diary entries.")
(defface diary-face
  '((((class color) (background light))
     :foreground "red")

    (t
     :weight bold))
  "Face for highlighting diary entries."
  :group 'diary)

(add-to-list 'facemenu-unlisted-faces 'calendar-today-face)
(defface calendar-today-face
  '((t (:underline t)))
  "Face for indicating today's date."
  :group 'diary)

(add-to-list 'facemenu-unlisted-faces 'holiday-face)
(defface holiday-face
  '((((class color) (background light))
     :background "pink")
    (((class color) (background dark))
     :background "chocolate4")
    (t
     :inverse-video t))
  "Face for indicating dates that have holidays."
  :group 'diary)

(defcustom diary-entry-marker
  (if (not (display-color-p))
      "+"
    'diary-face)

  ["January" "February" "March"     "April"   "May"      "June"
   "July"    "August"   "September" "October" "November" "December"]
  "Array of capitalized strings giving, in order, the month names.")

(defvar calendar-font-lock-keywords
  (list
   '("[A-Z][a-z]+ -?[0-9]+" . font-lock-function-name-face) ; month and year
   (cons
    (concat (substring (aref calendar-day-name-array 6) 0 2)
	    "\\|"
	    (substring (aref calendar-day-name-array 0) 0 2))
    'font-lock-comment-face)
   (cons
    (mapconcat 'identity
	       (mapcar '(lambda (x) (substring x 0 2))
		       calendar-day-name-array)
	       "\\|")
    'font-lock-reference-face))
  "Default keywords to highlight in Calendar mode.")


(defun calendar-make-alist (sequence &optional start-index filter)
  "Make an assoc list corresponding to SEQUENCE.

48683:ead34b521994

  "*Determine how the calendar mode removes a frame no longer needed.
If nil, make an icon of the frame.  If non-nil, delete the frame."
  :type 'boolean
  :group 'view)

(defvar diary-face 'diary-face
  "Face name to use for diary entries.")
(defface diary-face
  '((((class color) (background light))
     :foreground "red")

    (t
     :weight bold))
  "Face for highlighting diary entries."
  :group 'diary)

(defface calendar-today-face
  '((t (:underline t)))
  "Face for indicating today's date."
  :group 'diary)

(defface holiday-face
  '((((class color) (background light))
     :background "pink")
    (((class color) (background dark))
     :background "chocolate4")
    (t
     :inverse-video t))
  "Face for indicating dates that have holidays."
  :group 'diary)

(eval-after-load "facemenu"
  '(progn
     (add-to-list 'facemenu-unlisted-faces 'diary-face)
     (add-to-list 'facemenu-unlisted-faces 'calendar-today-face)
     (add-to-list 'facemenu-unlisted-faces 'holiday-face)))

(defcustom diary-entry-marker
  (if (not (display-color-p))
      "+"
    'diary-face)

  ["January" "February" "March"     "April"   "May"      "June"
   "July"    "August"   "September" "October" "November" "December"]
  "Array of capitalized strings giving, in order, the month names.")

(defvar calendar-font-lock-keywords
  `((,(concat (regexp-opt (mapcar 'identity calendar-month-name-array) t)
	      " -?[0-9]+")
     . font-lock-function-name-face) ; month and year
    (,(regexp-opt
       (list (substring (aref calendar-day-name-array 6) 0 2)
	     (substring (aref calendar-day-name-array 0) 0 2)))
     ;; Saturdays and Sundays are hilited differently.
     . font-lock-comment-face)
    (,(regexp-opt (mapcar (lambda (x) (substring x 0 2)) calendar-day-name-array))
     . font-lock-reference-face))
  "Default keywords to highlight in Calendar mode.")


(defun calendar-make-alist (sequence &optional start-index filter)
  "Make an assoc list corresponding to SEQUENCE.