Received: (at 70322) by debbugs.gnu.org; 10 Apr 2024 11:23:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 10 07:23:24 2024
Received: from localhost ([127.0.0.1]:52237 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ruW31-0004pu-7u
for submit <at> debbugs.gnu.org; Wed, 10 Apr 2024 07:23:24 -0400
Received: from mout.gmx.net ([212.227.15.15]:38495)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <stephen.berman@HIDDEN>) id 1ruW2v-0004oE-02
for 70322 <at> debbugs.gnu.org; Wed, 10 Apr 2024 07:23:21 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net;
s=s31663417; t=1712748181; x=1713352981; i=stephen.berman@HIDDEN;
bh=KsK05B3FA53amLpFI4BLn9sD6wvkG4+xPp/X3ntIw5I=;
h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:
Date;
b=Y+oYxnWLiyJYbsQdZZvJdAz4a8qQo5Uk9bmTrm0G+jUmRcrXkTY+nRQHWvlL/AUs
Ar5ZcPr8grVQlc7+UCrSpJBKcggtG1fVPoe4nL5USmSh8VXbnQg/OepHBneiZ2x4s
idehi/R3jhBS7qEcLl3gcR0CA8POp3XH8WfMEKA9+k3UVNY2Tzb38PSptlIEam70b
rc/HrFtCAMGXhmHoLX5+d0FwBsYtcy2tOaYuce64gP4lE3XLJFcc9VEgOpgxwutW5
83r1jdifBzDrudLxuM5tQbLjdDQDeO3xq9w9Cfx51r1lJcmcCpbYZsSk1CzpsTE4t
PZR/S+uA++JizL0Glw==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
Received: from strobelfs ([94.134.94.133]) by mail.gmx.net (mrgmx005
[212.227.17.190]) with ESMTPSA (Nemesis) id 1MJVHe-1sEFqu401g-00JuWR; Wed, 10
Apr 2024 13:23:01 +0200
From: Stephen Berman <stephen.berman@HIDDEN>
To: Herman <at> debbugs.gnu.org
Subject: Re: bug#70322: 30.0.50; format-seconds with %z doesn't handle zero
input correctly
In-Reply-To: <87v84pa67l.fsf@HIDDEN> (Herman <at> debbugs.gnu.org's message of
"Wed, 10 Apr 2024 11:59:42 +0200")
References: <87v84pa67l.fsf@HIDDEN>
Date: Wed, 10 Apr 2024 13:23:00 +0200
Message-ID: <875xwpjwbv.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Provags-ID: V03:K1:qYVMyi8inbyfLeusoGKYo/WQ54ovbs4PrBE8izhTRrWKkOJ8QCA
+diO2AocEoGz2zWwfZt3GntovUU4jGhbeE84+ibsh51hGzZZ+eTVFhUW7WtKH9W6dr0IdiM
vyBO1HAEmRWjYgWnQ9eORIGgXxWZuJhavqaIF6uODTm/mEkQzt4ykvAldIX8D5CHQkta1FD
pOE/pF9+l0ScKi0wStlWg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:AoV6oyiSzkM=;4U1xV4csSQExcGsewEPrxnLhMFy
NnMvAPZoXYOeEA+scNPOY6DsJtKgfu7322cIhKw9AsMNCfbK3xtE5nQLkvBuhknkHizL49/nD
vj2EB0IgjFydTDZQ7cBp6lK1FQ0Ldoum4lKB5jLirbYV1cEvs3KA1NLouhg4qeugMKyFIjfaz
K4kmH2I9l5FNav0lD/tWvUUTEGgf9Dn8fTltGO4bXB5MPEHk4JRXCupBZ9Pu8BHcBwfDhc0uZ
BtePbyJRagF2T2Itbd/RtQkbgS8YD8kYZDHNajXb+Wu6TJOuCNeQoe4RjD+kfvegUBm/ECflf
i4swQ5WPj8ks4hLg/sbJ3MxRfe4QFIvexRThbgDIiQmdOX2qSoF3Aakq79GsQbo3cS1xE/+aC
4b0NsLe4XXgbtcQTy8bXvnYYP1439IBb7nIWRq7bPlGGJRonlMTlJUv/WcE/lgu7sZi2tGuBG
uytnIyZxE4Yxghj9qnpL4AMAtIrbT8fMOi7Ymyb7Gf07A+5zLZnZT6+EZga2ngSd+Ewn+NoMN
xYn/H4NhJHZTBEobaJBm5q4zmeZ+LkEcdikh4Ejx0ZfcPPLlZVo5+pK0rfE1O+pyh99P95g/3
JXqS/eJe3RNt/4bmnUUoB4Nv/aBv27GR6P/luK3YZaEYwMN9PwiMZHIEA33KS9KpTS5+LZvG5
ATjrhJUEEK2WXBeGCiDvlE2K1HOH+aVtXoyygwqaM/lwyz5PfsmiYTA1FTf6+KVXpDQQdBkap
/nAOJAiG74UuSIq5MYynTtmzzee9pea/kBXSf+oyWywPMCjiZdJK3yhiQcGXh9fA/PH3iD7em
xMnR5R0J8JhAJRO0r4fBFcGciwj2eWEuF8+C0/5hTrhQI=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 70322
Cc: =?utf-8?Q?G=C3=A9za?= <geza.herman@HIDDEN>, 70322 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On Wed, 10 Apr 2024 11:59:42 +0200 Herman <at> debbugs.gnu.org, G=C3=A9za <geza.=
herman@HIDDEN> wrote:
> When the input seconds is 0, format-seconds emits the full string. For
> example,
>
> (format-seconds "%Y, %D, %H, %M, %z%S" 0)
>
> returns "0 years, 0 days, 0 hours, 0 minutes, 0 seconds"
>
> instead of "0 seconds".
>
> (format-seconds "%Y, %D, %H, %M, %z%S" 1) correctly returns "1 second".
The attached patch seems to fix this.
Steve Berman
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment
Content-Description: format-seconds patch
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index e96e2e7e2db..59e236ce3c5 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -352,9 +352,13 @@ format-seconds
;; Cf article-make-date-line in gnus-art.
(setq num (floor seconds unit)
seconds (- seconds (* num unit)))
- (let ((is-zero (zerop (if (= unit 1)
- (+ num fraction)
- num))))
+ (let ((is-zero (if (and (zerop seconds) (= unit 1))
+ ;; Also drop leading units when SECONDS is
+ ;; 0 (bug#70322).
+ nil
+ (zerop (if (= unit 1)
+ (+ num fraction)
+ num)))))
;; Start position of the first non-zero unit.
(when (and (not leading-zeropos)
(not is-zero))
--=-=-=--
bug-gnu-emacs@HIDDEN:bug#70322; Package emacs.
Full text available.Received: (at submit) by debbugs.gnu.org; 10 Apr 2024 10:00:09 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 10 06:00:08 2024 Received: from localhost ([127.0.0.1]:52190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ruUkS-0003c2-5X for submit <at> debbugs.gnu.org; Wed, 10 Apr 2024 06:00:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <geza.herman@HIDDEN>) id 1ruUkQ-0003ae-6A for submit <at> debbugs.gnu.org; Wed, 10 Apr 2024 06:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <geza.herman@HIDDEN>) id 1ruUkA-0006KM-Va for bug-gnu-emacs@HIDDEN; Wed, 10 Apr 2024 05:59:50 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <geza.herman@HIDDEN>) id 1ruUk8-0004aU-7i for bug-gnu-emacs@HIDDEN; Wed, 10 Apr 2024 05:59:50 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a52140ea1b5so31633266b.1 for <bug-gnu-emacs@HIDDEN>; Wed, 10 Apr 2024 02:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712743184; x=1713347984; darn=gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=P50QyjqBfVInAwmCbENvvl1iA56ai6RHh+i0uJ5YSoQ=; b=Gg7xY8wYS9f4fLiWXFz0zPu7xbKmi07P+Jr00V4iwrS4AEOfBaeZXuFu4MmLDALL3I 2ez3jmURKSCKWJb3dNjMI41XUXlSA7D6jwoCRnoDACS43Cn0t5USN4WpIqMoaN3w/aJL T/PUSspspizsVbQqqPAGubEkG1/ODtwwQPPYUFJtqqCVlxyfe+nGz5VdcI5h4dVcdbT3 MRd39z3cuEhq1WFatc+epBOgV5c39Zjnjd16gEKhDfR88NipGxnnY2o1rmkUMQbWhHUV 4PtK05+l+nHbiCu33GIPkvydZfQnVzA2X+Q0i7MJ+l9IaSKg9aaah5gWiT5P0NZi9XdD 0Ing== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712743184; x=1713347984; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=P50QyjqBfVInAwmCbENvvl1iA56ai6RHh+i0uJ5YSoQ=; b=LTDk77Y3EW6mprl/XJjXvYWM6go7nilzbZOqbj25P/dwH4MMDobSbxjBMGhGm4ywBf /k/pb7ce0TtO0TuPwkrAOTG3oB20yQSRyW6KLMo09Or/pTUcB3I17UatzowDyHVI7WF/ Dx0SdngiVceLV775/+M4McqPJuj4OgnCHPC/eF+rpi+6AINdGOzBZmUHI40vHNF6bmJu hcDKCsEgPuxZM6LTIbT0I/zLst6Fp6H309YSbPM7xH7afYRL6K39Jfd5v0UV333Z/h6H B3PqrAYj3DMI5oM7CFVXad8z7h4IliEGfXIfxQC/18t3qjnJ93W6/gAxfOYuuak7r8uZ vw1g== X-Gm-Message-State: AOJu0YzgBqnfbcuIJnO8U8tIbwCi5StP4ICkOhNeLShzv/PRmmgHodXD klhZRaUGkf05G2LwWY3mnQn3p3V1oILoJsAcjxpv/CiqwN7r5YCCSczYyMVh X-Google-Smtp-Source: AGHT+IFi7CL9Lj5CT/AL1LBajtnIGfEvl4OIQms8Jy3Hzfc3qBBrkz8QJPgGpM6/S44pBdZjGiLQhw== X-Received: by 2002:a17:906:184a:b0:a52:882:abaa with SMTP id w10-20020a170906184a00b00a520882abaamr1139132eje.76.1712743183921; Wed, 10 Apr 2024 02:59:43 -0700 (PDT) Received: from localhost (netacc-gpn-104-0-194.pool.yettel.hu. [91.104.0.194]) by smtp.gmail.com with ESMTPSA id nb16-20020a1709071c9000b00a51e6222200sm2245946ejc.156.2024.04.10.02.59.43 for <bug-gnu-emacs@HIDDEN> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 02:59:43 -0700 (PDT) From: =?utf-8?Q?Herman=2C_G=C3=A9za?= <geza.herman@HIDDEN> To: bug-gnu-emacs@HIDDEN Subject: 30.0.50; format-seconds with %z doesn't handle zero input correctly X-Debbugs-Cc: Date: Wed, 10 Apr 2024 11:59:42 +0200 Message-ID: <87v84pa67l.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=geza.herman@HIDDEN; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) When the input seconds is 0, format-seconds emits the full string. For example, (format-seconds "%Y, %D, %H, %M, %z%S" 0) returns "0 years, 0 days, 0 hours, 0 minutes, 0 seconds" instead of "0 seconds". (format-seconds "%Y, %D, %H, %M, %z%S" 1) correctly returns "1 second". In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, cairo version 1.18.0) of 2024-03-23 built on okoska Repository revision: c552cb98ad4ffbec91db52cde71cf3e0fa76e0dc Repository branch: my-modifications Windowing system distributor 'The X.Org Foundation', version 11.0.12101008 System Description: Debian GNU/Linux trixie/sid Configured using: 'configure --with-native-compilation --without-compress-install --without-gconf --without-gsettings --without-dbus --with-small-ja-dic --with-json --with-xinput2 --with-x-toolkit=no --with-tree-sitter --with-cairo --with-cairo-xcb --disable-silent-rules 'CFLAGS=-mtune=native -march=native -g3 -O3'' Configured features: ACL CAIRO FREETYPE GIF GLIB GMP GNUTLS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NATIVE_COMP NOTIFY INOTIFY OLDXMENU PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TREE_SITTER WEBP X11 XDBE XIM XINPUT2 XPM ZLIB Important settings: value of $LC_ALL: C.UTF-8 value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=none locale-coding-system: utf-8-unix Major mode: Fundamental Minor modes in effect: vertico-multiform-mode: t recentf-mode: t which-key-mode: t global-auto-revert-mode: t savehist-mode: t ws-butler-global-mode: t ws-butler-mode: t diff-hl-flydiff-mode: t global-diff-hl-mode: t clean-aindent-mode: t global-whitespace-mode: t marginalia-mode: t vertico-mode: t global-anzu-mode: t anzu-mode: t global-evil-matchit-mode: t evil-matchit-mode: t evil-snipe-override-mode: t evil-snipe-mode: t evil-snipe-override-local-mode: t evil-snipe-local-mode: t global-evil-surround-mode: t evil-surround-mode: t global-evil-visualstar-mode: t evil-visualstar-mode: t better-jumper-mode: t better-jumper-local-mode: t evil-leader-mode: t global-evil-leader-mode: t global-hl-todo-mode: t winum-mode: t hes-mode: t gcmh-mode: t global-page-break-lines-mode: t evil-mode: t evil-local-mode: t save-place-mode: t override-global-mode: t minibuffer-depth-indicate-mode: t tooltip-mode: t global-eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tab-bar-history-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t minibuffer-regexp-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t abbrev-mode: t Load-path shadows: /home/geza/.emacs.d/elpa/transient-20240226.2332/transient hides /usr/local/share/emacs/30.0.50/lisp/transient ~/.emacs.d/lisp/emacs-gdb/gdb-mi hides /usr/local/share/emacs/30.0.50/lisp/progmodes/gdb-mi Features: (shadow sort project mail-extr emacsbug message mailcap yank-media puny evil-collection-dired dired-git-info peep-dired dired-narrow delsel dired-filter f s dired-aux dired-x dired-subtree dired-hacks-utils evil-collection-wdired wdired ls-lisp dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util time-date mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils mule-util cursor-sensor evil-collection-consult consult-dir vertico-multiform consult-compile compile evil-collection-comint comint ansi-osc ansi-color recentf tree-widget wid-edit shut-up consult bookmark text-property-search pp face-remap drag-stuff which-key autorevert filenotify savehist bm evil-collection-info info ws-butler diff-hl-flydiff diff diff-hl log-view pcvs-util vc-dir ewoc vc vc-dispatcher diff-mode clean-aindent-mode column-enforce-mode whitespace orderless marginalia vertico anzu evil-matchit evil-matchit-evil-setup evil-matchit-sdk semantic/lex semantic/fw eieio eieio-core mode-local find-func evil-exchange evil-args evil-indent-plus evil-textobj-line evil-textobj-entire evil-textobj-column evil-textobj-anyblock evil-snipe evil-surround evil-mc evil-mc-command-execute evil-mc-command-record evil-mc-cursor-make evil-mc-region evil-mc-cursor-state evil-mc-undo evil-mc-vars evil-mc-known-commands evil-mc-common avy evil-visualstar evil-collection-simple evil-collection-replace evil-collection annalist better-jumper pcase cl-macs evil-leader hl-todo compat hl-line transpose-frame winum dash ov highlight-escape-sequences gcmh page-break-lines evil evil-integration evil-maps evil-commands reveal evil-jumps evil-command-window evil-types evil-search evil-ex evil-macros evil-repeat evil-states evil-core evil-common thingatpt rect evil-vars ring edmacro kmacro byte-opt saveplace bind-key easy-mmode advice mb-depth comp cl-seq comp-cstr cl-extra help-mode warnings icons subr-x gv cl-loaddefs cl-lib comp-run bytecomp byte-compile comp-common rx rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd touch-screen tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads inotify lcms2 dynamic-setting font-render-setting cairo xinput2 x multi-tty move-toolbar make-network-process native-compile emacs) Memory information: ((conses 16 267620 317533) (symbols 48 22835 189) (strings 32 73149 28252) (string-bytes 1 3065253) (vectors 16 36191) (vector-slots 8 422531 144718) (floats 8 230 208) (intervals 56 1888 275) (buffers 984 12))
Herman, Géza <geza.herman@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#70322; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.