From unknown Sat Aug 09 05:06:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64069: 30.0.50; Mistyped shy group regexps Resent-From: Basil Contovounesios Original-Sender: "Debbugs-submit" Resent-CC: acm@muc.de, dmitry@gutov.dev, eggert@cs.ucla.edu, mattias.engdegard@gmail.com, bug-gnu-emacs@gnu.org Resent-Date: Wed, 14 Jun 2023 16:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64069 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 64069@debbugs.gnu.org Cc: Alan Mackenzie , Dmitry Gutov , Paul Eggert , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Alan Mackenzie , Dmitry Gutov , Paul Eggert , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Received: via spool by submit@debbugs.gnu.org id=B.168676103813890 (code B ref -1); Wed, 14 Jun 2023 16:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jun 2023 16:43:58 +0000 Received: from localhost ([127.0.0.1]:45348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9TbB-0003bv-71 for submit@debbugs.gnu.org; Wed, 14 Jun 2023 12:43:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:48684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9Tb8-0003bl-Tw for submit@debbugs.gnu.org; Wed, 14 Jun 2023 12:43:55 -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 ) id 1q9Tb8-0001Km-67 for bug-gnu-emacs@gnu.org; Wed, 14 Jun 2023 12:43:54 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q9Tb1-0008Ul-0G for bug-gnu-emacs@gnu.org; Wed, 14 Jun 2023 12:43:51 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1b3d8aa2c17so19775485ad.3 for ; Wed, 14 Jun 2023 09:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1686761023; x=1689353023; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=K5BJDLlWPLiUd6fqvhpiNQljJwlk4AH3lPK/7z/hYKg=; b=SISKJOrvnVX+4NK8gPCbhM2x3ViCH7cV6RL9CQG4BzIVF34AaFTod51bIOBq/D6Rnq T+FzgygfyaPszZf7tJi1zOQntdfh3YuOcmm0Eekcns//mBA39cyXzaCCj9o0rRf8Vnv0 fQYFZ6IM7xNTsw3zON7paWsG5mLdbfbgbKgd4GW5kPSS9le+7ObCea9WEjqjmCrobfgU uwrb4jzRvE2llTieMTydBrTp644moI7hHmJJuZl7v1CwwpWb6Pvcm1Gl7y9kxmdaMOv+ z7ARP9QmcsDJfy5HR+yjz+qFfcFGmvL/AOZAPiWZlJziJAD5B7a7/jGI0dVxSyWW35qI fzzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686761023; x=1689353023; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=K5BJDLlWPLiUd6fqvhpiNQljJwlk4AH3lPK/7z/hYKg=; b=PFhwbYRd1hP7h16bQ/0hA+3j6HUnUVWXGGKZEsqZ/SFaR1LLNB5WT+eFJzvPYgAbyR rRkofi6KjyiZO9EA0JkPSjQTOGftOTiLTFIYPd+6wH9NHCFWQvFqjodhgAcinLWPa9+b IjlKh6vMcPmmffIGM5VIHcvLY/xr05zPLQ/VlibJw0h4njW19hyFt/PfkaA7QzBpARJK AiYWkfSjRmYylXFt0DUYxmVmpZgIPInihGoU6YVbt2ThKu71w5EhsvxhWxH1KbP9FD/V SFFcQbafPF0k3qIsIcvq6ybCnVK/t5iUwHvWkfYQmIuBJU6U+bCCnYFZ/L+7cqfXt2mo Rcnw== X-Gm-Message-State: AC+VfDwr0ROh1XC8FQA3/S01OYS1vU4Sg7fMVinTVBON6eGWRRDHy2tR j+V7k0O9sFHDEb0fNujs+rtsu6qpEHwmShVzH0Q= X-Google-Smtp-Source: ACHHUZ5MfyLqsVToSDbEt5ryihera7qZ45gbipfuUiDk2OwQHCyJpG/dRtDxqwp1rpXkNMdsxDvziw== X-Received: by 2002:a17:902:e5c5:b0:1a6:b23c:3bf2 with SMTP id u5-20020a170902e5c500b001a6b23c3bf2mr16075196plf.10.1686761022964; Wed, 14 Jun 2023 09:43:42 -0700 (PDT) Received: from localhost ([64.43.152.143]) by smtp.gmail.com with ESMTPSA id z24-20020a1709028f9800b001b016313b1esm12426917plo.82.2023.06.14.09.43.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 09:43:42 -0700 (PDT) From: Basil Contovounesios Date: Wed, 14 Jun 2023 17:43:39 +0100 Message-ID: <87v8fq570k.fsf@epfl.ch> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=contovob@tcd.ie; helo=mail-pl1-x62d.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Severity: minor Tags: patch Further to https://bugs.gnu.org/64019#14, I attach a patch which tweaks four redundant or seemingly mistyped instances of \(:?...\), i.e. a numbered group starting with an optional colon in place of the likelier shy group. CCing: - Alan to review the change to c-or-c++-mode--regexp (along with its clone c-ts-mode--c-or-c++-regexp) - Dmitry to review the change in vc-git - Paul for any comments on the time handling in vc-git-annotate-time In vc-git-annotate-time, the mistyped group added in [1] throws off the match string indices that are later passed to encode-time: by my reading the hour argument by chance continues to be specified correctly, but the minutes argument receives the number of hours, the seconds argument the number of minutes, and the timezone argument the number of seconds. [1]: Display shorter dates in Git annotate output 576fba5f58d 2015-05-17 02:47:17 +0300 https://git.sv.gnu.org/cgit/emacs.git/commit/?id=576fba5f58d Even after correcting the shy group, the timezone parsing doesn't seem right to me: encode-time expects a UTC offset in seconds, but is passed e.g. (string-to-number "+0100")=100s instead of the expected 1hr=3600s. IMO there is another minor issue with the regexp towards its end: \([-+0-9]+\) *[0-9]+ The trailing line number should be separated from the preceding timestamp by at least one space. So, the optional space would ideally precede rather than follow the optional time+zone components. The patch fixes this and the match/timezone handling by splitting the datetime string into only three components (date, time, zone) and delegating to iso8601-parse. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-some-shy-group-regexps.patch >From 9ead0ba1dd2676105269ff1472a206a250539b18 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Mon, 12 Jun 2023 00:23:56 +0100 Subject: [PATCH] Fix some shy group regexps These issues were caught by modified versions of the GNU ELPA packages xr and relint: - https://github.com/mattiase/xr/pull/6 - https://github.com/mattiase/relint/pull/14 * lisp/gnus-art.el (gnus-parse-news-url): Remove redundant numbered group and calls to match-string. * lisp/progmodes/c-ts-mode.el (c-ts-mode--c-or-c++-regexp): * lisp/progmodes/cc-mode.el (c-or-c++-mode--regexp): Fix shy group mistyped as optional colon (bug#64019#29). * lisp/vc/vc-git.el (vc-git-annotate-time): Ditto. Also fix timezone parsing by using iso8601-parse. * test/lisp/vc/vc-git-tests.el (vc-git-test-annotate-time): New test. --- lisp/gnus/gnus-art.el | 7 +++---- lisp/progmodes/c-ts-mode.el | 2 +- lisp/progmodes/cc-mode.el | 2 +- lisp/vc/vc-git.el | 19 ++++++++++++------- test/lisp/vc/vc-git-tests.el | 17 +++++++++++++++++ 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 6a7a3f41746..6f201f9c3df 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -8331,11 +8331,10 @@ gnus-parse-news-url (when (looking-at "\\([A-Za-z]+\\):") (setq scheme (match-string 1)) (goto-char (match-end 0))) - (when (looking-at "//\\([^:/]+\\)\\(:?\\)\\([0-9]+\\)?/") + (when (looking-at "//\\([^:/]+\\):?\\([0-9]+\\)?/") (setq server (match-string 1)) - (setq port (if (stringp (match-string 3)) - (string-to-number (match-string 3)) - (match-string 3))) + (setq port (and (match-beginning 2) + (string-to-number (match-string 2)))) (goto-char (match-end 0))) (cond diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 4b83c6733a2..9e911192be3 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -1355,7 +1355,7 @@ c-ts-mode--c-or-c++-regexp "\\|" id "::" "\\|" id ws-maybe "=\\)" "\\|" "\\(?:inline" ws "\\)?namespace" - "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" + "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" "\\|" "class" ws id "\\(?:" ws "final" "\\)?" ws-maybe "[:{;\n]" "\\|" "struct" ws id "\\(?:" ws "final" ws-maybe "[:{\n]" diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 11a1d3fe6c2..5cf9b7e17f8 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -2859,7 +2859,7 @@ c-or-c++-mode--regexp "\\|" id "::" "\\|" id ws-maybe "=\\)" "\\|" "\\(?:inline" ws "\\)?namespace" - "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" + "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" "\\|" "class" ws id "\\(?:" ws "final" "\\)?" ws-maybe "[:{;\n]" "\\|" "struct" ws id "\\(?:" ws "final" ws-maybe "[:{\n]" diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index a3469b71386..dfca944dc74 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1723,14 +1723,19 @@ vc-git-annotate-command (declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) +(autoload 'decoded-time-set-defaults "time-date") +(autoload 'iso8601-parse "iso8601") + (defun vc-git-annotate-time () - (and (re-search-forward "^[0-9a-f^]+[^()]+(.*?\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\(:?\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\)\\)? *[0-9]+) " nil t) - (vc-annotate-convert-time - (apply #'encode-time (mapcar (lambda (match) - (if (match-beginning match) - (string-to-number (match-string match)) - 0)) - '(6 5 4 3 2 1 7)))))) + (and (re-search-forward "^[0-9a-f^]+[^()]+(.*?\\([0-9]+-[0-9]+-[0-9]+\\)\\(?: \\([0-9]+:[0-9]+:[0-9]+\\) \\([-+0-9]+\\)\\)? +[0-9]+) " nil t) + (let* ((dt (match-string 1)) + (dt (if (not (match-beginning 2)) dt + ;; Format as ISO 8601. + (concat dt "T" (match-string 2) (match-string 3)))) + (decoded (ignore-errors (iso8601-parse dt)))) + (and decoded + (vc-annotate-convert-time + (encode-time (decoded-time-set-defaults decoded))))))) (defun vc-git-annotate-extract-revision-at-line () (save-excursion diff --git a/test/lisp/vc/vc-git-tests.el b/test/lisp/vc/vc-git-tests.el index f12c5d3434b..b331b77cf01 100644 --- a/test/lisp/vc/vc-git-tests.el +++ b/test/lisp/vc/vc-git-tests.el @@ -64,4 +64,21 @@ vc-git-test--run-program-version-test (actual-output (vc-git--program-version))) (should (equal actual-output expected-output)))) +(ert-deftest vc-git-test-annotate-time () + "Test `vc-git-annotate-time'." + (require 'vc-annotate) + (with-temp-buffer + (insert "\ +00000000 (Foo Bar 2023-06-14 1) a +00000001 (Foo Bar 2023-06-14 00:00:00 -0130 2) b +00000002 (Foo Bar 2023-06-14 00:00:00 +0145 3) c +00000003 (Foo Bar 2023-06-14 00:00:00 4) d +00000004 (Foo Bar 0-0-0 5) \n") + (goto-char (point-min)) + (should (floatp (vc-git-annotate-time))) + (should (> (vc-git-annotate-time) + (vc-git-annotate-time))) + (should-not (vc-git-annotate-time)) + (should-not (vc-git-annotate-time)))) + ;;; vc-git-tests.el ends here -- 2.34.1 --=-=-= Content-Type: text/plain WDYT? Thanks, -- Basil In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0, Xaw3d scroll bars) of 2023-06-13 built on blc Repository revision: 81932ebcfa56a33fcb1c7d9f91094e2b1f6e9b77 Repository branch: blc/treesit/master Windowing system distributor 'The X.Org Foundation', version 11.0.12101004 System Description: Ubuntu 22.04.2 LTS Configured using: 'configure CC=gcc-12 'CFLAGS=-Og -ggdb3' --prefix=/home/bic/.local --with-file-notification=yes --with-x --with-x-toolkit=lucid' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XAW3D XDBE XIM XINPUT2 XPM LUCID ZLIB Important settings: value of $LC_MONETARY: en_IE.UTF-8 value of $LC_NUMERIC: en_IE.UTF-8 value of $LC_TIME: en_IE.UTF-8 value of $LANG: en_GB.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search time-date subr-x mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils 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 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 dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo x-toolkit xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 36749 9186) (symbols 48 5178 0) (strings 32 13895 1202) (string-bytes 1 379735) (vectors 16 9299) (vector-slots 8 148629 8492) (floats 8 23 25) (intervals 56 244 0) (buffers 984 10)) --=-=-=-- From unknown Sat Aug 09 05:06:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64069: 30.0.50; Mistyped shy group regexps Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jun 2023 01:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64069 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Basil Contovounesios , 64069@debbugs.gnu.org Cc: Alan Mackenzie , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= , Paul Eggert Received: via spool by 64069-submit@debbugs.gnu.org id=B64069.1686793559312 (code B ref 64069); Thu, 15 Jun 2023 01:46:02 +0000 Received: (at 64069) by debbugs.gnu.org; 15 Jun 2023 01:45:59 +0000 Received: from localhost ([127.0.0.1]:45821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9c3i-00004x-Nu for submit@debbugs.gnu.org; Wed, 14 Jun 2023 21:45:59 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:54443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9c3g-0008WN-I2 for 64069@debbugs.gnu.org; Wed, 14 Jun 2023 21:45:57 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id EE03B5C01D6; Wed, 14 Jun 2023 21:45:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 14 Jun 2023 21:45:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1686793549; x=1686879949; bh=l9muLaUUklTtTbZnk8Kl9ZL9dp+SNacFPAX lQ/og9Yw=; b=MWZ+Q601QmZDo7YeA4JgboPuF037Sp4Sgeedw1rnHc9VbWJ8Ulq I5feUzLFmxEhCOlVrgnjH3SKtTvIKdDONY4lMt3dZsh5AWtw4loOpNd0FsvVajxg lHOi4qjzAO8O/e702XQC0q2MNpN6uzmOnZC9SGT16oCtmMcGNX7t3G9uNHC4bBba jFekmOztgImOTU7OyjoOhm2mZceDQ3d59/QfvIhIj5Tp8iwRFD1taKc+pnrA7WIa QeRWeagu2i0wUzIx99jRPE+Sg47WlEq0Iz2q3SqtYtu52JPES2hJ2ePelo/IusIJ gDEyyvWbKEQXBtjsHHQ29hOhj6blQGYUc6A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1686793549; x=1686879949; bh=l9muLaUUklTtTbZnk8Kl9ZL9dp+SNacFPAX lQ/og9Yw=; b=k06Jl35+tnYysBy/B/sLmatedwaLVTrmKWgZnh8S92Thz3DRGfp cu5268XGLxLDIs7c7p7F7jSZHfIsBboAHDcYe2L6fdfD4A5Uz7vY/tLgSGNEjlsn ud2bnaYSeoST4rStZ6QD68ERV4vAQu+WyXqF/HbD2TcK3iilKBJxGca8Xn0j2dAL jQn3QJ1mM/NW5Gw/BUd632h6H0tOuGIAZZoyc27KyjMxU7X7DQQ6tKnMmV/36kVW tU5jIJ1Y+SXGXeY086jY8Fz+7cKXBUIueqElqtCjhrHfH+HS+0+e9c1yYYKVlnN9 PrOsqoXZX4VCILUM2CiH1ZAfoLZhMaUic2w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgedvuddgheduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhephfeutdekveeggeetteekfeejffegudduudfhueevleeftdffffeggeeivddv jeelnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 14 Jun 2023 21:45:47 -0400 (EDT) Message-ID: <8d2a4d47-10d7-d16e-85d2-8009781a0dbc@gutov.dev> Date: Thu, 15 Jun 2023 04:45:45 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US References: <87v8fq570k.fsf@epfl.ch> From: Dmitry Gutov In-Reply-To: <87v8fq570k.fsf@epfl.ch> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Hi Basil, On 14/06/2023 19:43, Basil Contovounesios wrote: > - Dmitry to review the change in vc-git > - Paul for any comments on the time handling in vc-git-annotate-time > > In vc-git-annotate-time, the mistyped group added in [1] throws off the > match string indices that are later passed to encode-time: by my reading > the hour argument by chance continues to be specified correctly, but the > minutes argument receives the number of hours, the seconds argument the > number of minutes, and the timezone argument the number of seconds. > > [1]: Display shorter dates in Git annotate output > 576fba5f58d 2015-05-17 02:47:17 +0300 > https://git.sv.gnu.org/cgit/emacs.git/commit/?id=576fba5f58d > > Even after correcting the shy group, the timezone parsing doesn't seem > right to me: encode-time expects a UTC offset in seconds, but is passed > e.g. (string-to-number "+0100")=100s instead of the expected 1hr=3600s. Thank you for the effort, but I think most of this nuance could be simplified away. When you say "encode-time ... is passed ... +0100", what is your testing scenario? IIUC, the change in commit 576fba5f58d removed the complex dates from the output (which we parse), replacing them with the simple yyyy-mm-dd format (that's what --date=short does). Seems like I tried (8 years ago) to retain the compatibility with the previous output in case we'll make the format configurable someday, but that still hasn't happened. So we could do away with the 'if' condition and simplify the regexp accordingly. From unknown Sat Aug 09 05:06:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64069: 30.0.50; Mistyped shy group regexps Resent-From: Basil Contovounesios Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jun 2023 07:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64069 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Dmitry Gutov Cc: Alan Mackenzie , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= , Paul Eggert , 64069@debbugs.gnu.org Received: via spool by 64069-submit@debbugs.gnu.org id=B64069.16868147934253 (code B ref 64069); Thu, 15 Jun 2023 07:40:01 +0000 Received: (at 64069) by debbugs.gnu.org; 15 Jun 2023 07:39:53 +0000 Received: from localhost ([127.0.0.1]:46049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9haC-00016X-Kw for submit@debbugs.gnu.org; Thu, 15 Jun 2023 03:39:52 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:52492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9ha8-00015z-Gv for 64069@debbugs.gnu.org; Thu, 15 Jun 2023 03:39:51 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3f8cec6641bso17064835e9.1 for <64069@debbugs.gnu.org>; Thu, 15 Jun 2023 00:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1686814782; x=1689406782; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=nb1itUscgVoxf6bMFuwHslvpui3EQLomzuSW7879cMM=; b=PBykAZud5/Mqs3vVn21jjb9i8rpFIKF/ll9x9bICeOyPltmq2Pz2fFeOyZ26Ub5AzH aCb/jGHPHeOqMLbhwyeEhDguqCLyiMgDJuyQSkhEP9COlZ6WwYGixQbaUhc7aFeY739D UKxzdOA+sfwvOeWzt6WwoegpRbiZlGzlYXTU25k23gKFiKUbn1xu2Sc/mp2MUgQYbTsE +uAilyhNsR+wvoarMMhblDugLkFgV++3oCylxd+pPH1KNcpo1BBWuxCPKgwQrd6R9HB1 q+r+etR0oW8HyWBp3VZy3T3vFOTvC05Bt81RXMhabjmfVkP7Ccf87U9xUZ8lAaBv8W1p vSCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686814782; x=1689406782; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nb1itUscgVoxf6bMFuwHslvpui3EQLomzuSW7879cMM=; b=EpzUI+ylNE/s98vVUzsa3HV/s+jgUmYF3I8metOGTFN0XJfnqrbQwetZu6JIj4b5fn 0oFddGKnbT4ZF9W2wF+IgpzJsmZS0xQVQIt0CSn4mIHrFb4DFuxKN2uQXZO64ZtiBlz2 vgJs0Hjzcv910EGmPWa+48l43dipYhg2xbIsvPQ8x7d031VxRD/Bv4mpqW+fEZf7cb0v mTYg8NJy0dDpZQuKt/m6MH6YuCbvBmfj1mi2sw5wHNx7tFyUObxps08qrafU4oiHpAvz GpzfxnaY5S1zLR7W72f0hbpqVOk2lo+pDQ2MqHBtH2+93EyENE8B6T2ESFwz1M7qtRTI Xrng== X-Gm-Message-State: AC+VfDzFSRhU/xcPQF72ZElaklqgcnK10sz/OPzG1EkVQQ9A1QcLVTvh DKCWr0NmVgpQS5aoMqYHlO7Dww== X-Google-Smtp-Source: ACHHUZ4z86b8roW+eW/RB9cGrBEXUFNuXMgs8+RIk+uXDtDk3vrZMYl8n2RbHHem/inpFycMtUvhdA== X-Received: by 2002:a7b:c3d5:0:b0:3f8:c5a6:4c11 with SMTP id t21-20020a7bc3d5000000b003f8c5a64c11mr6145448wmj.2.1686814782432; Thu, 15 Jun 2023 00:39:42 -0700 (PDT) Received: from localhost ([109.78.21.96]) by smtp.gmail.com with ESMTPSA id a18-20020a056000101200b002c70ce264bfsm8683197wrx.76.2023.06.15.00.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 00:39:41 -0700 (PDT) From: Basil Contovounesios In-Reply-To: <8d2a4d47-10d7-d16e-85d2-8009781a0dbc@gutov.dev> (Dmitry Gutov's message of "Thu, 15 Jun 2023 04:45:45 +0300") References: <87v8fq570k.fsf@epfl.ch> <8d2a4d47-10d7-d16e-85d2-8009781a0dbc@gutov.dev> Date: Thu, 15 Jun 2023 08:39:40 +0100 Message-ID: <87zg5141j7.fsf@epfl.ch> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dmitry Gutov [2023-06-15 04:45 +0300] wrote: > When you say "encode-time ... is passed ... +0100", what is your testing > scenario? Eyeballing the code and git-blame's output. > IIUC, the change in commit 576fba5f58d removed the complex dates from the output > (which we parse), replacing them with the simple yyyy-mm-dd format (that's what > --date=short does). Seems like I tried (8 years ago) to retain the compatibility > with the previous output in case we'll make the format configurable someday, but > that still hasn't happened. Is it not configurable via vc-git-annotate-switches? When invoking git with multiple --date= options, the last one wins. > So we could do away with the 'if' condition and simplify the regexp > accordingly. You mean ignoring anything other than the YYYY-MM-DD format? No objections from me, but it's not that hard to fix&keep support for the default --date=iso output from Git, if desired. Thanks, -- Basil From unknown Sat Aug 09 05:06:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64069: 30.0.50; Mistyped shy group regexps Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jun 2023 12:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64069 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Basil Contovounesios Cc: Alan Mackenzie , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= , Paul Eggert , 64069@debbugs.gnu.org Received: via spool by 64069-submit@debbugs.gnu.org id=B64069.168683129110860 (code B ref 64069); Thu, 15 Jun 2023 12:15:02 +0000 Received: (at 64069) by debbugs.gnu.org; 15 Jun 2023 12:14:51 +0000 Received: from localhost ([127.0.0.1]:46334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9lsJ-0002p5-2s for submit@debbugs.gnu.org; Thu, 15 Jun 2023 08:14:51 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:44215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9lsH-0002ot-Hk for 64069@debbugs.gnu.org; Thu, 15 Jun 2023 08:14:50 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 06D87320091D; Thu, 15 Jun 2023 08:14:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 15 Jun 2023 08:14:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1686831282; x=1686917682; bh=Xh66pdWTIDc5DNK7cL+UM4JSGXllP4LjEUr JZmC6aUU=; b=xe96cFHTbJrfDANnR7CpnfoSCXCXrpMuJyzWgpKjH4E4JL7iJHC hFZ61Wnken0MbVn/iZEs9+n6iK/uUnLKJNbPEneGR4FeAFKwg8tMtR2tzBLLbFw+ X6J3xkocmmewUYYHv5X1VPN6m9tIERSF6C3+F9sfGdYzEFdp0RfqFzMOgJn3tfVR pxIT8sWhBZ2zxR5q9w4cuJ2sXl93OoN/SRK0wcHs/rsHhL3LTmOSXx0eGX6FKWdG uO/iS+Y8REUWTBPKplFM+DM1qaS57fjUtykt6xv49kT3SvGTiXFwBHKKJ6U6L8GQ xWb7K6UuiIwFZaw8jTMF0VmKEtyNZR56v7A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1686831282; x=1686917682; bh=Xh66pdWTIDc5DNK7cL+UM4JSGXllP4LjEUr JZmC6aUU=; b=PATK9qZYm12VIa/8oDLe2LKgV7aPP2GoIBxaV4hb0WA7I+1WM1I CdChw01p3D4/Vm8LfMubNLWQFLNGFa21VFCmfdW/GgsCP0SAn9rF7xqI2Is5W3CJ +n6LquHmSyn3G3R/vOx+1+i4pujhHPrN7fY3M9fExL0PxWVDGn5GswCfg3SWWGmW 3QmXIZyZe7TPeKJmAv0zc0VPOXzIWZ0TK8Bv9FolakuHlBcMGK50OkLHz5Wii0Hr BGDX3CJdoIAd+e/GLOAfsFepSgA4Z2xPpyoIcjVTXc/K3pCtJMcP0iv/8ZJQm0OA A5ofve1SBV5ZELoonpN3uKqnle/qav2o4fw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgedvvddggeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepiefgteevheevveffheeltdeukeeiieekueefgedugfefgefhudelgfefveel vdevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 15 Jun 2023 08:14:40 -0400 (EDT) Message-ID: <83e99e89-cc0a-ee90-66b9-8354975a04c7@gutov.dev> Date: Thu, 15 Jun 2023 15:14:38 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US References: <87v8fq570k.fsf@epfl.ch> <8d2a4d47-10d7-d16e-85d2-8009781a0dbc@gutov.dev> <87zg5141j7.fsf@epfl.ch> From: Dmitry Gutov In-Reply-To: <87zg5141j7.fsf@epfl.ch> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.9 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) On 15/06/2023 10:39, Basil Contovounesios wrote: >> IIUC, the change in commit 576fba5f58d removed the complex dates from the output >> (which we parse), replacing them with the simple yyyy-mm-dd format (that's what >> --date=short does). Seems like I tried (8 years ago) to retain the compatibility >> with the previous output in case we'll make the format configurable someday, but >> that still hasn't happened. > Is it not configurable via vc-git-annotate-switches? > When invoking git with multiple --date= options, the last one wins. All right. I'm not sure if people took advantage of this capability, but if you want to keep supporting it, that is fine by me, too. Thanks. From unknown Sat Aug 09 05:06:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64069: 30.0.50; Mistyped shy group regexps Resent-From: Alan Mackenzie Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jun 2023 20:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64069 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Basil Contovounesios Cc: Dmitry Gutov , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= , Paul Eggert , 64069@debbugs.gnu.org Received: via spool by 64069-submit@debbugs.gnu.org id=B64069.16868627289620 (code B ref 64069); Thu, 15 Jun 2023 20:59:02 +0000 Received: (at 64069) by debbugs.gnu.org; 15 Jun 2023 20:58:48 +0000 Received: from localhost ([127.0.0.1]:48067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9u3M-0002V6-9J for submit@debbugs.gnu.org; Thu, 15 Jun 2023 16:58:48 -0400 Received: from mx3.muc.de ([193.149.48.5]:59113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9u3K-0002Ur-BH for 64069@debbugs.gnu.org; Thu, 15 Jun 2023 16:58:47 -0400 Received: (qmail 29046 invoked by uid 3782); 15 Jun 2023 22:58:39 +0200 Received: from acm.muc.de (pd953a62e.dip0.t-ipconnect.de [217.83.166.46]) (using STARTTLS) by colin.muc.de (tmda-ofmipd) with ESMTP; Thu, 15 Jun 2023 22:58:39 +0200 Received: (qmail 6993 invoked by uid 1000); 15 Jun 2023 20:58:38 -0000 Date: Thu, 15 Jun 2023 20:58:38 +0000 Message-ID: References: <87v8fq570k.fsf@epfl.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87v8fq570k.fsf@epfl.ch> X-Submission-Agent: TMDA/1.3.x (Ph3nix) From: Alan Mackenzie X-Primary-Address: acm@muc.de X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Basil. On Wed, Jun 14, 2023 at 17:43:39 +0100, Basil Contovounesios wrote: > Severity: minor > Tags: patch > Further to https://bugs.gnu.org/64019#14, I attach a patch which tweaks > four redundant or seemingly mistyped instances of \(:?...\), i.e. a > numbered group starting with an optional colon in place of the likelier > shy group. > CCing: > - Alan to review the change to c-or-c++-mode--regexp Yes, that looks like a bug, just as you've surmised. There are also three other occurrences of \(:? in CC Mode, namely in cc-langs.el. I will fix all of these in master. [ .... ] > diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el > index 11a1d3fe6c2..5cf9b7e17f8 100644 > --- a/lisp/progmodes/cc-mode.el > +++ b/lisp/progmodes/cc-mode.el > @@ -2859,7 +2859,7 @@ c-or-c++-mode--regexp > "\\|" id "::" > "\\|" id ws-maybe "=\\)" > "\\|" "\\(?:inline" ws "\\)?namespace" > - "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" > + "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" > "\\|" "class" ws id > "\\(?:" ws "final" "\\)?" ws-maybe "[:{;\n]" > "\\|" "struct" ws id "\\(?:" ws "final" ws-maybe "[:{\n]" [ .... ] -- Alan Mackenzie (Nuremberg, Germany). From unknown Sat Aug 09 05:06:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64069: 30.0.50; Mistyped shy group regexps Resent-From: Alan Mackenzie Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 17 Jun 2023 13:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64069 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Basil Contovounesios Cc: Dmitry Gutov , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= , Paul Eggert , 64069@debbugs.gnu.org, acm@muc.de Received: via spool by 64069-submit@debbugs.gnu.org id=B64069.168700841911138 (code B ref 64069); Sat, 17 Jun 2023 13:27:01 +0000 Received: (at 64069) by debbugs.gnu.org; 17 Jun 2023 13:26:59 +0000 Received: from localhost ([127.0.0.1]:51058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAVxC-0002ta-Rm for submit@debbugs.gnu.org; Sat, 17 Jun 2023 09:26:59 -0400 Received: from mx3.muc.de ([193.149.48.5]:18710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAVxA-0002tH-R2 for 64069@debbugs.gnu.org; Sat, 17 Jun 2023 09:26:57 -0400 Received: (qmail 29453 invoked by uid 3782); 17 Jun 2023 15:26:50 +0200 Received: from acm.muc.de (p4fe152e6.dip0.t-ipconnect.de [79.225.82.230]) (using STARTTLS) by colin.muc.de (tmda-ofmipd) with ESMTP; Sat, 17 Jun 2023 15:26:49 +0200 Received: (qmail 10788 invoked by uid 1000); 17 Jun 2023 13:26:49 -0000 Date: Sat, 17 Jun 2023 13:26:49 +0000 Message-ID: References: <87v8fq570k.fsf@epfl.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Submission-Agent: TMDA/1.3.x (Ph3nix) From: Alan Mackenzie X-Primary-Address: acm@muc.de X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Basil. On Thu, Jun 15, 2023 at 20:58:38 +0000, Alan Mackenzie wrote: > On Wed, Jun 14, 2023 at 17:43:39 +0100, Basil Contovounesios wrote: > > Severity: minor > > Tags: patch > > Further to https://bugs.gnu.org/64019#14, I attach a patch which tweaks > > four redundant or seemingly mistyped instances of \(:?...\), i.e. a > > numbered group starting with an optional colon in place of the likelier > > shy group. > > CCing: > > - Alan to review the change to c-or-c++-mode--regexp > Yes, that looks like a bug, just as you've surmised. > There are also three other occurrences of \(:? in CC Mode, namely in > cc-langs.el. Actually, there were four. > I will fix all of these in master. DONE. [ .... ] -- Alan Mackenzie (Nuremberg, Germany). From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 17 11:39:19 2023 Received: (at control) by debbugs.gnu.org; 17 Jun 2023 15:39:19 +0000 Received: from localhost ([127.0.0.1]:52429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAY1H-00011l-Ep for submit@debbugs.gnu.org; Sat, 17 Jun 2023 11:39:19 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:54520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAY1E-00011P-Ob for control@debbugs.gnu.org; Sat, 17 Jun 2023 11:39:18 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3112f5ab0b1so292603f8f.0 for ; Sat, 17 Jun 2023 08:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1687016351; x=1689608351; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=hQZ83cxLYuk0cTqK+LL8BA8zIO1pk00IDu7syaKxW3g=; b=RACinZeQGmxbG1mlYCJBaVvysipYbzVfk5tR34z1Ds5+hYDuS5/dr4Oi+n49UVw8Qb R98Y3mS8wJ1H1ffTb1F2xYUHKRWWiSBhMVrV09V3ISyyOAU4Ur0PUe0ax0GO9x5u+/rl 6zpWPTensEMNRJbNCvfRmHlF2OZKEhfZVuXUw2fHLZyWUMoEUUYiBHrZZ6JpirQ2Wlvk Ycm+Vol1hpN06k/BWO+EWI1/0FTDOHw0Qbw0pHU/uJVqPKNFPHAUlCuIDv23sUo7m0ZJ DVjsrmpLNHPbttnsQFVSbc8cljOBvlRNfOok+HkT6u6/yP3LzX961nFM5ac7kdgGCLjJ r0CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687016351; x=1689608351; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hQZ83cxLYuk0cTqK+LL8BA8zIO1pk00IDu7syaKxW3g=; b=lHI3bvB5B5tmsMw3oDCpVmBVF8M+jQmm0hdO+T9AgtoFcIEP986UCZYyLi7Ivm0dgG lbEX4p1fAVM0QfynjpDMpvG8363WmzXDxaduXog7IqPzME8ATIH38t5B5IlpEoKQauuv Rkf2CzvsxU0I6xUl+MEyDa5rwnwvlVKvR9ISAvKe58U7QKhWtyUR2pBjvet5EtVLr+Wq r+8F2DAk5hyg77l89dLnkM8cwgpdkinPM+1NDZWuj1ldF2HVXHxqq2D8+kLna/sGIQ24 uf0KxlCGNI9O6FsbRhvNhrTtMRURWSINmjfjP5rnhv0aROoJopUd5cDOV0IZarP2ZM1o 4xgA== X-Gm-Message-State: AC+VfDyoZh/Dy75FbBl9VnrLTJ8AU/9NLNP4gEdulplvS3+JLkYZNHei iV5NFnTr7dS80XINhj5bNU4bRg== X-Google-Smtp-Source: ACHHUZ5v3mRuqBUB4S7gGkleUVTpCfkQnIHeqCl3Xi0aDRd4vYTF5vFjRgFl9/sLF1N6yKF0qx+dHQ== X-Received: by 2002:a5d:6a4b:0:b0:30f:c805:5f07 with SMTP id t11-20020a5d6a4b000000b0030fc8055f07mr3495323wrw.17.1687016350909; Sat, 17 Jun 2023 08:39:10 -0700 (PDT) Received: from localhost ([109.78.105.162]) by smtp.gmail.com with ESMTPSA id m9-20020adfe0c9000000b0030af15d7e41sm26831718wri.4.2023.06.17.08.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 08:39:10 -0700 (PDT) From: Basil Contovounesios To: Alan Mackenzie Subject: Re: bug#64069: 30.0.50; Mistyped shy group regexps In-Reply-To: (Alan Mackenzie's message of "Sat, 17 Jun 2023 13:26:49 +0000") References: <87v8fq570k.fsf@epfl.ch> Date: Sat, 17 Jun 2023 16:39:09 +0100 Message-ID: <878rciayjm.fsf@epfl.ch> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control Cc: Dmitry Gutov , Mattias =?utf-8?Q?Engdeg=C3=A5rd?= , Paul Eggert , 64069-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 64069 30.1 quit Alan Mackenzie [2023-06-17 13:26 +0000] wrote: > On Thu, Jun 15, 2023 at 20:58:38 +0000, Alan Mackenzie wrote: >> There are also three other occurrences of \(:? in CC Mode, namely in >> cc-langs.el. > > Actually, there were four. > >> I will fix all of these in master. > > DONE. Thanks. I installed the rest of the patch, and am closing this report. Fix more shy group regexps fef27d28fa7 2023-06-17 16:36:27 +0100 https://git.sv.gnu.org/cgit/emacs.git/commit/?id=fef27d28fa7 -- Basil