aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-03-17 22:25:13 -0700
committerGlenn Morris2010-03-17 22:25:13 -0700
commit1a355d092be234a0cb5b2cf0956a090aad7fa1a2 (patch)
treec30cd3ea50de5c0a335f00cbbef3f0b49306c0a7
parentf8388570302aad60379a3275fa81bfe475e76252 (diff)
downloademacs-1a355d092be234a0cb5b2cf0956a090aad7fa1a2.tar.gz
emacs-1a355d092be234a0cb5b2cf0956a090aad7fa1a2.zip
* calendar/cal-french.el: Convert to utf-8.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/calendar/cal-french.el21
2 files changed, 15 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e72757db8fe..407d700c289 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12010-03-18 Glenn Morris <rgm@gnu.org> 12010-03-18 Glenn Morris <rgm@gnu.org>
2 2
3 * calendar/cal-french.el: Convert to utf-8.
4
3 * files.el (interpreter-mode-alist): Use emacs-lisp-mode for 5 * files.el (interpreter-mode-alist): Use emacs-lisp-mode for
4 Emacs scripts. 6 Emacs scripts.
5 7
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 1ee290f5aa9..9b252eb3dc4 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,8 @@
1;;; cal-french.el --- calendar functions for the French Revolutionary calendar 1;;; cal-french.el --- calendar functions for the French Revolutionary calendar
2 2
3;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003, 3;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
4;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2004, 2005, 2006, 2007, 2008, 2009, 2010
5;; Free Software Foundation, Inc.
5 6
6;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 7;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
7;; Maintainer: Glenn Morris <rgm@gnu.org> 8;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -40,8 +41,8 @@
40 "Array of month names in the French calendar.") 41 "Array of month names in the French calendar.")
41 42
42(defconst calendar-french-multibyte-month-name-array 43(defconst calendar-french-multibyte-month-name-array
43 ["Vendémiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventôse" 44 ["Vendémiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventôse"
44 "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"] 45 "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"]
45 "Array of multibyte month names in the French calendar.") 46 "Array of multibyte month names in the French calendar.")
46 47
47(defconst calendar-french-day-name-array 48(defconst calendar-french-day-name-array
@@ -55,8 +56,8 @@
55 "Array of special day names in the French calendar.") 56 "Array of special day names in the French calendar.")
56 57
57(defconst calendar-french-multibyte-special-days-array 58(defconst calendar-french-multibyte-special-days-array
58 ["de la Vertu" "du Génie" "du Travail" "de la Raison" "des Récompenses" 59 ["de la Vertu" "du Génie" "du Travail" "de la Raison" "des Récompenses"
59 "de la Révolution"] 60 "de la Révolution"]
60 "Array of multibyte special day names in the French calendar.") 61 "Array of multibyte special day names in the French calendar.")
61 62
62(defun calendar-french-accents-p () 63(defun calendar-french-accents-p ()
@@ -174,13 +175,13 @@ Defaults to today's date if DATE is not given."
174 (cond 175 (cond
175 ((< y 1) "") 176 ((< y 1) "")
176 ((= m 13) (format (if (calendar-french-accents-p) 177 ((= m 13) (format (if (calendar-french-accents-p)
177 "Jour %s de l'Année %d de la Révolution" 178 "Jour %s de l'Année %d de la Révolution"
178 "Jour %s de l'Anne'e %d de la Re'volution") 179 "Jour %s de l'Anne'e %d de la Re'volution")
179 (aref (calendar-french-special-days-array) (1- d)) 180 (aref (calendar-french-special-days-array) (1- d))
180 y)) 181 y))
181 (t (format 182 (t (format
182 (if (calendar-french-accents-p) 183 (if (calendar-french-accents-p)
183 "%d %s an %d de la Révolution" 184 "%d %s an %d de la Révolution"
184 "%d %s an %d de la Re'volution") 185 "%d %s an %d de la Re'volution")
185 d 186 d
186 (aref (calendar-french-month-name-array) (1- m)) 187 (aref (calendar-french-month-name-array) (1- m))
@@ -208,7 +209,7 @@ Echo French Revolutionary date unless NOECHO is non-nil."
208 (year (progn 209 (year (progn
209 (calendar-read 210 (calendar-read
210 (if (calendar-french-accents-p) 211 (if (calendar-french-accents-p)
211 "Année de la Révolution (>0): " 212 "Année de la Révolution (>0): "
212 "Anne'e de la Re'volution (>0): ") 213 "Anne'e de la Re'volution (>0): ")
213 (lambda (x) (> x 0)) 214 (lambda (x) (> x 0))
214 (number-to-string 215 (number-to-string
@@ -264,5 +265,9 @@ Echo French Revolutionary date unless NOECHO is non-nil."
264 265
265(provide 'cal-french) 266(provide 'cal-french)
266 267
268;; Local Variables:
269;; coding: utf-8
270;; End:
271
267;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9 272;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
268;;; cal-french.el ends here 273;;; cal-french.el ends here