Merge pending branch

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

diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index cd50074be2bad29088a43e9c7e66f037d626f6f0..0762860b0bad44d175f3160350248a24fff8cd1f 100644 (file)
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -1,7 +1,7 @@
 ;;; 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.
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -50,6 +50,7 @@ Sunday).  The Gregorian date Sunday, December 31, 1 BC is imaginary."
 (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.
 The ISO year corresponds approximately to the Gregorian year, but weeks