Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org

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

diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 822bfb02655e4fd3bd16cfb67f7086685d90090a..88527cf68cc4e643155731d048cfcc195e1dc4ac 100644 (file)
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -1,12 +1,12 @@
 ;;; cal-iso.el --- calendar functions for the ISO calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008  Free Software Foundation, Inc.
+;; Copyright (C) 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: ISO calendar, calendar, diary
+;; Package: calendar
 
 ;; This file is part of GNU Emacs.
 
@@ -47,9 +47,6 @@ Sunday).  The Gregorian date Sunday, December 31, 1 BC is imaginary."
        (* 7 (1- (calendar-extract-month date)))
        (if (zerop day) 6 (1- day)))))
 
-(define-obsolete-function-alias 'calendar-absolute-from-iso
-  'calendar-iso-to-absolute "23.1")
-
 ;;;###cal-autoload
 (defun calendar-iso-from-absolute (date)
   "Compute the `ISO commercial date' corresponding to the absolute DATE.
@@ -91,9 +88,6 @@ date Sunday, December 31, 1 BC."
   (message "ISO date: %s"
            (calendar-iso-date-string (calendar-cursor-to-date t))))
 
-(define-obsolete-function-alias 'calendar-print-iso-date
-  'calendar-iso-print-date "23.1")
-
 (defun calendar-iso-read-date (&optional dayflag)
   "Interactively read the arguments for an ISO date command.
 Reads a year and week, and if DAYFLAG is non-nil a day (otherwise
@@ -118,9 +112,6 @@ taken to be 1)."
                 1)))
     (list (list week day year))))
 
-(define-obsolete-function-alias 'calendar-iso-read-args
-  'calendar-iso-read-date "23.1")
-
 ;;;###cal-autoload
 (defun calendar-iso-goto-date (date &optional noecho)
   "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil."
@@ -129,9 +120,6 @@ taken to be 1)."
                        (calendar-iso-to-absolute date)))
   (or noecho (calendar-iso-print-date)))
 
-(define-obsolete-function-alias 'calendar-goto-iso-date
-  'calendar-iso-goto-date "23.1")
-
 ;;;###cal-autoload
 (defun calendar-iso-goto-week (date &optional noecho)
   "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil.
@@ -141,9 +129,6 @@ Interactively, goes to the first day of the specified week."
                        (calendar-iso-to-absolute date)))
   (or noecho (calendar-iso-print-date)))
 
-(define-obsolete-function-alias 'calendar-goto-iso-week
-  'calendar-iso-goto-week "23.1")
-
 (defvar date)
 
 ;; To be called from diary-list-sexp-entries, where DATE is bound.
@@ -154,5 +139,4 @@ Interactively, goes to the first day of the specified week."
 
 (provide 'cal-iso)
 
-;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6
 ;;; cal-iso.el ends here