martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Browse Source
This commit is contained in:
Eli Zaretskii
2022-04-13 17:00:59 +03:00
parent 131ac4d209 0ef9f6d07b
commit e14e5dff2c
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lisp/calendar/time-date.el
View File

@@ -343,15 +343,18 @@ right of \"%x\", trailing zero units are not output."
;; Cf article-make-date-line in gnus-art.
(setq num (floor seconds unit)
seconds (- seconds (* num unit)))
;; Start position of the first non-zero unit.
(when (and (not leading-zeropos)
(not (zerop num)))
(setq leading-zeropos (match-beginning 0)))
(unless (zerop num)
(setq trailing-zeropos nil))
(when (and (not trailing-zeropos)
(zerop num))
(setq trailing-zeropos (match-beginning 0)))
(let ((is-zero (zerop (if (= unit 1)
(+ num fraction)
num))))
;; Start position of the first non-zero unit.
(when (and (not leading-zeropos)
(not is-zero))
(setq leading-zeropos (match-beginning 0)))
(unless is-zero
(setq trailing-zeropos nil))
(when (and (not trailing-zeropos)
is-zero)
(setq trailing-zeropos (match-beginning 0))))
(setq string
(replace-match
(format (if (match-string 2 string)