From unknown Sun Jun 22 07:44:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32362: Interactive highlighting of sub-regexp Resent-From: =?UTF-8?Q?Gr=C3=A9gory_?= =?UTF-8?Q?Mouni=C3=A9?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 03 Aug 2018 14:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32362 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 32362@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15333063067899 (code B ref -1); Fri, 03 Aug 2018 14:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2018 14:25:06 +0000 Received: from localhost ([127.0.0.1]:40085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1flb0r-00023L-G3 for submit@debbugs.gnu.org; Fri, 03 Aug 2018 10:25:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1flb0p-00022k-MA for submit@debbugs.gnu.org; Fri, 03 Aug 2018 10:25:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flb0j-0002YH-G2 for submit@debbugs.gnu.org; Fri, 03 Aug 2018 10:24:58 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1flb0j-0002Y9-A7 for submit@debbugs.gnu.org; Fri, 03 Aug 2018 10:24:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flb0i-0003pc-2m for bug-gnu-emacs@gnu.org; Fri, 03 Aug 2018 10:24:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flb0e-0002VW-TJ for bug-gnu-emacs@gnu.org; Fri, 03 Aug 2018 10:24:56 -0400 Received: from zm-mta-out-1.u-ga.fr ([152.77.200.56]:48514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1flb0e-0002UN-Fe for bug-gnu-emacs@gnu.org; Fri, 03 Aug 2018 10:24:52 -0400 Received: from zm-mta-out.u-ga.fr (zm-mta-out.u-ga.fr [152.77.200.58]) by zm-mta-out-1.u-ga.fr (Postfix) with ESMTP id 3DEA7A04A9 for ; Fri, 3 Aug 2018 16:24:49 +0200 (CEST) Received: from smtps.univ-grenoble-alpes.fr (smtps.univ-grenoble-alpes.fr [152.77.1.30]) by zm-mta-out.u-ga.fr (Postfix) with ESMTP id 3ACC9E008E for ; Fri, 3 Aug 2018 16:24:49 +0200 (CEST) Received: from [192.168.1.17] (mut38-1-82-67-65-81.fbx.proxad.net [82.67.65.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mounieg@univ-grenoble-alpes.fr) by smtps.univ-grenoble-alpes.fr (Postfix) with ESMTPSA id E9F4D125EB6 for ; Fri, 3 Aug 2018 16:24:48 +0200 (CEST) From: =?UTF-8?Q?Gr=C3=A9gory_?= =?UTF-8?Q?Mouni=C3=A9?= Message-ID: <59b6581c-cdfc-fa26-434b-4c0244849faa@imag.fr> Date: Fri, 3 Aug 2018 16:24:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------E18E235F713357100B51EC7E" Content-Language: en-US X-Greylist: Whitelist-UGA SMTP Authentifie (mounieg@univ-grenoble-alpes.fr) via submission-587 ACL (112) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.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: -5.4 (-----) This is a multi-part message in MIME format. --------------E18E235F713357100B51EC7E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Dear maintainers, I propose to add to Interactive Highlighting (hi-lock.el) few lines in=20 order to highlight only the first sub-regexps if it exists. The use case that interested me was to highlight the column of a CSV fi= le. EG.: M-x highlight-regexp then ^\(?:[^,]*,\)\{5\}\([^,]*\),.*$ for=20 highlighting the 6th column of a clean CSV file I try to keep it as simple as possible as the function is in the=20 documentation. The modified function has two paths: font-lock if enabled or directly=20 overlay The sub-regexp detection is a bit rough for font-lock-mode case. I do=20 not know how to do it perfectly without implementing a regexp engine or using a much more complex detection regexp. For overlay-case, the code seems quite straightforward. Have a nice day, Gr=C3=A9gory Mouni=C3=A9 --------------E18E235F713357100B51EC7E Content-Type: text/x-patch; name="0001-Interactive-Hightlighting-only-the-first-subexp-if-i.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Interactive-Hightlighting-only-the-first-subexp-if-i.pa"; filename*1="tch" >From 1764f0aa16727f510ecfe113aab4b3e689aa0978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Mouni=C3=A9?= Date: Fri, 3 Aug 2018 15:53:34 +0200 Subject: [PATCH] Interactive Hightlighting: only the first subexp if it exists When interactively highlighting regular expression (highlight-regexp), if the regular expression contains a subexpression, only the first sub-expression is highlighted. * lisp/hi-lock.el (hi-lock-set-pattern): * doc/emacs/display.texi: * etc/NEWS: highlight only the first subexp if the regexp contains subexps Copyright-paperwork-exempt: yes --- doc/emacs/display.texi | 2 ++ etc/NEWS | 6 ++++++ lisp/hi-lock.el | 12 +++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 2f5ce80d60..ef3d8aab3e 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -986,6 +986,8 @@ Highlight Interactively You can use this command multiple times, specifying various regular expressions to highlight in different ways. +Only the first sub-@var{regexp} is highlighted, if relevant. + @item M-s h u @var{regexp} @key{RET} @itemx C-x w r @var{regexp} @key{RET} @kindex M-s h u diff --git a/etc/NEWS b/etc/NEWS index 6ccf6fc089..44a6f468a0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -651,6 +651,12 @@ to signal the main thread, e.g., when they encounter an error. +++ *** 'thread-join' returns the result of the finished thread now. +** Interactive Highlighting + +*** The function 'highlight-regexp' highlights first subexp. +If the regular expression includes at least a subexp, the +function highlights only the first subexp. + * New Modes and Packages in Emacs 27.1 diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 13ebffb1af..62cba0f4d1 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -687,10 +687,12 @@ hi-lock-read-face-name (intern face))) (defun hi-lock-set-pattern (regexp face) - "Highlight REGEXP with face FACE." + "Highlight REGEXP (or first SUBEXP) with face FACE." ;; Hashcons the regexp, so it can be passed to remove-overlays later. (setq regexp (hi-lock--hashcons regexp)) - (let ((pattern (list regexp (list 0 (list 'quote face) 'prepend))) + (let ((pattern (list regexp + (list (if (string-match-p "\\\\(.*\\\\)" regexp) 1 0) + (list 'quote face) 'prepend))) (no-matches t)) ;; Refuse to highlight a text that is already highlighted. (if (assoc regexp hi-lock-interactive-patterns) @@ -712,7 +714,11 @@ hi-lock-set-pattern (goto-char search-start) (while (re-search-forward regexp search-end t) (when no-matches (setq no-matches nil)) - (let ((overlay (make-overlay (match-beginning 0) (match-end 0)))) + (let ((overlay (make-overlay + (or (match-beginning 1) + (match-beginning 0)) + (or (match-end 1) + (match-end 0))))) (overlay-put overlay 'hi-lock-overlay t) (overlay-put overlay 'hi-lock-overlay-regexp regexp) (overlay-put overlay 'face face)) -- 2.18.0 --------------E18E235F713357100B51EC7E-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 05 23:07:56 2018 Received: (at control) by debbugs.gnu.org; 6 Aug 2018 03:07:56 +0000 Received: from localhost ([127.0.0.1]:42181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fmVsC-0001KV-29 for submit@debbugs.gnu.org; Sun, 05 Aug 2018 23:07:56 -0400 Received: from mail-io0-f176.google.com ([209.85.223.176]:42119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fmVs9-0001KE-Vi; Sun, 05 Aug 2018 23:07:54 -0400 Received: by mail-io0-f176.google.com with SMTP id n18-v6so252538ioa.9; Sun, 05 Aug 2018 20:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=4VSxqEKRbmcOJcziOz+A2jrpFtkp/rnYUJ6kiND+PXs=; b=Fe5ynoD23CiLMOqRgEPUopchKl1R6rZgu/QKOgni2I2c6dSlHGCUyA416WbYEwC+Yx 29Zodt9qvyg1iKGNd4+PTrgvWQ1VgG0uCAiRlWxKBtQelyLdZa7xHSGIeBGoNE8Hko/6 l6cso3vrd0Fh14WoZxgNForaG7/dEXiV0xtGllwvHrN0TcjphlslUMKJRSREgu4iPEni MyzESP1Kn1+KpjA29HbFyAM4QoRdj643jCl7zMO0ixgJbWBJrAmiCQhF/I6AfJnHqdaS VwYq3sW/4wuBYTXO2Cnl5NW665QdCCXem7ZZSlwmAYnbuc2juOgZ4EmvHduOz9Hn+9WM rTuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=4VSxqEKRbmcOJcziOz+A2jrpFtkp/rnYUJ6kiND+PXs=; b=K4AxzL4+yt/+xtLbmKUuVwDI+JMaPrb/iA1moxeXx/2C6dXkkeEHBKTguHJ5f/Sfea 24qOZfNeOPqn/InlxaWGgSD9UZePMgz49cIKIJsQ6uJNNzaeZyDUcyagidFtunM4WILY kGxk5p7J2jIHd3u4RdG5N/uTjNX2TZFDtoLCgKsK/EsZZ5wneOwDwkr2reTsVZgy0g/4 DKmOCfEFfzQXaY7mR79Xe8yeb+gH4TAEtarSQ9NmTnNK+hZknZIQKemDu4ZCmBBKBmAA YDuJ/JMSBHPF4e1vnoAFS/DUhJ5RO2TuHvETFjOxU6mWf1wi39vHvn8tb14eu6qGkcpi 6QGw== X-Gm-Message-State: AOUpUlH9SchDWKQTlx1BEepJGtCJaD8fW346aGXg+LUYsAZjoDgdF9tk fbWlUeWkT52eRrWMUyyg0YF6CGGF X-Google-Smtp-Source: AAOMgpdAqVqivp3opz7aGjJf+dVAnwUiqurrAnPv5ozX88HlJzZGdIE9Iv1+WviIkUZ6DHqzPErKFA== X-Received: by 2002:a6b:6503:: with SMTP id z3-v6mr13622299iob.129.1533524868194; Sun, 05 Aug 2018 20:07:48 -0700 (PDT) Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id t20-v6sm3190745itb.31.2018.08.05.20.07.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 Aug 2018 20:07:47 -0700 (PDT) From: Noam Postavsky To: =?utf-8?Q?Gr=C3=A9gory_Mouni=C3=A9?= Subject: Re: bug#32365: Interactive Highlighting: prefix arg as subexp selector References: <9fecb36d-cd58-0a70-ac84-ddaa8edb5030@imag.fr> Date: Sun, 05 Aug 2018 23:07:46 -0400 In-Reply-To: <9fecb36d-cd58-0a70-ac84-ddaa8edb5030@imag.fr> (=?utf-8?Q?=22?= =?utf-8?Q?Gr=C3=A9gory=09Mouni=C3=A9=22's?= message of "Fri, 3 Aug 2018 23:50:47 +0200") Message-ID: <87sh3sxke5.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: 32365@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 (-) tags 32365 + patch forcemerge 32362 32365 quit Gr=C3=A9gory Mouni=C3=A9 writes: > PS: Sorry for generating noise with my previous patch (BUG: 32362) No problem, I'll just merge the bugs. Next time, you can respond to your own bug report by sending mail to xxxxx@debbugs.gnu.org, and the new patch would be added to the same thread. >>>From 6b6291ce1974a363080f535b40f06d5772ffa1be Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Gr=3DC3=3DA9gory=3D20Mouni=3DC3=3DA9?=3D > Date: Fri, 3 Aug 2018 23:08:10 +0200 > Subject: [PATCH] Interactive Highlighting: prefix argument to select sube= xp > > Use prefix-argument to highlight only the corresponding > subexpression of the regexp. > > * lisp/hi-lock.el (hi-lock-face-buffer, hi-lock-set-pattern) The message should go after the ChangeLog entry, as in * lisp/hi-lock.el (hi-lock-face-buffer, hi-lock-set-pattern): Use prefix-argument to highlight only the corresponding subexpression of the regexp. And I think we should have a NEWS entry mentioning the new feature too. > -(defun hi-lock-face-buffer (regexp &optional face) > +(defun hi-lock-face-buffer (regexp &optional face subexp) > "Set face of each match of REGEXP to FACE. > Interactively, prompt for REGEXP using `read-regexp', then FACE. > Use the global history list for FACE. > -(defun hi-lock-set-pattern (regexp face) > +(defun hi-lock-set-pattern (regexp face &optional arg) > "Highlight REGEXP with face FACE." You should mention the new arg in the docstrings. =20=20 > + (let* ((subexp (if (null arg) 0 arg)) This kind of thing is usually expressesd as (or arg 0). Though since `arg' is a bit vague, it might be clearer to rename arg as subexp, and then inside the function do (setq subexp (or subexp 0)) > + (let ((overlay (make-overlay (match-beginning subexp) > + (match-end subexp)))) > + (overlay-put overlay 'hi-lock-overlay t) > + (overlay-put overlay 'hi-lock-orverlay-regexp regexp) ^^^^^^^^ Looks like a typo. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 14 19:49:28 2018 Received: (at control) by debbugs.gnu.org; 14 Aug 2018 23:49:28 +0000 Received: from localhost ([127.0.0.1]:51172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fpj44-0005YW-K7 for submit@debbugs.gnu.org; Tue, 14 Aug 2018 19:49:28 -0400 Received: from mail-it0-f50.google.com ([209.85.214.50]:51075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fpj42-0005YF-76; Tue, 14 Aug 2018 19:49:26 -0400 Received: by mail-it0-f50.google.com with SMTP id j81-v6so21030860ite.0; Tue, 14 Aug 2018 16:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-transfer-encoding; bh=oICnE4oS+Z4KcXW5XRTfJOYDxBMgNFX7qERCR4ENfo0=; b=TNJhz6UE1y5ineDB1YR41mjBQ6r3zpRDqMw0MwVj705ITA0XtTRLWLzQX3J1ZsygcD qr5m1EYlF0J7gFOnHoV63+IQ1xRKAaOFX/rLC1szXjGEkL6XsBbvxKpZAdVlmspJY8Xd CeLgP9RVt7SlnWX3XuV8BKvgU4JaLMUYmXtKwBNNjLUrzQEKRv3z19s8WZkd9VmpvTxN kh/PBKz1xv1/wq2QdBOXgzv+tgabT338RQyU9cWVxO4gWZQLn6tpHm4x3UUSN8YDrrIO E6E7i+plTJa4ZZOmqm7gAb9028CbQFefVZ64VpOKyVXrGELw7pfnYpJNTck41xOJUaQI wc9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version:content-transfer-encoding; bh=oICnE4oS+Z4KcXW5XRTfJOYDxBMgNFX7qERCR4ENfo0=; b=VqCJHfToxrzjtZBL3wPwVtPTvrRbthI/wrdy/OiF1+YNJLV7JsEsgzannZ+pnG7gq0 58R3fHwP30wrLQX5sRgGi3oClIB0F2olnPgWDJXIXWhdiIBzfuxRTwefDVKP5G8Az2Ay uPtxydwPWLFHh/L2Ai3ukY8jX0vgr1WdqY4pNGkVIxQUoYw73Zluh0J8zjHvbfg46kTr 3eykdslXCANQQgoFiA6taOWteKFzzuysucI8OUhQ/y9tgf71nEjeW0znFCvDKGqMf1xs UaDhogw47rv/lkct35TqR27zOb10eijDJEplkebfjbWqmJlPnlGDYqANrawNSDgNv/Tf NBPw== X-Gm-Message-State: AOUpUlFUPXyQfl/aVowKG6jy0ZIWacnGg3Z62/FfC5nDeP4w/XJkkUw/ zIsoz7p6gpTFeeV4/EKNw45cn7QE X-Google-Smtp-Source: AA+uWPzPJ+4ZRB7C2ONQG0PnBRTib+ip+w9+aE8kZwmz4kAqn9pGMJcpuwyts8LWLtly0FCUVVFN/A== X-Received: by 2002:a02:bb04:: with SMTP id y4-v6mr21289152jan.5.1534290560437; Tue, 14 Aug 2018 16:49:20 -0700 (PDT) Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id 1-v6sm261418ity.38.2018.08.14.16.49.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Aug 2018 16:49:19 -0700 (PDT) From: Noam Postavsky To: =?utf-8?Q?Gr=C3=A9gory_Mouni=C3=A9?= Subject: Re: bug#32365: Interactive Highlighting: prefix arg as subexp selector In-Reply-To: <537ef32f-fd1f-a83d-d09c-365850f6e1a9@imag.fr> (=?utf-8?Q?=22?= =?utf-8?Q?Gr=C3=A9gory=09Mouni=C3=A9=22's?= message of "Wed, 8 Aug 2018 16:12:36 +0200") References: <9fecb36d-cd58-0a70-ac84-ddaa8edb5030@imag.fr> <87sh3sxke5.fsf@gmail.com> <537ef32f-fd1f-a83d-d09c-365850f6e1a9@imag.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) Date: Tue, 14 Aug 2018 19:49:12 -0400 Message-ID: <87o9e4y0ef.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control Cc: 32365@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 (-) tags 32365 fixed close 32365 27.1 quit Gr=C3=A9gory Mouni=C3=A9 writes: > Here the patch for modifying Automatic Interactive Highlighting > (hi-lock.el) for adding prefix-argument to highlight-regexp > > I add a line documenting the option in the corresponding > hightlight-regexp documentation in doc/emacs/display.texi and a > section in NEWS. Thanks, pushed to master [1: cc5a23d40b]. I fixed a couple of minor things (we use double spacing at end-of-sentence, NEWS entries should first line should be a whole sentence, and some whitespace/indentation issues). [1: cc5a23d40b]: 2018-08-14 19:38:21 -0400 Interactive Highlighting: prefix argument to select subexp https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=3Dcc5a23d40bfa7a83= 2f7a6fb7a016557ac1416559