Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org

[gnu-emacs] / lisp / calendar / cal-french.el

diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 98a118f232f2281e58b86ce42a8b6fccf46c11be..36318702d067fbb373f90fcf833e298b1310b5c1 100644 (file)
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,6 @@
 ;;; 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, 2009, 2010
+;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2014
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
@@ -130,9 +129,6 @@ Gregorian date Sunday, December 31, 1 BC."
        day                            ; days so far this month
        (1- calendar-french-epoch))))  ; days before start of calendar
 
-(define-obsolete-function-alias 'calendar-absolute-from-french
-  'calendar-french-to-absolute "23.1")
-
 (defun calendar-french-from-absolute (date)
   "Compute the French Revolutionary equivalent for absolute date DATE.
 The result is a list of the form (MONTH DAY YEAR).
@@ -197,9 +193,6 @@ Defaults to today's date if DATE is not given."
         (message "Date is pre-French Revolution")
       (message "French Revolutionary date: %s" f))))
 
-(define-obsolete-function-alias 'calendar-print-french-date
-  'calendar-french-print-date "23.1")
-
 ;;;###cal-autoload
 (defun calendar-french-goto-date (date &optional noecho)
   "Move cursor to French Revolutionary date DATE.
@@ -250,9 +243,6 @@ Echo French Revolutionary date unless NOECHO is non-nil."
                        (calendar-french-to-absolute date)))
   (or noecho (calendar-french-print-date)))
 
-(define-obsolete-function-alias 'calendar-goto-french-date
-  'calendar-french-goto-date "23.1")
-
 (defvar date)
 
 ;; To be called from diary-list-sexp-entries, where DATE is bound.
@@ -270,5 +260,4 @@ Echo French Revolutionary date unless NOECHO is non-nil."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
 ;;; cal-french.el ends here