From: Glenn Morris Date: Mon, 1 Nov 2010 07:40:11 +0000 (-0700) Subject: Reposition some aliases in holidays.el. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~421^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=919dd7aa0a28d6baddd8802c132cba590d4baa85;p=emacs.git Reposition some aliases in holidays.el. * lisp/calendar/holidays.el (general-holidays, oriental-holidays) (local-holidays, other-holidays, hebrew-holidays, christian-holidays) (islamic-holidays, bahai-holidays, solar-holidays): Move aliases before the definitions of their targets. (The position doesn't actually matter so long as the aliases are autoloaded). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42d6c7ece03..7a9434d3767 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2010-11-01 Glenn Morris + * calendar/holidays.el (general-holidays, oriental-holidays) + (local-holidays, other-holidays, hebrew-holidays, christian-holidays) + (islamic-holidays, bahai-holidays, solar-holidays): Move aliases before + the definitions of their targets. + * emacs-lisp/smie.el (smie): New custom group. (smie-blink-matching-inners, smie-indent-basic): Add :group. diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index af61fdf149e..275c8a5ca29 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -1,7 +1,8 @@ ;;; holidays.el --- holiday functions for the calendar package ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1997, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold ;; Maintainer: Glenn Morris @@ -42,6 +43,9 @@ ;; are used to using them to set calendar-holidays without having to ;; explicitly load this file. +;;;###autoload +(define-obsolete-variable-alias 'general-holidays + 'holiday-general-holidays "23.1") ;;;###autoload (defcustom holiday-general-holidays (mapcar 'purecopy @@ -68,10 +72,10 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-general-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'general-holidays - 'holiday-general-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'oriental-holidays + 'holiday-oriental-holidays "23.1") ;;;###autoload (defcustom holiday-oriental-holidays (mapcar 'purecopy @@ -93,10 +97,9 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-oriental-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'oriental-holidays - 'holiday-oriental-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'local-holidays 'holiday-local-holidays "23.1") ;;;###autoload (defcustom holiday-local-holidays nil "Local holidays. @@ -105,9 +108,9 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-local-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'local-holidays 'holiday-local-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'other-holidays 'holiday-other-holidays "23.1") ;;;###autoload (defcustom holiday-other-holidays nil "User defined holidays. @@ -116,8 +119,6 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-other-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'other-holidays 'holiday-other-holidays "23.1") ;;;###autoload (defvar hebrew-holidays-1 @@ -218,6 +219,9 @@ See the documentation for `calendar-holidays' for details." (put 'hebrew-holidays-4 'risky-local-variable t) (make-obsolete-variable 'hebrew-holidays-4 'hebrew-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'hebrew-holidays + 'holiday-hebrew-holidays "23.1") ;;;###autoload (defcustom holiday-hebrew-holidays (mapcar 'purecopy @@ -235,10 +239,10 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-hebrew-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'hebrew-holidays - 'holiday-hebrew-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'christian-holidays + 'holiday-christian-holidays "23.1") ;;;###autoload (defcustom holiday-christian-holidays (mapcar 'purecopy @@ -257,10 +261,10 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-christian-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'christian-holidays - 'holiday-christian-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'islamic-holidays + 'holiday-islamic-holidays "23.1") ;;;###autoload (defcustom holiday-islamic-holidays (mapcar 'purecopy @@ -281,10 +285,9 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-islamic-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'islamic-holidays - 'holiday-islamic-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'bahai-holidays 'holiday-bahai-holidays "23.1") ;;;###autoload (defcustom holiday-bahai-holidays (mapcar 'purecopy @@ -305,9 +308,9 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-bahai-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'bahai-holidays 'holiday-bahai-holidays "23.1") +;;;###autoload +(define-obsolete-variable-alias 'solar-holidays 'holiday-solar-holidays "23.1") ;;;###autoload (defcustom holiday-solar-holidays (mapcar 'purecopy @@ -328,8 +331,6 @@ See the documentation for `calendar-holidays' for details." :group 'holidays) ;;;###autoload (put 'holiday-solar-holidays 'risky-local-variable t) -;;;###autoload -(define-obsolete-variable-alias 'solar-holidays 'holiday-solar-holidays "23.1") ;; This one should not be autoloaded, else .emacs changes of ;; holiday-general-holidays etc have no effect. @@ -919,5 +920,4 @@ is non-nil)." (provide 'holidays) -;; arch-tag: 48eb3117-75a7-4dbe-8fd9-873c3cbb0d37 ;;; holidays.el ends here