mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

time-stamp-time-zone: update customization

Browse Source 
* time-stamp.el (time-stamp-time-zone): Support customization with
an integer offset (a new possible value of the ZONE argument to
format-time-string in Emacs 27).
Update the safe-local-variable predicate from string-or-null-p
(describing time-stamp-time-zone's domain before 2015) to new
predicate time-stamp-zone-type-p (describing the current domain).

* time-stamp-tests.el (time-stamp-test-helper-zone-type-p): New test.
This commit is contained in:
Stephen Gildea 2019-10-27 08:20:13 -07:00
parent fc0f98a8a8
commit 113ff954db
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/time-stamp.el
View File

@ -109,10 +109,26 @@ Its format is that of the ZONE argument of the `format-time-string' function."
:type '(choice (const :tag "Emacs local time" nil)
(const :tag "Universal Time" t)
(const :tag "system wall clock time" wall)
(string :tag "TZ environment variable value"))
(string :tag "TZ environment variable value")
(list :tag "Offset and name"
(integer :tag "Offset (seconds east of UTC)")
(string :tag "Time zone abbreviation"))
(integer :tag "Offset (seconds east of UTC)"))
:group 'time-stamp
:version "20.1")
;;;###autoload(put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p)
;;;###autoload(put 'time-stamp-time-zone 'safe-local-variable 'time-stamp-zone-type-p)
;;;###autoload
(defun time-stamp-zone-type-p (zone)
"Return whether or not ZONE is of the correct type for a timezone rule.
Valid ZONE values are described in the documentation of `format-time-string'."
(or (memq zone '(nil t wall))
(stringp zone)
(and (consp zone)
(integerp (car zone))
(consp (cdr zone))
(stringp (cadr zone)))
(integerp zone)))
;;; Do not change time-stamp-line-limit, time-stamp-start,
;;; time-stamp-end, time-stamp-pattern, time-stamp-inserts-lines,

19
test/lisp/time-stamp-tests.el
View File

@ -57,6 +57,8 @@
;;; Tests:
;;; Tests of time-stamp-string formatting
(ert-deftest time-stamp-test-format-day-of-week ()
"Test time-stamp formats for named day of week."
(with-time-stamp-test-env
@ -360,4 +362,21 @@
(should (equal (time-stamp-string "%#3a" ref-time3) "SUN"))
(should (equal (time-stamp-string "%#3b" ref-time2) "NOV"))))
;;; Tests of helper functions
(ert-deftest time-stamp-test-helper-zone-type-p ()
"Test time-stamp-zone-type-p."
(should (time-stamp-zone-type-p t))
(should (time-stamp-zone-type-p nil))
(should (time-stamp-zone-type-p 'wall))
(should-not (time-stamp-zone-type-p 'floor))
(should (time-stamp-zone-type-p "arbitrary string"))
(should (time-stamp-zone-type-p 0))
(should-not (time-stamp-zone-type-p 3.14))
(should-not (time-stamp-zone-type-p '(0)))
(should-not (time-stamp-zone-type-p '(0 . "A")))
(should (time-stamp-zone-type-p '(0 "A")))
(should-not (time-stamp-zone-type-p '(0 0)))
(should-not (time-stamp-zone-type-p '("A" "A"))))
;;; time-stamp-tests.el ends here