From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Basil Contovounesios via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#62620: 30.0.50; Unused unwind-protect in verilog-mode Date: Sun, 02 Apr 2023 17:39:47 +0100 Message-ID: <87cz4m44rw.fsf@tcd.ie> Reply-To: Basil Contovounesios Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17487"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Wilson Snyder , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= To: 62620@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 02 18:41:13 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pj0lT-0004PC-D0 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 02 Apr 2023 18:41:11 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pj0lM-0003Pe-TN; Sun, 02 Apr 2023 12:41:04 -0400 Original-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 1pj0lL-0003PV-Un for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 12:41:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pj0lL-0007NK-AL for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 12:41:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pj0lK-0000u2-He; Sun, 02 Apr 2023 12:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Basil Contovounesios Original-Sender: "Debbugs-submit" Resent-CC: wsnyder@wsnyder.org, mattiase@acm.org, bug-gnu-emacs@gnu.org Resent-Date: Sun, 02 Apr 2023 16:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62620 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Wilson Snyder , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-Received: via spool by submit@debbugs.gnu.org id=B.16804536033386 (code B ref -1); Sun, 02 Apr 2023 16:41:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Apr 2023 16:40:03 +0000 Original-Received: from localhost ([127.0.0.1]:42488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj0kL-0000sJ-ED for submit@debbugs.gnu.org; Sun, 02 Apr 2023 12:40:02 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:47718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj0kH-0000s3-SV for submit@debbugs.gnu.org; Sun, 02 Apr 2023 12:40:00 -0400 Original-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 1pj0kH-0003Cu-Mc for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 12:39:57 -0400 Original-Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pj0kC-0006sK-F3 for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 12:39:57 -0400 Original-Received: by mail-wm1-x333.google.com with SMTP id o32so15720579wms.1 for ; Sun, 02 Apr 2023 09:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1680453589; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=ZJtA0otOGbcOIZysd1j9/Bi/X8FO1TPJixHp2bPe+lw=; b=a/MAX58sEhEqXVqF6FT8xR9hp7uSbYAsOLLKkVXeIB8pAllw02JldgyKQNRbEOlTli OuguHsATKEat7OlyqCLuWGSFwc+i9mIcxGBda9TLn2i8ufRvtygzFztHDXwh2FmyF9p+ ya/h129CoTvV/SRTg/qvybEqVLTJpJZ+0x0EjFjqxlHgypJGtDOcKTdlurJiv9REDUtF vRX0SnJMVFyo3gzJJzP1vHF/tAVdFaOl0D3Tke8HBLiB+ovFoGVxeoEQ1y/+0ur9quE9 3+oAb6UcPgJujODv3283ZS7QakcLLccsEDE6REHYjCy5NQLOBSBKO/GkwuXpb9bwudKe uz2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680453589; 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=ZJtA0otOGbcOIZysd1j9/Bi/X8FO1TPJixHp2bPe+lw=; b=LB/hwSe/vX4oZ4bd8gXpNh5GpxL0BKXPK8e+SVtoN7eqq3U5CiQY4yO/RMFhkQXV3T GgREVwOLa5mxeolD59gKksuaE0QbDqTMO/I8Si4HnGKH3gTA8M4FnowJ3BvNP1zvA+lM DXuZr1zho+IPbQXJ72dOMHksq4E5095oTqMxspdKeCe9rHcYba5J7yUjFEyokcYWpVOg ILONmDc9WullwI/kZC0D0NmGGlbw5DquO7VODpeAo0I4Z3zm9zTg66vkNc9jDnsMT7Vw FtP/UqzngRo+ZH7tPTu3EOpK0jWABWwzUm7YKXUWwACcT/tUN7Hu7iSIOCY+5JBycdZ9 cUmw== X-Gm-Message-State: AO0yUKWEKr+6i01XWPJo6KkW3tDvuJWMqH8KkbD8GXOzj6tJ5VBkfX1L rbc66N9wsq5mnlahcOO8u8v9D8OksYNjnIA2cT8= X-Google-Smtp-Source: AK7set/CO8N4btwF9U6GPlOkmOEnGNhpeyKq6w72IEn1rnyIpMdt1wAqMn0QWO0ft5jT0BGoqSYoRA== X-Received: by 2002:a7b:cd88:0:b0:3ee:7061:1bdd with SMTP id y8-20020a7bcd88000000b003ee70611bddmr24395466wmj.4.1680453588858; Sun, 02 Apr 2023 09:39:48 -0700 (PDT) Original-Received: from localhost ([51.37.77.228]) by smtp.gmail.com with ESMTPSA id g20-20020a05600c4ed400b003ee8a1bc220sm17144210wmq.1.2023.04.02.09.39.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Apr 2023 09:39:48 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=contovob@tcd.ie; helo=mail-wm1-x333.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:259113 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Severity: minor Tags: patch As Mattias pointed out in https://bugs.gnu.org/62599#14, byte-compiling verilog-mode currently emits the following warning: In verilog-diff-file-with-buffer: progmodes/verilog-mode.el:11894:26: Warning: =E2=80=98unwind-protect=E2= =80=99 without unwind forms The following patch tries to address that: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-verilog-diff-file-with-buffer.patch >From 619aad44b8877ff3e2def7cd42660f5c4fe0b5f3 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Sun, 2 Apr 2023 16:46:33 +0100 Subject: [PATCH] Fix verilog-diff-file-with-buffer * lisp/progmodes/verilog-mode.el: Fix commentary to avoid implying XEmacs defines diff-command. (verilog-diff-file-with-buffer): Claim compatibility with Emacs 21 rather than XEmacs in commentary, since the latter does not seem to define diff-command. Use get-buffer in place of likely thinko with-temp-buffer + BUFNAME + current-buffer. Fix unused unwind-protect: move temporary file deletion to its unwind forms. Avoid race condition between file existence check and deletion. Handle list-valued diff-switches. Avoid passing empty argument to diff-command. --- lisp/progmodes/verilog-mode.el | 54 ++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index ac6fd382a46..9199119b602 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -356,7 +356,9 @@ verilog--suppressed-warnings (eval-and-compile ;; Both xemacs and emacs (condition-case nil - (require 'diff) ; diff-command and diff-switches + ;; `diff-command' and `diff-switches', + ;; although XEmacs lacks the former. + (require 'diff) (error nil)) (condition-case nil (require 'compile) ; compilation-error-regexp-alist-alist @@ -11883,31 +11885,33 @@ verilog-diff-file-with-buffer This requires the external program `diff-command' to be in your `exec-path', and uses `diff-switches' in which you may want to have \"-u\" flag. Ignores WHITESPACE if t, and writes output to stdout if SHOW." - ;; Similar to `diff-buffer-with-file' but works on XEmacs, and doesn't - ;; call `diff' as `diff' has different calling semantics on different - ;; versions of Emacs. + ;; Similar to `diff-buffer-with-file' but works on Emacs 21, and + ;; doesn't call `diff' as `diff' has different calling semantics on + ;; different versions of Emacs. (if (not (file-exists-p f1)) - (message "Buffer `%s' has no associated file on disk" (buffer-name b2)) - (with-temp-buffer "*Verilog-Diff*" - (let ((outbuf (current-buffer)) - (f2 (make-temp-file "vm-diff-auto-"))) - (unwind-protect - (progn - (with-current-buffer b2 - (save-restriction - (widen) - (write-region (point-min) (point-max) f2 nil 'nomessage))) - (call-process diff-command nil outbuf t - diff-switches ; User may want -u in diff-switches - (if whitespace "-b" "") - f1 f2) - ;; Print out results. Alternatively we could have call-processed - ;; ourself, but this way we can reuse diff switches - (when show - (with-current-buffer outbuf (message "%s" (buffer-string)))))) - (sit-for 0) - (when (file-exists-p f2) - (delete-file f2)))))) + (message "Buffer `%s' has no associated file on disk" b2) + (let ((outbuf (get-buffer "*Verilog-Diff*")) + (f2 (make-temp-file "vm-diff-auto-"))) + (unwind-protect + ;; User may want -u in `diff-switches'. + (let ((args `(,@(if (listp diff-switches) + diff-switches + (list diff-switches)) + ,@(and whitespace '("-b")) + ,f1 ,f2))) + (with-current-buffer b2 + (save-restriction + (widen) + (write-region (point-min) (point-max) f2 nil 'nomessage))) + (apply #'call-process diff-command nil outbuf t args) + ;; Print out results. Alternatively we could have call-processed + ;; ourself, but this way we can reuse diff switches. + (when show + (with-current-buffer outbuf (message "%s" (buffer-string))))) + (sit-for 0) + (condition-case nil + (delete-file f2) + (error nil)))))) (defun verilog-diff-report (b1 b2 diffpt) "Report differences detected with `verilog-diff-auto'. -- 2.34.1 --=-=-= Content-Type: text/plain Note that this function may have never worked in XEmacs, at least judging from the diff.el in the following version I have locally: C-u M-x version XEmacs 21.4 (patch 24) "Standard C" [Lucid] (x86_64-linux-gnu, Mule) of Mon Jun 21 2021 on lgw01-amd64-053 It might be easy to avoid Emacs-isms in verilog-diff-file-with-buffer, but considering verilog-diff-file-with-buffer probably never worked in XEmacs, and XEmacs support is on its way out[0], I made no such changes. [0]: https://github.com/veripool/verilog-mode/issues/1822#issuecomment-1422508926 Note also that verilog-diff-file-with-buffer until now called with-temp-buffer with the name of a buffer previously created in verilog-diff-auto. I assume the intention was to instead call with-current-buffer, so I made an analogous change. The patch lists some further fixes. 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-04-02 built on blc Repository revision: 97e35b149874a105a9975853a7fcd6f0034ddeab Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101003 System Description: Ubuntu 22.04.2 LTS Configured using: 'configure CC=gcc-12 'CFLAGS=-Og -ggdb3' --prefix=/home/blc/.local --with-file-notification=yes --with-x --with-x-toolkit=lucid PKG_CONFIG_PATH=/home/blc/.local/lib/pkgconfig:' 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 36607 9341) (symbols 48 5171 0) (strings 32 13873 1627) (string-bytes 1 377563) (vectors 16 9294) (vector-slots 8 148577 11610) (floats 8 23 25) (intervals 56 248 0) (buffers 984 10)) --=-=-=--