Commit 9f60d7e9 authored by Glenn Morris's avatar Glenn Morris

Mark some risky calendar variables.

* lisp/calendar/cal-china.el (chinese-calendar-time-zone):
Remove risky setting for deleted obsolete alias.
(calendar-chinese-standard-time-zone-name)
(calendar-chinese-daylight-saving-start)
(calendar-chinese-daylight-saving-end):
* lisp/calendar/calendar.el (calendar-iso-date-display-form)
(calendar-european-date-display-form)
(calendar-american-date-display-form, calendar-date-display-form):
* lisp/calendar/diary-lib.el (diary-remind-message)
(diary-header-line-format):
* lisp/calendar/solar.el (calendar-time-display-form)
(calendar-location-name): Mark as risky.
parent 1d07dcd7
...@@ -71,9 +71,6 @@ Default is for Beijing. This is an expression in `year' since it changed at ...@@ -71,9 +71,6 @@ Default is for Beijing. This is an expression in `year' since it changed at
;; It gets eval'd. ;; It gets eval'd.
;;;###autoload ;;;###autoload
(put 'calendar-chinese-time-zone 'risky-local-variable t) (put 'calendar-chinese-time-zone 'risky-local-variable t)
;;;###autoload
(put 'chinese-calendar-time-zone 'risky-local-variable t)
;; FIXME unused. ;; FIXME unused.
(defcustom calendar-chinese-location-name "Beijing" (defcustom calendar-chinese-location-name "Beijing"
...@@ -98,6 +95,7 @@ Default is for no daylight saving time." ...@@ -98,6 +95,7 @@ Default is for no daylight saving time."
This is an expression depending on `year' because it changed This is an expression depending on `year' because it changed
at 1928-01-01 00:00:00 from `PMT' to `CST'." at 1928-01-01 00:00:00 from `PMT' to `CST'."
:type 'sexp :type 'sexp
:risky t
:group 'calendar-chinese) :group 'calendar-chinese)
(defcustom calendar-chinese-daylight-time-zone-name "CDT" (defcustom calendar-chinese-daylight-time-zone-name "CDT"
...@@ -115,6 +113,7 @@ at 1928-01-01 00:00:00 from `PMT' to `CST'." ...@@ -115,6 +113,7 @@ at 1928-01-01 00:00:00 from `PMT' to `CST'."
Default is for no daylight saving time. See documentation of Default is for no daylight saving time. See documentation of
`calendar-daylight-savings-starts'." `calendar-daylight-savings-starts'."
:type 'sexp :type 'sexp
:risky t
:group 'calendar-chinese) :group 'calendar-chinese)
(defcustom calendar-chinese-daylight-saving-end nil (defcustom calendar-chinese-daylight-saving-end nil
...@@ -125,6 +124,7 @@ Default is for no daylight saving time. See documentation of ...@@ -125,6 +124,7 @@ Default is for no daylight saving time. See documentation of
Default is for no daylight saving time. See documentation of Default is for no daylight saving time. See documentation of
`calendar-daylight-savings-ends'." `calendar-daylight-savings-ends'."
:type 'sexp :type 'sexp
:risky t
:group 'calendar-chinese) :group 'calendar-chinese)
(defcustom calendar-chinese-daylight-saving-start-time 0 (defcustom calendar-chinese-daylight-saving-start-time 0
......
...@@ -850,6 +850,7 @@ For examples of three common styles, see `diary-american-date-forms', ...@@ -850,6 +850,7 @@ For examples of three common styles, see `diary-american-date-forms',
Normally you should not customize this, but `calendar-date-display-form' Normally you should not customize this, but `calendar-date-display-form'
\(which see)." \(which see)."
:type 'sexp :type 'sexp
:risky t
:version "23.1" :version "23.1"
:group 'calendar) :group 'calendar)
...@@ -859,6 +860,7 @@ Normally you should not customize this, but `calendar-date-display-form' ...@@ -859,6 +860,7 @@ Normally you should not customize this, but `calendar-date-display-form'
Normally you should not customize this, but `calendar-date-display-form' Normally you should not customize this, but `calendar-date-display-form'
\(which see)." \(which see)."
:type 'sexp :type 'sexp
:risky t
:group 'calendar) :group 'calendar)
(defcustom calendar-american-date-display-form (defcustom calendar-american-date-display-form
...@@ -867,6 +869,7 @@ Normally you should not customize this, but `calendar-date-display-form' ...@@ -867,6 +869,7 @@ Normally you should not customize this, but `calendar-date-display-form'
Normally you should not customize this, but `calendar-date-display-form' Normally you should not customize this, but `calendar-date-display-form'
\(which see)." \(which see)."
:type 'sexp :type 'sexp
:risky t
:group 'calendar) :group 'calendar)
(defcustom calendar-date-display-form (defcustom calendar-date-display-form
...@@ -892,6 +895,7 @@ would give the usual American style in fixed-length fields. The variables ...@@ -892,6 +895,7 @@ would give the usual American style in fixed-length fields. The variables
`calendar-american-date-display-form' provide some defaults for three common `calendar-american-date-display-form' provide some defaults for three common
styles." styles."
:type 'sexp :type 'sexp
:risky t
:set-after '(calendar-date-style calendar-iso-date-display-form :set-after '(calendar-date-style calendar-iso-date-display-form
calendar-european-date-display-form calendar-european-date-display-form
calendar-american-date-display-form) calendar-american-date-display-form)
......
...@@ -296,6 +296,7 @@ Used by the function `diary-remind', a pseudo-pattern is a list of ...@@ -296,6 +296,7 @@ Used by the function `diary-remind', a pseudo-pattern is a list of
expressions that can involve the keywords `days' (a number), `date' expressions that can involve the keywords `days' (a number), `date'
\(a list of month, day, year), and `diary-entry' (a string)." \(a list of month, day, year), and `diary-entry' (a string)."
:type 'sexp :type 'sexp
:risky t
:group 'diary) :group 'diary)
(defcustom diary-abbreviated-year-flag t (defcustom diary-abbreviated-year-flag t
...@@ -412,6 +413,7 @@ The format of the header is specified by `diary-header-line-format'." ...@@ -412,6 +413,7 @@ The format of the header is specified by `diary-header-line-format'."
Only used if `diary-header-line-flag' is non-nil." Only used if `diary-header-line-flag' is non-nil."
:group 'diary :group 'diary
:type 'sexp :type 'sexp
:risky t
:initialize 'custom-initialize-default :initialize 'custom-initialize-default
:set 'diary-set-header :set 'diary-set-header
:version "23.3") ; frame-width -> window-width :version "23.3") ; frame-width -> window-width
......
...@@ -70,6 +70,7 @@ For example, the form ...@@ -70,6 +70,7 @@ For example, the form
would give military-style times like `21:07 (UTC)'." would give military-style times like `21:07 (UTC)'."
:type 'sexp :type 'sexp
:risky t
:group 'calendar) :group 'calendar)
(defcustom calendar-latitude nil (defcustom calendar-latitude nil
...@@ -131,6 +132,7 @@ variable `calendar-latitude' paired with the variable `calendar-longitude'. ...@@ -131,6 +132,7 @@ variable `calendar-latitude' paired with the variable `calendar-longitude'.
This variable should be set in `site-start'.el." This variable should be set in `site-start'.el."
:type 'sexp :type 'sexp
:risky t
:group 'calendar) :group 'calendar)
(defcustom solar-error 0.5 (defcustom solar-error 0.5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment