comparison lisp/calendar/cal-china.el @ 90261:7beb78bc1f8e

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 616-696) - Add lisp/mh-e/.arch-inventory - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords. - lisp/gnus/ChangeLog: Remove duplicate entry * gnus--rel--5.10 (patch 147-181) - Update from CVS - Merge from emacs--cvs-trunk--0 - Update from CVS: lisp/mml.el (mml-preview): Doc fix. - Update from CVS: texi/message.texi: Fix default values. - Update from CVS: texi/gnus.texi (RSS): Addition.
author Miles Bader <miles@gnu.org>
date Mon, 16 Jan 2006 08:37:27 +0000
parents a3716f7538f2 a55ee709ec8d
children 4b3d39451150
comparison
equal deleted inserted replaced
90260:0ca0d9181b5e 90261:7beb78bc1f8e
1 ;;; cal-china.el --- calendar functions for the Chinese calendar 1 ;;; cal-china.el --- calendar functions for the Chinese calendar
2 2
3 ;; Copyright (C) 1995, 1997 Free Software Foundation, Inc. 3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
4 ;; Free Software Foundation, Inc.
4 5
5 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
7 ;; Maintainer: Glenn Morris <rgm@gnu.org>
6 ;; Keywords: calendar 8 ;; Keywords: calendar
7 ;; Human-Keywords: Chinese calendar, calendar, holidays, diary 9 ;; Human-Keywords: Chinese calendar, calendar, holidays, diary
8 10
9 ;; This file is part of GNU Emacs. 11 ;; This file is part of GNU Emacs.
10 12