Mercurial > emacs

comparison lisp/calendar/calendar.el @ 111606:0466e5504621

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diary-iso-date-forms fix for bug#7377. * lisp/calendar/calendar.el (diary-iso-date-forms): Make elements mutually exclusive.
author Glenn Morris <rgm@gnu.org>
date Thu, 11 Nov 2010 19:16:20 -0800
parents d916e52744cb
children 376148b31b5e
comparison
equal deleted inserted replaced
111605:ca8b605ca70f 111606:0466e5504621
734 ;; Next three are provided to aid in setting diary-date-forms. 734 ;; Next three are provided to aid in setting diary-date-forms.
735 ;; FIXME move to diary-lib? 735 ;; FIXME move to diary-lib?
736 (defcustom diary-iso-date-forms 736 (defcustom diary-iso-date-forms
737 '((month "[-/]" day "[^-/0-9]") 737 '((month "[-/]" day "[^-/0-9]")
738 (year "[-/]" month "[-/]" day "[^0-9]") 738 (year "[-/]" month "[-/]" day "[^0-9]")
739 (monthname "-" day "[^-0-9]") 739 ;; Cannot allow [-/] as separators here, since it would also match
740 (year "-" monthname "-" day "[^0-9]") 740 ;; the first element (bug#7377).
741 (monthname " *" day "[^-0-9]")
742 (year " *" monthname " *" day "[^0-9]")
741 (dayname "\\W")) 743 (dayname "\\W"))
742 "List of pseudo-patterns describing the ISO style of dates. 744 "List of pseudo-patterns describing the ISO style of dates.
743 The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME-DAY; 745 The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME DAY;
744 YEAR-MONTHNAME-DAY; DAYNAME. Normally you should not customize this, 746 YEAR MONTHNAME DAY; DAYNAME. Normally you should not customize this,
745 but `diary-date-forms' (which see)." 747 but `diary-date-forms' (which see)."
746 :version "23.1" 748 :version "23.3" ; bug#7377
747 :type '(repeat (choice (cons :tag "Backup" 749 :type '(repeat (choice (cons :tag "Backup"
748 :value (backup . nil) 750 :value (backup . nil)
749 (const backup) 751 (const backup)
750 (repeat (list :inline t :format "%v" 752 (repeat (list :inline t :format "%v"
751 (symbol :tag "Keyword") 753 (symbol :tag "Keyword")
2568 2570
2569 ;; Local variables: 2571 ;; Local variables:
2570 ;; byte-compile-dynamic: t 2572 ;; byte-compile-dynamic: t
2571 ;; End: 2573 ;; End:
2572 2574
2573 ;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8
2574 ;;; calendar.el ends here 2575 ;;; calendar.el ends here