From 9f60d7e9a27b107d5bd35bf9d7621a300e17dbfb Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 1 Feb 2016 20:53:44 -0500
Subject: [PATCH] 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.
---
 lisp/calendar/cal-china.el | 6 +++---
 lisp/calendar/calendar.el  | 4 ++++
 lisp/calendar/diary-lib.el | 2 ++
 lisp/calendar/solar.el     | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index cfddd6b6953..661a8185bf4 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -71,9 +71,6 @@ Default is for Beijing.  This is an expression in `year' since it changed at
 ;; It gets eval'd.
 ;;;###autoload
 (put 'calendar-chinese-time-zone 'risky-local-variable t)
-;;;###autoload
-(put 'chinese-calendar-time-zone 'risky-local-variable t)
-
 
 ;; FIXME unused.
 (defcustom calendar-chinese-location-name "Beijing"
@@ -98,6 +95,7 @@ Default is for no daylight saving time."
 This is an expression depending on `year' because it changed
 at 1928-01-01 00:00:00 from `PMT' to `CST'."
   :type 'sexp
+  :risky t
   :group 'calendar-chinese)
 
 (defcustom calendar-chinese-daylight-time-zone-name "CDT"
@@ -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
 `calendar-daylight-savings-starts'."
   :type 'sexp
+  :risky t
   :group 'calendar-chinese)
 
 (defcustom calendar-chinese-daylight-saving-end nil
@@ -125,6 +124,7 @@ Default is for no daylight saving time.  See documentation of
 Default is for no daylight saving time.  See documentation of
 `calendar-daylight-savings-ends'."
   :type 'sexp
+  :risky t
   :group 'calendar-chinese)
 
 (defcustom calendar-chinese-daylight-saving-start-time 0
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 5dec3eca52d..ccdae484fa6 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -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'
 \(which see)."
   :type 'sexp
+  :risky t
   :version "23.1"
   :group 'calendar)
 
@@ -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'
 \(which see)."
   :type 'sexp
+  :risky t
   :group 'calendar)
 
 (defcustom calendar-american-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'
 \(which see)."
   :type 'sexp
+  :risky t
   :group 'calendar)
 
 (defcustom calendar-date-display-form
@@ -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
 styles."
   :type 'sexp
+  :risky t
   :set-after '(calendar-date-style calendar-iso-date-display-form
                                    calendar-european-date-display-form
                                    calendar-american-date-display-form)
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 0523d8355b3..9ba4e358e38 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -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'
 \(a list of month, day, year), and `diary-entry' (a string)."
   :type 'sexp
+  :risky t
   :group 'diary)
 
 (defcustom diary-abbreviated-year-flag t
@@ -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."
   :group 'diary
   :type 'sexp
+  :risky t
   :initialize 'custom-initialize-default
   :set 'diary-set-header
   :version "23.3")                      ; frame-width -> window-width
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index eb64b770e86..15f5b7436cd 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -70,6 +70,7 @@ For example, the form
 
 would give military-style times like `21:07 (UTC)'."
   :type 'sexp
+  :risky t
   :group 'calendar)
 
 (defcustom calendar-latitude nil
@@ -131,6 +132,7 @@ variable `calendar-latitude' paired with the variable `calendar-longitude'.
 
 This variable should be set in `site-start'.el."
   :type 'sexp
+  :risky t
   :group 'calendar)
 
 (defcustom solar-error 0.5
-- 
2.39.2