Merge from emacs-24; up to 2012-12-10T20:27:33Z!eggert@cs.ucla.edu

[gnu-emacs] / lisp / calendar / lunar.el

diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 53c7f9b1a63223d3dbca211f5c454e09a4d0fd3c..c62fb7622e0b1496aca93d7f4ec0732158d0cdee 100644 (file)
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -1,7 +1,7 @@
 ;;; lunar.el --- calendar functions for phases of the moon
 
-;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1992-1993, 1995, 1997, 2001-2013 Free Software
+;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -236,7 +236,7 @@ use instead of point."
 (defun lunar-phases (&optional arg)
   "Display the quarters of the moon for last month, this month, and next month.
 If called with an optional prefix argument ARG, prompts for month and year.
-This function is suitable for execution in a .emacs file."
+This function is suitable for execution in an init file."
   (interactive "P")
   (save-excursion
     (let* ((date (if arg (calendar-read-date t)
@@ -408,5 +408,4 @@ as governed by the values of `calendar-daylight-savings-starts',
 
 (provide 'lunar)
 
-;; arch-tag: 72f0b8a4-7bcc-4a1b-b67a-ff53c4a1d222
 ;;; lunar.el ends here