Merge from emacs-24 branch; up to 2012-05-01T18:47:23Z!rgm@gnu.org

[gnu-emacs] / lisp / calendar / diary-lib.el

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 4bcd9916d0c584e21e550c2b194a8db46c2f2ad7..2e073fd12674e5eeaf98f0851d1f2fead1580a44 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -337,7 +337,7 @@ expressions that can involve the keywords `days' (a number), `date'
 
 (defcustom diary-abbreviated-year-flag t
   "Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
-This applies to the Gregorian, Hebrew, Islamic, and Baha'i calendars.
+This applies to the Gregorian, Hebrew, Islamic, and Bahá'í calendars.
 When the current century is added to a two-digit year, if the result
 is more than 50 years in the future, the previous century is assumed.
 If the result is more than 50 years in the past, the next century is assumed.
@@ -2624,4 +2624,8 @@ user is asked to confirm its addition."
 
 (provide 'diary-lib)
 
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
 ;;; diary-lib.el ends here