diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-11-10 12:12:30 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-11-10 12:12:30 +0100 |
| commit | acf408934d771fe652fbd5a73e96cc12d93362c0 (patch) | |
| tree | 6507b1530f434fadede65e35d096505b7a098e33 /test/lisp | |
| parent | d7e7f92fc3752ab3db64bb72321d76dc9e6b43e4 (diff) | |
| parent | 8d81ab374da4d159cd05cd8caaaae2390829ccee (diff) | |
| download | emacs-acf408934d771fe652fbd5a73e96cc12d93362c0.tar.gz emacs-acf408934d771fe652fbd5a73e96cc12d93362c0.tar.bz2 emacs-acf408934d771fe652fbd5a73e96cc12d93362c0.zip | |
Merge from origin/emacs-28
8d81ab374d time-stamp: %F is "file name" not "pathname" + other doc
beaa7e14f3 ; Fix typos in CONTRIBUTE, ELisp manual, ediff
747a1ae4ac * doc/misc/eww.texi (Advanced): Fix missed variable name e...
52fe2340b8 * doc/emacs/windows.texi (Window Convenience): Use @code f...
7d3a654e2a * doc/emacs/maintaining.texi (Basic VC Editing): Mention D...
aeb19af4b5 ; * doc/emacs/building.texi (Lisp Libraries): Fix a typo. ...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'test/lisp')
| -rw-r--r-- | test/lisp/time-stamp-tests.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/lisp/time-stamp-tests.el b/test/lisp/time-stamp-tests.el index fa9edcbd407..cb446eb486e 100644 --- a/test/lisp/time-stamp-tests.el +++ b/test/lisp/time-stamp-tests.el @@ -704,9 +704,10 @@ ;;;; Setup for tests of time offset formatting with %z (defun formatz (format zone) - "Uses time FORMAT string to format the offset of ZONE, returning the result. -FORMAT is \"%z\" or a variation. -ZONE is as the ZONE argument of the `format-time-string' function." + "Uses FORMAT to format the offset of ZONE, returning the result. +FORMAT must be time format \"%z\" or some variation thereof. +ZONE is as the ZONE argument of the `format-time-string' function. +This function is called by 99% of the `time-stamp' \"%z\" unit tests." (with-time-stamp-test-env (let ((time-stamp-time-zone zone)) ;; Call your favorite time formatter here. @@ -718,9 +719,9 @@ ZONE is as the ZONE argument of the `format-time-string' function." (defun format-time-offset (format offset-secs) "Uses FORMAT to format the time zone represented by OFFSET-SECS. -FORMAT must be \"%z\", possibly with a flag and padding. +FORMAT must be time format \"%z\" or some variation thereof. This function is a wrapper around `time-stamp-formatz-from-parsed-options' -and is used for testing." +and is called by some low-level `time-stamp' \"%z\" unit tests." ;; This wrapper adds a simple regexp-based parser that handles only ;; %z and variants. In normal use, time-stamp-formatz-from-parsed-options ;; is called from a parser that handles all time string formats. |