HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
guile feature
[bpt/emacs.git]
/
lisp
/
calendar
/
cal-french.el
diff --git
a/lisp/calendar/cal-french.el
b/lisp/calendar/cal-french.el
index
92f4ccc
..
cbcd231
100644
(file)
--- a/
lisp/calendar/cal-french.el
+++ b/
lisp/calendar/cal-french.el
@@
-1,12
+1,13
@@
;;; cal-french.el --- calendar functions for the French Revolutionary calendar
;;; cal-french.el --- calendar functions for the French Revolutionary calendar
-;; Copyright (C) 1988
, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
-;;
2004, 2005, 2006, 2007, 2008 Free
Software Foundation, Inc.
+;; Copyright (C) 1988
-1989, 1992, 1994-1995, 1997, 2001-2014 Free
+;; Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; Human-Keywords: French Revolutionary calendar, calendar, diary
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; Human-Keywords: French Revolutionary calendar, calendar, diary
+;; Package: calendar
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-40,8
+41,8
@@
"Array of month names in the French calendar.")
(defconst calendar-french-multibyte-month-name-array
"Array of month names in the French calendar.")
(defconst calendar-french-multibyte-month-name-array
- ["Vend
émiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventô
se"
- "Germinal" "Flor
é
al" "Prairial" "Messidor" "Thermidor" "Fructidor"]
+ ["Vend
émiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventô
se"
+ "Germinal" "Flor
é
al" "Prairial" "Messidor" "Thermidor" "Fructidor"]
"Array of multibyte month names in the French calendar.")
(defconst calendar-french-day-name-array
"Array of multibyte month names in the French calendar.")
(defconst calendar-french-day-name-array
@@
-55,8
+56,8
@@
"Array of special day names in the French calendar.")
(defconst calendar-french-multibyte-special-days-array
"Array of special day names in the French calendar.")
(defconst calendar-french-multibyte-special-days-array
- ["de la Vertu" "du G
énie" "du Travail" "de la Raison" "des Ré
compenses"
- "de la R
é
volution"]
+ ["de la Vertu" "du G
énie" "du Travail" "de la Raison" "des Ré
compenses"
+ "de la R
é
volution"]
"Array of multibyte special day names in the French calendar.")
(defun calendar-french-accents-p ()
"Array of multibyte special day names in the French calendar.")
(defun calendar-french-accents-p ()
@@
-174,13
+175,13
@@
Defaults to today's date if DATE is not given."
(cond
((< y 1) "")
((= m 13) (format (if (calendar-french-accents-p)
(cond
((< y 1) "")
((= m 13) (format (if (calendar-french-accents-p)
- "Jour %s de l'Ann
ée %d de la Ré
volution"
+ "Jour %s de l'Ann
ée %d de la Ré
volution"
"Jour %s de l'Anne'e %d de la Re'volution")
(aref (calendar-french-special-days-array) (1- d))
y))
(t (format
(if (calendar-french-accents-p)
"Jour %s de l'Anne'e %d de la Re'volution")
(aref (calendar-french-special-days-array) (1- d))
y))
(t (format
(if (calendar-french-accents-p)
- "%d %s an %d de la R
é
volution"
+ "%d %s an %d de la R
é
volution"
"%d %s an %d de la Re'volution")
d
(aref (calendar-french-month-name-array) (1- m))
"%d %s an %d de la Re'volution")
d
(aref (calendar-french-month-name-array) (1- m))
@@
-208,7
+209,7
@@
Echo French Revolutionary date unless NOECHO is non-nil."
(year (progn
(calendar-read
(if (calendar-french-accents-p)
(year (progn
(calendar-read
(if (calendar-french-accents-p)
- "Ann
ée de la Ré
volution (>0): "
+ "Ann
ée de la Ré
volution (>0): "
"Anne'e de la Re'volution (>0): ")
(lambda (x) (> x 0))
(number-to-string
"Anne'e de la Re'volution (>0): ")
(lambda (x) (> x 0))
(number-to-string
@@
-264,5
+265,8
@@
Echo French Revolutionary date unless NOECHO is non-nil."
(provide 'cal-french)
(provide 'cal-french)
-;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
;;; cal-french.el ends here
;;; cal-french.el ends here