Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru

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

diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 5c624ddcf01eb17ff4d8026c61731f408c4b1d58..1a69ade82daaae0b932ed70d54d3a92b7298f6ab 100644 (file)
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -1,7 +1,6 @@
 ;;; cal-persia.el --- calendar functions for the Persian calendar
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -88,9 +87,6 @@ Gregorian date Sunday, December 31, 1 BC."
           (calendar-persian-last-day-of-month m year))
          day))))                        ; days so far this month
 
-(define-obsolete-function-alias 'calendar-absolute-from-persian
-  'calendar-persian-to-absolute "23.1")
-
 (defun calendar-persian-year-from-absolute (date)
   "Persian year corresponding to the absolute DATE."
   (let* ((d0                   ; prior days since start of 2820 cycles
@@ -164,9 +160,6 @@ Gregorian date Sunday, December 31, 1 BC."
   (message "Persian date: %s"
            (calendar-persian-date-string (calendar-cursor-to-date t))))
 
-(define-obsolete-function-alias 'calendar-print-persian-date
-  'calendar-persian-print-date "23.1")
-
 (defun calendar-persian-read-date ()
   "Interactively read the arguments for a Persian date command.
 Reads a year, month, and day."
@@ -193,9 +186,6 @@ Reads a year, month, and day."
                (lambda (x) (and (< 0 x) (<= x last))))))
     (list (list month day year))))
 
-(define-obsolete-function-alias 'persian-prompt-for-date
-  'calendar-persian-read-date "23.1")
-
 ;;;###cal-autoload
 (defun calendar-persian-goto-date (date &optional noecho)
   "Move cursor to Persian date DATE.
@@ -205,8 +195,6 @@ Echo Persian date unless NOECHO is non-nil."
                        (calendar-persian-to-absolute date)))
   (or noecho (calendar-persian-print-date)))
 
-(define-obsolete-function-alias 'calendar-goto-persian-date
-  'calendar-persian-goto-date "23.1")
 
 (defvar date)
 
@@ -218,5 +206,4 @@ Echo Persian date unless NOECHO is non-nil."
 
 (provide 'cal-persia)
 
-;; arch-tag: 2832383c-e4b4-4dc2-8ee9-cfbdd53e5e2d
 ;;; cal-persia.el ends here