X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: "Basil L. Contovounesios" <basil@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: vekazanov@HIDDEN, bug-gnu-emacs@HIDDEN Resent-Date: Mon, 17 Feb 2025 20:38:02 +0000 Resent-Message-ID: <handler.76372.B.173982466024748 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 76372 <at> debbugs.gnu.org Cc: Vladimir Kazanov <vekazanov@HIDDEN> X-Debbugs-Original-To: bug-gnu-emacs@HIDDEN X-Debbugs-Original-Xcc: Vladimir Kazanov <vekazanov@HIDDEN> Received: via spool by submit <at> debbugs.gnu.org id=B.173982466024748 (code B ref -1); Mon, 17 Feb 2025 20:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Feb 2025 20:37:40 +0000 Received: from localhost ([127.0.0.1]:49877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tk7s2-0006R0-Rj for submit <at> debbugs.gnu.org; Mon, 17 Feb 2025 15:37:40 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50646) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tk7rz-0006QG-CS for submit <at> debbugs.gnu.org; Mon, 17 Feb 2025 15:37:37 -0500 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 <basil@HIDDEN>) id 1tk7rs-00053Z-Rn for bug-gnu-emacs@HIDDEN; Mon, 17 Feb 2025 15:37:28 -0500 Received: from mta-06-4.privateemail.com ([198.54.122.146]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <basil@HIDDEN>) id 1tk7rp-00015V-Id for bug-gnu-emacs@HIDDEN; Mon, 17 Feb 2025 15:37:28 -0500 Received: from mta-06.privateemail.com (localhost [127.0.0.1]) by mta-06.privateemail.com (Postfix) with ESMTP id 4YxZGB5PVtz3hhVN for <bug-gnu-emacs@HIDDEN>; Mon, 17 Feb 2025 15:37:22 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1739824642; bh=rOMy68c4VPKHRQiCpL9jprLWO9hOvGpN3+A+RLsPIHk=; h=From:To:Subject:Date:From; b=Q7EKjvfRYk2c1wEVHx0oPFntwczLC087yeqiBzA1vbjyHEAgb8erFM5T1PkPKCQ+a /3j+8mxefOtfrvqqqhfKRVA5mKUyAI78gznRSFITvNXMTNRaccmr6gLtsDj73FsPiL pKPmiZsOqM7s5Go8GzlM8DPA/q7RUXuA/z6DmOQ4rPg/RsazyxxwIQnDYH/sf6GzhK bQ2gVWw+VN2diVbaAZOzfD2XXrByvV1+8hE4w5YIyLY3Y+mWkSTjx7YiLY4dQh0SS1 Wayw2kayHy43rCSNfjnr7chDXCPkrhv0rnEENsiU1tnU96+edAPSIEtvmGtWzumYNa LRRB3ait6D11A== Received: from localhost (unknown [146.70.196.201]) by mta-06.privateemail.com (Postfix) with ESMTPA for <bug-gnu-emacs@HIDDEN>; Mon, 17 Feb 2025 15:37:21 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> Date: Mon, 17 Feb 2025 21:37:06 +0100 Message-ID: <87pljgcnpp.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Virus-Scanned: ClamAV using ClamSMTP Received-SPF: pass client-ip=198.54.122.146; envelope-from=basil@HIDDEN; helo=MTA-06-4.privateemail.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, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) 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 (/) --=-=-= Content-Type: text/plain 0. emacs -Q 1. C-h f ert-font-lock-deftest RET *Help* now reports the macro's calling convention as: (ert-font-lock-deftest NAME () [DOCSTRING] ...) but the second () argument is not actually supported by the macro, whose arglist reads: (name &rest docstring-keys-mode-and-str) Here, ert-font-lock--parse-macro-args expects docstring-keys-mode-and-str to start with an (optional) string, not the empty arglist '(). The symptom of this mismatch is that calls to ert-font-lock-deftest are misindented (malindented? :) and misfontified. For example, in ert-font-lock-tests.el: (ert-font-lock-deftest test-macro-test--correct-highlighting emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face ;; ^ font-lock-function-name-face") Here, the string literal has font-lock-doc-face instead of font-lock-string-face. (ert-font-lock-deftest test-macro-test--docstring "A test with a docstring." emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face" ) Here, both strings have font-lock-string-face, whereas the first should have font-lock-doc-face. Finally, if a test actually followed ert-font-lock-deftest's docstring in including an empty arglist (), then ert-describe-test would claim that it is not documented. The attached patch tries to address these issues. WDYT? Thanks, -- Basil --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-ert-font-lock-macro-signatures.patch From 6487a8876fcd66ee38bd67b02994a2ad2b635886 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" <basil@HIDDEN> Date: Sun, 16 Feb 2025 16:29:13 +0100 Subject: [PATCH] Fix ert-font-lock macro signatures * doc/misc/ert.texi (Syntax Highlighting Tests): * test/lisp/emacs-lisp/ert-font-lock-tests.el (test-line-comment-p--emacs-lisp, test-line-comment-p--shell-script) (test-line-comment-p--javascript, test-line-comment-p--python) (test-line-comment-p--c, test-macro-test--correct-highlighting) (test-macro-test--docstring, test-macro-test--failing) (test-macro-test--file, test-macro-test--file-no-asserts) (test-macro-test--file-failing): Reindent macro calls. (with-temp-buffer-str-mode): Evaluate macro arguments left-to-right. (ert-font-lock--wrap-begin-end): Use rx for more robust composition. (test-line-comment-p--php): Require that php-mode is callable, not already loaded. * lisp/emacs-lisp/ert-font-lock.el: Remove redundant requires. (ert-font-lock--parse-macro-args): First return value 'doc' being nil already indicates omission of a docstring, so remove redundant second return value doc-p. All users updated. Fix error messages. (ert-font-lock-deftest, ert-font-lock-deftest-file): NAME is not followed by an empty list like in ert-deftest, so the optional DOCSTRING is actually the second argument. Adapt calling convention in docstring, and debug, doc-string, and indent properties accordingly. Fix docstring grammar, document MAJOR-MODE, and avoid referring to a file name as a path. (ert-font-lock--check-faces): Simplify with ensure-list. --- doc/misc/ert.texi | 10 +-- lisp/emacs-lisp/ert-font-lock.el | 77 ++++++++--------- test/lisp/emacs-lisp/ert-font-lock-tests.el | 94 ++++++++++----------- 3 files changed, 87 insertions(+), 94 deletions(-) diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 566fa03bf3f..8f9e4fff415 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -962,7 +962,7 @@ Syntax Highlighting Tests comments directly and can be read either from inline strings or files. The parser expects the input string to contain at least one assertion. -Test assertion parser extracts tests from comment-only lines. Every +The test assertion parser extracts tests from comment-only lines. Every comment assertion line starts either with a caret (@samp{^}) or an arrow (@samp{<-}). A single caret/arrow or carets should be followed immediately by the name of a face or a list of faces to be checked @@ -984,7 +984,7 @@ Syntax Highlighting Tests @end example Both symbol-only @code{:face} property values and assertion face values -are normalized to single element lists so assertions below are +are normalized to single element lists so the assertions below are equivalent: @example @@ -1061,7 +1061,7 @@ Syntax Highlighting Tests @lisp (ert-font-lock-deftest test-macro-test--inline - emacs-lisp-mode + emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face @@ -1075,13 +1075,13 @@ Syntax Highlighting Tests @lisp (ert-font-lock-deftest-file test-macro-test--file - "Test reading correct assertions from a file" + "Test reading correct assertions from a file." javascript-mode "correct.js") @end lisp The @code{ert-font-lock-deftest} and @code{ert-font-lock-deftest-file} -macros accept the same keyword parameters as @code{ert-deftest} i.e., +macros accept the same keyword arguments as @code{ert-deftest}, i.e., @code{:tag} and @code{:expected-result}. diff --git a/lisp/emacs-lisp/ert-font-lock.el b/lisp/emacs-lisp/ert-font-lock.el index e584eb679fd..0f8e90d747c 100644 --- a/lisp/emacs-lisp/ert-font-lock.el +++ b/lisp/emacs-lisp/ert-font-lock.el @@ -27,8 +27,8 @@ ;; highlighting provided by font-lock. ;; ;; ert-font-lock entry points are functions -;; `ert-font-lock-test-string' and `ert-font-lock-test-file' and -;; convenience macros: `ert-font-lock-deftest' and +;; `ert-font-lock-test-string' and `ert-font-lock-test-file', and +;; convenience macros `ert-font-lock-deftest' and ;; `ert-font-lock-deftest-file'. ;; ;; See unit tests in ert-font-lock-tests.el for usage examples. @@ -37,8 +37,6 @@ (require 'ert) (require 'ert-x) -(require 'newcomment) -(require 'pcase) (defconst ert-font-lock--face-symbol-re (rx (+ (or alphanumeric "-" "_" "." "/"))) @@ -100,98 +98,95 @@ ert-font-lock--test-body-file (defun ert-font-lock--parse-macro-args (doc-keys-mode-arg) "Parse DOC-KEYS-MODE-ARG macro argument list." - (let (doc doc-p mode arg) + (let (doc mode arg) (when (stringp (car doc-keys-mode-arg)) - (setq doc (pop doc-keys-mode-arg) - doc-p t)) + (setq doc (pop doc-keys-mode-arg))) (pcase-let ((`(,keys ,mode-arg) (ert--parse-keys-and-body doc-keys-mode-arg))) (unless (symbolp (car mode-arg)) - (error "A major mode symbol expected: %S" (car mode-arg))) + (error "Expected a major mode symbol: %S" (car mode-arg))) (setq mode (pop mode-arg)) (unless (stringp (car mode-arg)) - (error "A string or file with assertions expected: %S" (car mode-arg))) + (error "Expected a string or file with assertions: %S" (car mode-arg))) (setq arg (pop mode-arg)) - (list doc doc-p keys mode arg)))) + (list doc keys mode arg)))) ;;;###autoload (defmacro ert-font-lock-deftest (name &rest docstring-keys-mode-and-str) "Define test NAME (a symbol) using assertions from TEST-STR. -Other than MAJOR-MODE and TEST-STR parameters, this macro accepts -the same parameters and keywords as `ert-deftest' and is intended -to be used through `ert'. +The MAJOR-MODE symbol determines the syntax and font lock of TEST-STR. -\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ +Except for the MAJOR-MODE and TEST-STR parameters, this macro accepts +the same arguments and keywords as `ert-deftest' and is intended to be +used through `ert'. + +\(fn NAME [DOCSTRING] [:expected-result RESULT-TYPE] \ [:tags \\='(TAG...)] MAJOR-MODE TEST-STR)" (declare (debug (&define [&name "test@" symbolp] - sexp [&optional stringp] + [&optional stringp] [&rest keywordp sexp] symbolp stringp)) - (doc-string 3) - (indent 2)) - (pcase-let ((`(,documentation - ,documentation-supplied-p - ,keys ,mode ,arg) + (doc-string 2) + (indent 1)) + (pcase-let ((`(,documentation ,keys ,mode ,arg) (ert-font-lock--parse-macro-args docstring-keys-mode-and-str))) `(ert-set-test ',name (make-ert-test :name ',name - ,@(when documentation-supplied-p + ,@(when documentation `(:documentation ,documentation)) ,@(when (map-contains-key keys :expected-result) `(:expected-result-type ,(map-elt keys :expected-result))) ,@(when (map-contains-key keys :tags) `(:tags ,(map-elt keys :tags))) - :body (lambda () (ert-font-lock--test-body-str ',mode ,arg ',name)) - + :body (lambda () + (ert-font-lock--test-body-str ',mode ,arg ',name)) :file-name ,(or (macroexp-file-name) buffer-file-name))))) ;;;###autoload (defmacro ert-font-lock-deftest-file (name &rest docstring-keys-mode-and-file) "Define test NAME (a symbol) using assertions from FILE. -FILE - path to a file with assertions in ERT resource director as -return by `ert-resource-directory'. +FILE names a file with assertions in the ERT resource directory, as +returned by `ert-resource-directory'. The MAJOR-MODE symbol determines +the syntax and font lock of FILE's contents. -Other than MAJOR-MODE and FILE parameters, this macro accepts the -same parameters and keywords as `ert-deftest' and is intended to -be used through `ert'. +Except for the MAJOR-MODE and FILE parameters, this macro accepts the +same arguments and keywords as `ert-deftest' and is intended to be used +through `ert'. -\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ +\(fn NAME [DOCSTRING] [:expected-result RESULT-TYPE] \ [:tags \\='(TAG...)] MAJOR-MODE FILE)" (declare (debug (&define [&name "test@" symbolp] - sexp [&optional stringp] + [&optional stringp] [&rest keywordp sexp] symbolp stringp)) - (doc-string 3) - (indent 2)) - - (pcase-let ((`(,documentation - ,documentation-supplied-p - ,keys ,mode ,arg) + (doc-string 2) + (indent 1)) + (pcase-let ((`(,documentation ,keys ,mode ,arg) (ert-font-lock--parse-macro-args docstring-keys-mode-and-file))) `(ert-set-test ',name (make-ert-test :name ',name - ,@(when documentation-supplied-p + ,@(when documentation `(:documentation ,documentation)) ,@(when (map-contains-key keys :expected-result) `(:expected-result-type ,(map-elt keys :expected-result))) ,@(when (map-contains-key keys :tags) `(:tags ,(map-elt keys :tags))) :body (lambda () (ert-font-lock--test-body-file - ',mode (ert-resource-file ,arg) ',name)) + ',mode (ert-resource-file ,arg) ',name)) :file-name ,(or (macroexp-file-name) buffer-file-name))))) (defun ert-font-lock--in-comment-p () @@ -354,10 +349,8 @@ ert-font-lock--check-faces ;; normalize both expected and resulting face - these can be ;; either symbols, nils or lists of symbols - (when (not (listp actual-face)) - (setq actual-face (list actual-face))) - (when (not (listp expected-face)) - (setq expected-face (list expected-face))) + (setq actual-face (ensure-list actual-face)) + (setq expected-face (ensure-list expected-face)) ;; fail when lists are not 'equal and the assertion is *not negated* (when (and (not negation) (not (equal actual-face expected-face))) diff --git a/test/lisp/emacs-lisp/ert-font-lock-tests.el b/test/lisp/emacs-lisp/ert-font-lock-tests.el index e410cf5fa13..194a79f32b7 100644 --- a/test/lisp/emacs-lisp/ert-font-lock-tests.el +++ b/test/lisp/emacs-lisp/ert-font-lock-tests.el @@ -39,13 +39,13 @@ with-temp-buffer-str-mode "Create a buffer with STR contents and MODE. " (declare (indent 1) (debug t)) `(with-temp-buffer - (insert ,str) (,mode) + (insert ,str) (goto-char (point-min)) ,@body)) (defun ert-font-lock--wrap-begin-end (re) - (concat "^" re "$")) + (rx bol (regexp re) eol)) ;;; Regexp tests ;;; @@ -97,89 +97,89 @@ test-line-comment-p--fundamental (ert-deftest test-line-comment-p--emacs-lisp () (with-temp-buffer-str-mode emacs-lisp-mode - "not comment + "not comment ;; comment " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--shell-script () (with-temp-buffer-str-mode shell-script-mode - "echo Not a comment + "echo Not a comment # comment " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (declare-function php-mode "php-mode") (ert-deftest test-line-comment-p--php () - (skip-unless (featurep 'php-mode)) + (skip-unless (fboundp 'php-mode)) (with-temp-buffer-str-mode php-mode - "echo 'Not a comment' + "echo 'Not a comment' // comment /* comment */ " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--javascript () (with-temp-buffer-str-mode javascript-mode - "// comment + "// comment // comment, after a blank line var abc = function(d) {}; " - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--python () (with-temp-buffer-str-mode python-mode - "# comment + "# comment # comment print(\"Hello, world!\")" - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--c () (with-temp-buffer-str-mode c-mode - "// comment + "// comment /* also comment */" - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (ert-deftest test-parse-comments--no-assertion-error () (let* ((str " @@ -568,14 +568,14 @@ test-font-lock-test-file--wrong ;; (ert-font-lock-deftest test-macro-test--correct-highlighting - emacs-lisp-mode + emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face ;; ^ font-lock-function-name-face") (ert-font-lock-deftest test-macro-test--docstring - "A test with a docstring." + "A test with a docstring." emacs-lisp-mode " (defun fun ()) @@ -583,7 +583,7 @@ fun ) (ert-font-lock-deftest test-macro-test--failing - "A failing test." + "A failing test." :expected-result :failed emacs-lisp-mode " @@ -591,18 +591,18 @@ fun ;; ^ wrong-face") (ert-font-lock-deftest-file test-macro-test--file - "Test reading correct assertions from a file" + "Test reading correct assertions from a file" javascript-mode "correct.js") (ert-font-lock-deftest-file test-macro-test--file-no-asserts - "Check failing on files without assertions" + "Check failing on files without assertions." :expected-result :failed javascript-mode "no-asserts.js") (ert-font-lock-deftest-file test-macro-test--file-failing - "Test reading wrong assertions from a file" + "Test reading wrong assertions from a file." :expected-result :failed javascript-mode "broken.js") -- 2.47.2 --=-=-= Content-Type: text/plain In GNU Emacs 31.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.18.2, Xaw3d scroll bars) of 2025-02-16 built on tais Repository revision: fc189cb83cf7284344a737e75b3ee56487b1c386 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101015 System Description: Debian GNU/Linux trixie/sid Configured using: 'configure 'CFLAGS=-Og -ggdb3' -C --prefix=/home/blc/.local --enable-checking=structs --without-native-compilation --with-file-notification --with-x-toolkit=lucid --with-x' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG 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 XINERAMA XINPUT2 XPM XRANDR LUCID ZLIB Important settings: value of $LANG: en_IE.UTF-8 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 minibuffer-regexp-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 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 cl-extra shortdoc text-property-search comp-common rx ert-font-lock pcase ert-x subr-x ert map pp ewoc debug backtrace find-func thingatpt help-fns byte-opt gv bytecomp byte-compile radix-tree help-mode cl-loaddefs cl-lib 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 dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo x-toolkit xinput2 x multi-tty move-toolbar make-network-process tty-child-frames emacs) Memory information: ((conses 16 75191 9165) (symbols 48 7566 0) (strings 32 22214 1377) (string-bytes 1 522717) (vectors 16 13949) (vector-slots 8 148704 7756) (floats 8 87 2) (intervals 56 318 7) (buffers 992 11)) --=-=-=--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: "Basil L. Contovounesios" <basil@HIDDEN> Subject: bug#76372: Acknowledgement (31.0.50; False () in ert-font-lock macro signatures) Message-ID: <handler.76372.B.173982466024748.ack <at> debbugs.gnu.org> References: <87pljgcnpp.fsf@HIDDEN> X-Gnu-PR-Message: ack 76372 X-Gnu-PR-Package: emacs Reply-To: 76372 <at> debbugs.gnu.org Date: Mon, 17 Feb 2025 20:38:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Vladimir Kazanov <vekazanov@HIDDEN> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): bug-gnu-emacs@HIDDEN If you wish to submit further information on this problem, please send it to 76372 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 76372: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76372 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: Vladimir Kazanov <vekazanov@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Tue, 18 Feb 2025 19:42:01 +0000 Resent-Message-ID: <handler.76372.B76372.173990769131493 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: "Basil L. Contovounesios" <basil@HIDDEN> Cc: 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.173990769131493 (code B ref 76372); Tue, 18 Feb 2025 19:42:01 +0000 Received: (at 76372) by debbugs.gnu.org; 18 Feb 2025 19:41:31 +0000 Received: from localhost ([127.0.0.1]:33635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tkTTF-0008Bl-R3 for submit <at> debbugs.gnu.org; Tue, 18 Feb 2025 14:41:30 -0500 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]:46085) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <vekazanov@HIDDEN>) id 1tkTTC-0008Ao-VR for 76372 <at> debbugs.gnu.org; Tue, 18 Feb 2025 14:41:27 -0500 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-30a303a656aso24286021fa.0 for <76372 <at> debbugs.gnu.org>; Tue, 18 Feb 2025 11:41:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739907680; x=1740512480; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=M4vUUyenHdbIuqvOYfuy5kCtSBsq21F1nXe6ZMNiMqE=; b=CNAzxh6jb6NRDE05X+ejlalMazSSrcnW9JBJH7SSGuFZuAXcXF0RMc62kwqrXBDD1I CmZKxrIMUd+wgKj9qd0iyzEWy46btxvBtdzWXyMuLWpLFlzEv8jJ5DXrXkpT81zsxw2A hDG1frbxYmRqyo0Ftg/NIk27pwIhzPY2aN7edIUztkLaZW2dVVKlIIszB5sOEJ6ixGal wzBFOgOEpoJV4HXbwIiXJi4nRlTwJ5q1efbK/NvrTIYFQtVPp9rLs29TekFoJUQdB+es qvR0QFXrd3JKstcuqRHArb50GbfcQdqCqyymONybHsV5+jAP/T5GR80YMI/QJNVIHlbG 1XyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739907680; x=1740512480; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M4vUUyenHdbIuqvOYfuy5kCtSBsq21F1nXe6ZMNiMqE=; b=E1cn5ihlUwxJx6yk+CgXSngb4gxpzgyk5FRBR3gXC7h1N2cJm03tKeKFGNXq2VfcC3 bv6xwpzdyzFSOcRZkQ4J0wzJXk7DqZk1xr6G87feIx2CdCmzm2GOlxO3d/vS6KGd3yWn WCv898NloBI4Hm2ldDWs/d6hLsV98gAcDvf+CY3C09dVpCRPTqsmLLVjK6k6MqlDmnom N0pltl/FJ9XiesoE0RxfpRk2FZnmQltDANKmPoPyHzdseSVHveqVNkger7Q4R06+YStQ MjW9bzD0BJu4udXDoCFLeSZoN2ipCvVJ1fANsgc3w+UPFUSld6D4yj/5yBV7adzBzlHH yZDw== X-Gm-Message-State: AOJu0YyfxzPcYghWaZxE81AZHrvCQNHJOpJ3UlZ4FgHpMXmn9G0nluJv g2L6rbHSg7cqgR60Uq7Kp0JrribNgEf54zhnjjzCvQY8eebZlFUW6qjjmYy7bOQLvy70LzKVqZu qjjZyJbZ67hcIK2oNAFFnPXWl4NnJIr4rnQ== X-Gm-Gg: ASbGncsPVFI9/LCwkUA2W68jPoKcInCBRBxfb+Qa1s65hs4wjkwfFmI+LU31o2kyqD4 +gP2mC9bXWMjdzg9wVSvamzerJ+bm6L5GwtF4RGfZiVCW3TEMC50FeubIQRbO1CFNbi/NaA== X-Google-Smtp-Source: AGHT+IFiDdtIY5HVxSB4wmncjBGRphmScbiOSFsWmrcYq519VhD4YXTZZHe9zCApPLmxtSo0PiLg9c3AQANpX60vBWM= X-Received: by 2002:a2e:7c0f:0:b0:302:1861:6de7 with SMTP id 38308e7fff4ca-30927ad551emr42235151fa.24.1739907680054; Tue, 18 Feb 2025 11:41:20 -0800 (PST) MIME-Version: 1.0 References: <87pljgcnpp.fsf@HIDDEN> In-Reply-To: <87pljgcnpp.fsf@HIDDEN> From: Vladimir Kazanov <vekazanov@HIDDEN> Date: Tue, 18 Feb 2025 19:41:08 +0000 X-Gm-Features: AWEUYZmMIP1GfjYEgFK1HXHyPQ9Ad2JEg2pHfdlxBdUBSAq7NkGDlVv_zwHezsA Message-ID: <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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.0 (-) Hi Basil, Thanks for taking a look at ert-font-lock! I am on vacation right now so only have time for a brief review of the patch. So here are a couple of comments/questions for the patch: - (when (not (listp actual-face)) - (setq actual-face (list actual-face))) - (when (not (listp expected-face)) - (setq expected-face (list expected-face))) + (setq actual-face (ensure-list actual-face)) + (setq expected-face (ensure-list expected-face)) This is cool! - (insert ,str) (,mode) + (insert ,str) Not saying this is wrong but looks like something that might change things subtly. Do tests pass? > - (skip-unless (featurep 'php-mode)) > + (skip-unless (fboundp 'php-mode)) What difference does it make? featurep vs fboundp? > - "Test reading correct assertions from a file" > + "Test reading correct assertions from a file" Similar to other docstrings, this asks for a period in the end. Otherwise, great to see my rusty Elisp and non-native English cleaned up a bit. Thanks Vlad On Mon, 17 Feb 2025 at 20:38, Basil L. Contovounesios <basil@HIDDEN> wrote: > > 0. emacs -Q > 1. C-h f ert-font-lock-deftest RET > > *Help* now reports the macro's calling convention as: > > (ert-font-lock-deftest NAME () [DOCSTRING] ...) > > but the second () argument is not actually supported by the macro, whose > arglist reads: > > (name &rest docstring-keys-mode-and-str) > > Here, ert-font-lock--parse-macro-args expects > docstring-keys-mode-and-str to start with an (optional) string, > not the empty arglist '(). > > The symptom of this mismatch is that calls to ert-font-lock-deftest are > misindented (malindented? :) and misfontified. For example, in > ert-font-lock-tests.el: > > (ert-font-lock-deftest test-macro-test--correct-highlighting > emacs-lisp-mode > " > (defun fun ()) > ;; ^ font-lock-keyword-face > ;; ^ font-lock-function-name-face") > > Here, the string literal has font-lock-doc-face instead of > font-lock-string-face. > > (ert-font-lock-deftest test-macro-test--docstring > "A test with a docstring." > emacs-lisp-mode > " > (defun fun ()) > ;; ^ font-lock-keyword-face" > ) > > Here, both strings have font-lock-string-face, whereas the first should > have font-lock-doc-face. > > Finally, if a test actually followed ert-font-lock-deftest's docstring > in including an empty arglist (), then ert-describe-test would claim > that it is not documented. > > The attached patch tries to address these issues. > WDYT? > > Thanks, > -- > Basil > > > In GNU Emacs 31.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo > version 1.18.2, Xaw3d scroll bars) of 2025-02-16 built on tais > Repository revision: fc189cb83cf7284344a737e75b3ee56487b1c386 > Repository branch: master > Windowing system distributor 'The X.Org Foundation', version 11.0.12101015 > System Description: Debian GNU/Linux trixie/sid > > Configured using: > 'configure 'CFLAGS=-Og -ggdb3' -C --prefix=/home/blc/.local > --enable-checking=structs --without-native-compilation > --with-file-notification --with-x-toolkit=lucid --with-x' > > Configured features: > ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG > 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 XINERAMA XINPUT2 > XPM XRANDR LUCID ZLIB > > Important settings: > value of $LANG: en_IE.UTF-8 > 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 > minibuffer-regexp-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 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 cl-extra shortdoc > text-property-search comp-common rx ert-font-lock pcase ert-x subr-x ert > map pp ewoc debug backtrace find-func thingatpt help-fns byte-opt gv > bytecomp byte-compile radix-tree help-mode cl-loaddefs cl-lib 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 dbusbind inotify lcms2 dynamic-setting system-font-setting > font-render-setting cairo x-toolkit xinput2 x multi-tty move-toolbar > make-network-process tty-child-frames emacs) > > Memory information: > ((conses 16 75191 9165) (symbols 48 7566 0) (strings 32 22214 1377) > (string-bytes 1 522717) (vectors 16 13949) > (vector-slots 8 148704 7756) (floats 8 87 2) (intervals 56 318 7) > (buffers 992 11)) -- Regards, Vladimir Kazanov
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: "Basil L. Contovounesios" <basil@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Wed, 19 Feb 2025 20:17:01 +0000 Resent-Message-ID: <handler.76372.B76372.173999617014350 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Vladimir Kazanov <vekazanov@HIDDEN> Cc: 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.173999617014350 (code B ref 76372); Wed, 19 Feb 2025 20:17:01 +0000 Received: (at 76372) by debbugs.gnu.org; 19 Feb 2025 20:16:10 +0000 Received: from localhost ([127.0.0.1]:52544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tkqUL-0003jJ-9H for submit <at> debbugs.gnu.org; Wed, 19 Feb 2025 15:16:10 -0500 Received: from mta-09-4.privateemail.com ([198.54.127.118]:53377) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tkqUF-0003hh-Gt for 76372 <at> debbugs.gnu.org; Wed, 19 Feb 2025 15:16:07 -0500 Received: from mta-09.privateemail.com (localhost [127.0.0.1]) by mta-09.privateemail.com (Postfix) with ESMTP id 4YynhX61Rnz3hhV2; Wed, 19 Feb 2025 15:15:56 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1739996156; bh=VCs15byUw//59FOiKhmVOWqihzLyJZ8WGKiVqvDDxRs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=LsaujzMlFhQmxtpiy2UxA0Sl9NM2e8AOf3tf9bmjLT/sdp2Ku+OPhAwmcdmlh+CTb KNUedm/uPwfzcF9lJC/r2pPlack7iAN6mfd6iLPiTZY4tq7lloDua6k2t+t0r58o6z /WIeRJfCBEJ13C1EmoF6S1woIJn1lZkhHdfubG4Hnss56nddWCH1Y53HStAiVir4+2 3LHLgc2BLF4qWUiuksuVuJSp/n9ur0yQsRjzEfJf7Yvm7xCICCnUTZc+7iDPnxeOie 5rJXmmg4WhgrrrftDTtz9eyKeUHXmBVBfiR9r6hQ4a+3i9/z/AczaNoaBkvI2/eZA0 JiWl+/9gAPzFA== Received: from localhost (unknown [31.46.242.24]) by mta-09.privateemail.com (Postfix) with ESMTPA; Wed, 19 Feb 2025 15:15:55 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> In-Reply-To: <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> Date: Wed, 19 Feb 2025 21:15:50 +0100 Message-ID: <87eczt6689.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 0.0 (/) 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.0 (-) Vladimir Kazanov [2025-02-18 19:41 +0000] wrote: > Thanks for taking a look at ert-font-lock! I am on vacation right now > so only have time for a brief review of the patch. No worries. I hope you have a nice vacation, and thanks for taking a look anyway. > - (insert ,str) > (,mode) > + (insert ,str) > > Not saying this is wrong but looks like something that might change > things subtly. Do tests pass? Yes, tests still pass (modulo those that were already failing): $ make check $ make TEST_LOAD_EL=no \ test/{autoconf,{go,lua,rust}-ts-mode,ert{,-x,-font-lock}}-tests If this were a general-purpose macro required to be robust, I would have used e.g. macroexp-let2 to ensure the correct argument evaluation order. Since this is a convenience used only in tests, I thought I could get away with being lazy, but you caught me ;). >> - (skip-unless (featurep 'php-mode)) >> + (skip-unless (fboundp 'php-mode)) > > What difference does it make? featurep vs fboundp? featurep returns non-nil if the file php-mode.el has already been loaded, whereas fboundp returns non-nil if the function php-mode is defined (even as an autoload). During 'make check' it doesn't make a difference, since php-mode is not even installed, let alone defined as a function or feature. But if someone has php-mode.el installed via package-install, then the function php-mode is automatically autoloaded. If the test tries to call the function php-mode, Emacs will know which file to load in order to find the function's real definition. So it is not necessary to have php-mode.el already loaded (which involves an extra step by the user); it suffices to have the php-mode package installed properly in order to run the test. Regardless of these details, fboundp is a more accurate test-skip condition because all the test is doing is calling a function called php-mode; it does not care about where that function is defined, and specifically whether it's defined by a feature called php-mode. >> - "Test reading correct assertions from a file" >> + "Test reading correct assertions from a file" > > Similar to other docstrings, this asks for a period in the end. Well spotted, thanks. I've updated the patch locally, and am ready to apply further feedback, or push it if there are no further comments. -- Basil
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: Vladimir Kazanov <vekazanov@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Thu, 20 Feb 2025 08:25:01 +0000 Resent-Message-ID: <handler.76372.B76372.174003984618941 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: "Basil L. Contovounesios" <basil@HIDDEN> Cc: 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.174003984618941 (code B ref 76372); Thu, 20 Feb 2025 08:25:01 +0000 Received: (at 76372) by debbugs.gnu.org; 20 Feb 2025 08:24:06 +0000 Received: from localhost ([127.0.0.1]:59518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl1qn-0004vO-GF for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 03:24:05 -0500 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]:55792) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <vekazanov@HIDDEN>) id 1tl1qi-0004u7-T1 for 76372 <at> debbugs.gnu.org; Thu, 20 Feb 2025 03:24:03 -0500 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5452e6f2999so693061e87.3 for <76372 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 00:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740039833; x=1740644633; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Y2TBsFgwDtG3E9rqRbgg4w/QjyJgs5cwyOtwhyDKS+I=; b=SaTbYHHty3OO57Vso7E4bbcdjRTP5FItXhLCV7Avs6X4G7edftQ53619JK0U3cMIQk SIXOx4z1oTqkap1Biif3I2oftwtzkXCoOGvJ/TAsrZg11+SyeoKPAEdzPlCDpomQcixx 4MosirCETIwCmVvnEkUjgsRc40zaYy3dhQAieR9v231B8Y+wc/wdlivEQQTQwB5QPw10 gMuQ2wx28hCXtGhxPgJhi0TDl1OIcAyBH2TB+YizQ9BOq5EeuQ8PICPxNxfLyR8tqdto +aFyiBV/X3lW0SRvYHsMpB2NuvMdxCVigWs339tF6tVHya7LE4EGqoAWYN62112zdUlK Wccg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740039833; x=1740644633; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y2TBsFgwDtG3E9rqRbgg4w/QjyJgs5cwyOtwhyDKS+I=; b=OH7AEyOX8Ui4zznRAb4R/2K2WPlGZBjwgwrSrs6nqlaD9nJ2sdF1ltCoD6lhYcDgCX /u/m3a87VJUChRZz1Mvf55fAB283u3Cy1G3EskRGXdDuUPy7hEdMe1EiyBmxKn2lCzlH aBwCKKq2ldOtLKOBGx+jsy5nczVVfIb/9SVp9r0ouvVzsZ/qovaHwFOBQvxom+z6xrQ8 hAGNlerd4TExkBxJlP99ihb5woaltS/zSvpUroNFUhpDappWyPm7KISUmzMExMmlhTus h2EI+8Cf0ghhNmKt3O4hq4QnruRmOmvTGyd/VN3ti3drd84Mes/OUQ5pXFFKt+olAUxR 5CPg== X-Gm-Message-State: AOJu0YzgHQHUJEQ7qr2BOl/sjI/5X9IEYjlRYyf8pyMWNqIWRWhR5M9l TnMUnFtq9+Psg5o721mZ1z/nTAjwc+wcSvhEV5hhT5/8UAwFg+VGNTekPM4kUXtDStsxrO/ayxz zcOYlIQ3hjpzVYzf9fe0uOPd8sg== X-Gm-Gg: ASbGncvy3NCZrezLfDeu/1+o4yv4QMFKAzmR9Z6/DG2DW1K7poc2TxULenXwvnoO6nu JVixamweUAcDjnWuWhCdF23l24c2fTnvb0vAfaufEFYypjrb45s4SvQxjRZGOs1Zi40js X-Google-Smtp-Source: AGHT+IEZfdBnun5yZMhh6wE0sLJ891y48jh5sFwmGDXEtLdvjvIJwMrCzxYMZGVkAjf/hmZqdR9gI5AqNAiF44PhJr0= X-Received: by 2002:ac2:4e05:0:b0:545:2f97:f6e9 with SMTP id 2adb3069b0e04-5452fe71bfemr6127592e87.42.1740039832880; Thu, 20 Feb 2025 00:23:52 -0800 (PST) MIME-Version: 1.0 References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> In-Reply-To: <87eczt6689.fsf@HIDDEN> From: Vladimir Kazanov <vekazanov@HIDDEN> Date: Thu, 20 Feb 2025 08:23:41 +0000 X-Gm-Features: AWEUYZnvl_Dyx4F9q8K09KnJKnT6xcbTsE88SoPAxgUJ3of_t8-5lGg4R2gSOoU Message-ID: <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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.0 (-) Feel free to push, Thanks for looking into this! On Wed, 19 Feb 2025 at 20:15, Basil L. Contovounesios <basil@HIDDEN> wrote: > > Vladimir Kazanov [2025-02-18 19:41 +0000] wrote: > > > Thanks for taking a look at ert-font-lock! I am on vacation right now > > so only have time for a brief review of the patch. > > No worries. > I hope you have a nice vacation, and thanks for taking a look anyway. > > > - (insert ,str) > > (,mode) > > + (insert ,str) > > > > Not saying this is wrong but looks like something that might change > > things subtly. Do tests pass? > > Yes, tests still pass (modulo those that were already failing): > > $ make check > $ make TEST_LOAD_EL=no \ > test/{autoconf,{go,lua,rust}-ts-mode,ert{,-x,-font-lock}}-tests > > If this were a general-purpose macro required to be robust, I would have > used e.g. macroexp-let2 to ensure the correct argument evaluation order. > > Since this is a convenience used only in tests, I thought I could get > away with being lazy, but you caught me ;). > > >> - (skip-unless (featurep 'php-mode)) > >> + (skip-unless (fboundp 'php-mode)) > > > > What difference does it make? featurep vs fboundp? > > featurep returns non-nil if the file php-mode.el has already been > loaded, whereas fboundp returns non-nil if the function php-mode is > defined (even as an autoload). > > During 'make check' it doesn't make a difference, since php-mode is not > even installed, let alone defined as a function or feature. > > But if someone has php-mode.el installed via package-install, then the > function php-mode is automatically autoloaded. If the test tries to > call the function php-mode, Emacs will know which file to load in order > to find the function's real definition. So it is not necessary to have > php-mode.el already loaded (which involves an extra step by the user); > it suffices to have the php-mode package installed properly in order to > run the test. > > Regardless of these details, fboundp is a more accurate test-skip > condition because all the test is doing is calling a function called > php-mode; it does not care about where that function is defined, and > specifically whether it's defined by a feature called php-mode. > > >> - "Test reading correct assertions from a file" > >> + "Test reading correct assertions from a file" > > > > Similar to other docstrings, this asks for a period in the end. > > Well spotted, thanks. > > I've updated the patch locally, and am ready to apply further feedback, > or push it if there are no further comments. > > -- > Basil -- Regards, Vladimir Kazanov
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: "Basil L. Contovounesios" <basil@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Thu, 20 Feb 2025 09:54:02 +0000 Resent-Message-ID: <handler.76372.B76372.174004522922591 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Vladimir Kazanov <vekazanov@HIDDEN> Cc: 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.174004522922591 (code B ref 76372); Thu, 20 Feb 2025 09:54:02 +0000 Received: (at 76372) by debbugs.gnu.org; 20 Feb 2025 09:53:49 +0000 Received: from localhost ([127.0.0.1]:60313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl3Fb-0005rz-4H for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 04:53:49 -0500 Received: from mta-08-4.privateemail.com ([198.54.122.147]:35054) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tl3FX-0005r2-0N; Thu, 20 Feb 2025 04:53:44 -0500 Received: from mta-08.privateemail.com (localhost [127.0.0.1]) by mta-08.privateemail.com (Postfix) with ESMTP id 4Yz7r031k1z3hhW8; Thu, 20 Feb 2025 04:53:36 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1740045216; bh=cV/7heogKTANclV4TEMQiM785vjzthkIpzbY7RenVWE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=TNj6kLyNy99YFSf8zk1qq7sTHFB34UPriM2R1/DF/yUX152CcNpZkcmoPzPq2ahPS xRu0Sbe9789OJYayu/Umtj7xSQCtaYUGsNaFaGP/TX/Q+k5N+VJxyOiCPALUPkFpMe YnezjAcVKgbIWs820EWEHQXaVAI+TreahPtIuzkOZoquLecFcf7KAKQnO2NmzRRolI N5SQr1Q9Vo5a5/ZYQLzBhwTa8U7ddBm7pfcJgHyCwnhKvjV92T1G7+ak8qGvKZ5ed8 xKaL4Tk49EddJkU8RkxNkecID1gb1jIw5CIijv86kUg1X5Cn32+37MC56ljWeClXJc 1kJfsTBdQYRlg== Received: from localhost (unknown [31.46.242.24]) by mta-08.privateemail.com (Postfix) with ESMTPA; Thu, 20 Feb 2025 04:53:33 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> In-Reply-To: <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Thu, 20 Feb 2025 10:53:28 +0100 Message-ID: <87msehvt5z.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 0.0 (/) 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.0 (-) --=-=-= Content-Type: text/plain found 76372 30.0.93 quit Vladimir Kazanov [2025-02-20 08:23 +0000] wrote: > Feel free to push, I was about to, but then it occurred to me that ert-font-lock is new in Emacs 30. Perhaps the docstring fixes at least should go to emacs-30 instead of master? If Eli/Stefan/Andrea agree, I propose the first patch for emacs-30, and the second for master (they just separate the documentation/test changes from those to code). To recap, the main issue in this report is that the arglist of ert-font-lock-deftest and ert-font-lock-deftest-file is misrepresented in their documentation and declare specs, which can lead to minor confusion, misindentation, and misfontification. > Thanks for looking into this! Thank *you* for the neat feature and review! -- Basil --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-ert-font-lock-macro-signatures.patch From ea2b2e3612e026129d9cf043d7e2444981084605 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" <basil@HIDDEN> Date: Thu, 20 Feb 2025 10:29:54 +0100 Subject: [PATCH 1/2] Fix ert-font-lock macro signatures * doc/misc/ert.texi (Syntax Highlighting Tests): * test/lisp/emacs-lisp/ert-font-lock-tests.el (test-line-comment-p--emacs-lisp, test-line-comment-p--shell-script) (test-line-comment-p--javascript, test-line-comment-p--python) (test-line-comment-p--c, test-macro-test--correct-highlighting) (test-macro-test--docstring, test-macro-test--failing) (test-macro-test--file, test-macro-test--file-no-asserts) (test-macro-test--file-failing): Reindent macro calls. (with-temp-buffer-str-mode): Evaluate macro arguments left-to-right. (ert-font-lock--wrap-begin-end): Use rx for more robust composition. (test-line-comment-p--php): Require that php-mode is callable, not already loaded. * lisp/emacs-lisp/ert-font-lock.el (ert-font-lock-deftest) (ert-font-lock-deftest-file): NAME is not followed by an empty list like in ert-deftest, so the optional DOCSTRING is actually the second argument. Adapt calling convention in docstring, and debug, doc-string, and indent properties accordingly (bug#76372). Fix docstring grammar, document MAJOR-MODE, and avoid referring to a file name as a path. --- doc/misc/ert.texi | 10 +-- lisp/emacs-lisp/ert-font-lock.el | 39 +++++---- test/lisp/emacs-lisp/ert-font-lock-tests.el | 94 ++++++++++----------- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 566fa03bf3f..8f9e4fff415 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -962,7 +962,7 @@ Syntax Highlighting Tests comments directly and can be read either from inline strings or files. The parser expects the input string to contain at least one assertion. -Test assertion parser extracts tests from comment-only lines. Every +The test assertion parser extracts tests from comment-only lines. Every comment assertion line starts either with a caret (@samp{^}) or an arrow (@samp{<-}). A single caret/arrow or carets should be followed immediately by the name of a face or a list of faces to be checked @@ -984,7 +984,7 @@ Syntax Highlighting Tests @end example Both symbol-only @code{:face} property values and assertion face values -are normalized to single element lists so assertions below are +are normalized to single element lists so the assertions below are equivalent: @example @@ -1061,7 +1061,7 @@ Syntax Highlighting Tests @lisp (ert-font-lock-deftest test-macro-test--inline - emacs-lisp-mode + emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face @@ -1075,13 +1075,13 @@ Syntax Highlighting Tests @lisp (ert-font-lock-deftest-file test-macro-test--file - "Test reading correct assertions from a file" + "Test reading correct assertions from a file." javascript-mode "correct.js") @end lisp The @code{ert-font-lock-deftest} and @code{ert-font-lock-deftest-file} -macros accept the same keyword parameters as @code{ert-deftest} i.e., +macros accept the same keyword arguments as @code{ert-deftest}, i.e., @code{:tag} and @code{:expected-result}. diff --git a/lisp/emacs-lisp/ert-font-lock.el b/lisp/emacs-lisp/ert-font-lock.el index e584eb679fd..80f4a6d5467 100644 --- a/lisp/emacs-lisp/ert-font-lock.el +++ b/lisp/emacs-lisp/ert-font-lock.el @@ -27,8 +27,8 @@ ;; highlighting provided by font-lock. ;; ;; ert-font-lock entry points are functions -;; `ert-font-lock-test-string' and `ert-font-lock-test-file' and -;; convenience macros: `ert-font-lock-deftest' and +;; `ert-font-lock-test-string' and `ert-font-lock-test-file', and +;; convenience macros `ert-font-lock-deftest' and ;; `ert-font-lock-deftest-file'. ;; ;; See unit tests in ert-font-lock-tests.el for usage examples. @@ -124,19 +124,21 @@ ert-font-lock--parse-macro-args (defmacro ert-font-lock-deftest (name &rest docstring-keys-mode-and-str) "Define test NAME (a symbol) using assertions from TEST-STR. -Other than MAJOR-MODE and TEST-STR parameters, this macro accepts -the same parameters and keywords as `ert-deftest' and is intended -to be used through `ert'. +The MAJOR-MODE symbol determines the syntax and font lock of TEST-STR. -\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ +Except for the MAJOR-MODE and TEST-STR parameters, this macro accepts +the same arguments and keywords as `ert-deftest' and is intended to be +used through `ert'. + +\(fn NAME [DOCSTRING] [:expected-result RESULT-TYPE] \ [:tags \\='(TAG...)] MAJOR-MODE TEST-STR)" (declare (debug (&define [&name "test@" symbolp] - sexp [&optional stringp] + [&optional stringp] [&rest keywordp sexp] symbolp stringp)) - (doc-string 3) - (indent 2)) + (doc-string 2) + (indent 1)) (pcase-let ((`(,documentation ,documentation-supplied-p ,keys ,mode ,arg) @@ -159,22 +161,23 @@ ert-font-lock-deftest (defmacro ert-font-lock-deftest-file (name &rest docstring-keys-mode-and-file) "Define test NAME (a symbol) using assertions from FILE. -FILE - path to a file with assertions in ERT resource director as -return by `ert-resource-directory'. +FILE names a file with assertions in the ERT resource directory, as +returned by `ert-resource-directory'. The MAJOR-MODE symbol determines +the syntax and font lock of FILE's contents. -Other than MAJOR-MODE and FILE parameters, this macro accepts the -same parameters and keywords as `ert-deftest' and is intended to -be used through `ert'. +Except for the MAJOR-MODE and FILE parameters, this macro accepts the +same arguments and keywords as `ert-deftest' and is intended to be used +through `ert'. -\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ +\(fn NAME [DOCSTRING] [:expected-result RESULT-TYPE] \ [:tags \\='(TAG...)] MAJOR-MODE FILE)" (declare (debug (&define [&name "test@" symbolp] - sexp [&optional stringp] + [&optional stringp] [&rest keywordp sexp] symbolp stringp)) - (doc-string 3) - (indent 2)) + (doc-string 2) + (indent 1)) (pcase-let ((`(,documentation ,documentation-supplied-p diff --git a/test/lisp/emacs-lisp/ert-font-lock-tests.el b/test/lisp/emacs-lisp/ert-font-lock-tests.el index e410cf5fa13..0c3e4405562 100644 --- a/test/lisp/emacs-lisp/ert-font-lock-tests.el +++ b/test/lisp/emacs-lisp/ert-font-lock-tests.el @@ -39,13 +39,13 @@ with-temp-buffer-str-mode "Create a buffer with STR contents and MODE. " (declare (indent 1) (debug t)) `(with-temp-buffer - (insert ,str) (,mode) + (insert ,str) (goto-char (point-min)) ,@body)) (defun ert-font-lock--wrap-begin-end (re) - (concat "^" re "$")) + (rx bol (regexp re) eol)) ;;; Regexp tests ;;; @@ -97,89 +97,89 @@ test-line-comment-p--fundamental (ert-deftest test-line-comment-p--emacs-lisp () (with-temp-buffer-str-mode emacs-lisp-mode - "not comment + "not comment ;; comment " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--shell-script () (with-temp-buffer-str-mode shell-script-mode - "echo Not a comment + "echo Not a comment # comment " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (declare-function php-mode "php-mode") (ert-deftest test-line-comment-p--php () - (skip-unless (featurep 'php-mode)) + (skip-unless (fboundp 'php-mode)) (with-temp-buffer-str-mode php-mode - "echo 'Not a comment' + "echo 'Not a comment' // comment /* comment */ " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--javascript () (with-temp-buffer-str-mode javascript-mode - "// comment + "// comment // comment, after a blank line var abc = function(d) {}; " - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--python () (with-temp-buffer-str-mode python-mode - "# comment + "# comment # comment print(\"Hello, world!\")" - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--c () (with-temp-buffer-str-mode c-mode - "// comment + "// comment /* also comment */" - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (ert-deftest test-parse-comments--no-assertion-error () (let* ((str " @@ -568,14 +568,14 @@ test-font-lock-test-file--wrong ;; (ert-font-lock-deftest test-macro-test--correct-highlighting - emacs-lisp-mode + emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face ;; ^ font-lock-function-name-face") (ert-font-lock-deftest test-macro-test--docstring - "A test with a docstring." + "A test with a docstring." emacs-lisp-mode " (defun fun ()) @@ -583,7 +583,7 @@ fun ) (ert-font-lock-deftest test-macro-test--failing - "A failing test." + "A failing test." :expected-result :failed emacs-lisp-mode " @@ -591,18 +591,18 @@ fun ;; ^ wrong-face") (ert-font-lock-deftest-file test-macro-test--file - "Test reading correct assertions from a file" + "Test reading correct assertions from a file." javascript-mode "correct.js") (ert-font-lock-deftest-file test-macro-test--file-no-asserts - "Check failing on files without assertions" + "Check failing on files without assertions." :expected-result :failed javascript-mode "no-asserts.js") (ert-font-lock-deftest-file test-macro-test--file-failing - "Test reading wrong assertions from a file" + "Test reading wrong assertions from a file." :expected-result :failed javascript-mode "broken.js") -- 2.47.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Clean-up-ert-font-lock-error-messages.patch From e53bcc902db2223045f518facf8d95ac102bfb56 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" <basil@HIDDEN> Date: Thu, 20 Feb 2025 10:34:00 +0100 Subject: [PATCH 2/2] Clean up ert-font-lock error messages * lisp/emacs-lisp/ert-font-lock.el: Remove redundant requires. (ert-font-lock--parse-macro-args): First return value 'doc' being nil already indicates omission of a docstring, so remove redundant second return value doc-p. All users updated. Fix error messages (bug#76372). (ert-font-lock--check-faces): Simplify with ensure-list. --- lisp/emacs-lisp/ert-font-lock.el | 38 ++++++++++++-------------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/lisp/emacs-lisp/ert-font-lock.el b/lisp/emacs-lisp/ert-font-lock.el index 80f4a6d5467..0f8e90d747c 100644 --- a/lisp/emacs-lisp/ert-font-lock.el +++ b/lisp/emacs-lisp/ert-font-lock.el @@ -37,8 +37,6 @@ (require 'ert) (require 'ert-x) -(require 'newcomment) -(require 'pcase) (defconst ert-font-lock--face-symbol-re (rx (+ (or alphanumeric "-" "_" "." "/"))) @@ -100,25 +98,24 @@ ert-font-lock--test-body-file (defun ert-font-lock--parse-macro-args (doc-keys-mode-arg) "Parse DOC-KEYS-MODE-ARG macro argument list." - (let (doc doc-p mode arg) + (let (doc mode arg) (when (stringp (car doc-keys-mode-arg)) - (setq doc (pop doc-keys-mode-arg) - doc-p t)) + (setq doc (pop doc-keys-mode-arg))) (pcase-let ((`(,keys ,mode-arg) (ert--parse-keys-and-body doc-keys-mode-arg))) (unless (symbolp (car mode-arg)) - (error "A major mode symbol expected: %S" (car mode-arg))) + (error "Expected a major mode symbol: %S" (car mode-arg))) (setq mode (pop mode-arg)) (unless (stringp (car mode-arg)) - (error "A string or file with assertions expected: %S" (car mode-arg))) + (error "Expected a string or file with assertions: %S" (car mode-arg))) (setq arg (pop mode-arg)) - (list doc doc-p keys mode arg)))) + (list doc keys mode arg)))) ;;;###autoload (defmacro ert-font-lock-deftest (name &rest docstring-keys-mode-and-str) @@ -139,22 +136,20 @@ ert-font-lock-deftest stringp)) (doc-string 2) (indent 1)) - (pcase-let ((`(,documentation - ,documentation-supplied-p - ,keys ,mode ,arg) + (pcase-let ((`(,documentation ,keys ,mode ,arg) (ert-font-lock--parse-macro-args docstring-keys-mode-and-str))) `(ert-set-test ',name (make-ert-test :name ',name - ,@(when documentation-supplied-p + ,@(when documentation `(:documentation ,documentation)) ,@(when (map-contains-key keys :expected-result) `(:expected-result-type ,(map-elt keys :expected-result))) ,@(when (map-contains-key keys :tags) `(:tags ,(map-elt keys :tags))) - :body (lambda () (ert-font-lock--test-body-str ',mode ,arg ',name)) - + :body (lambda () + (ert-font-lock--test-body-str ',mode ,arg ',name)) :file-name ,(or (macroexp-file-name) buffer-file-name))))) ;;;###autoload @@ -178,23 +173,20 @@ ert-font-lock-deftest-file stringp)) (doc-string 2) (indent 1)) - - (pcase-let ((`(,documentation - ,documentation-supplied-p - ,keys ,mode ,arg) + (pcase-let ((`(,documentation ,keys ,mode ,arg) (ert-font-lock--parse-macro-args docstring-keys-mode-and-file))) `(ert-set-test ',name (make-ert-test :name ',name - ,@(when documentation-supplied-p + ,@(when documentation `(:documentation ,documentation)) ,@(when (map-contains-key keys :expected-result) `(:expected-result-type ,(map-elt keys :expected-result))) ,@(when (map-contains-key keys :tags) `(:tags ,(map-elt keys :tags))) :body (lambda () (ert-font-lock--test-body-file - ',mode (ert-resource-file ,arg) ',name)) + ',mode (ert-resource-file ,arg) ',name)) :file-name ,(or (macroexp-file-name) buffer-file-name))))) (defun ert-font-lock--in-comment-p () @@ -357,10 +349,8 @@ ert-font-lock--check-faces ;; normalize both expected and resulting face - these can be ;; either symbols, nils or lists of symbols - (when (not (listp actual-face)) - (setq actual-face (list actual-face))) - (when (not (listp expected-face)) - (setq expected-face (list expected-face))) + (setq actual-face (ensure-list actual-face)) + (setq expected-face (ensure-list expected-face)) ;; fail when lists are not 'equal and the assertion is *not negated* (when (and (not negation) (not (equal actual-face expected-face))) -- 2.47.2 --=-=-=--
Received: (at control) by debbugs.gnu.org; 20 Feb 2025 09:53:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 20 04:53:51 2025 Received: from localhost ([127.0.0.1]:60315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl3Fd-0005sK-HP for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 04:53:51 -0500 Received: from mta-08-4.privateemail.com ([198.54.122.147]:35054) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tl3FX-0005r2-0N; Thu, 20 Feb 2025 04:53:44 -0500 Received: from mta-08.privateemail.com (localhost [127.0.0.1]) by mta-08.privateemail.com (Postfix) with ESMTP id 4Yz7r031k1z3hhW8; Thu, 20 Feb 2025 04:53:36 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1740045216; bh=cV/7heogKTANclV4TEMQiM785vjzthkIpzbY7RenVWE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=TNj6kLyNy99YFSf8zk1qq7sTHFB34UPriM2R1/DF/yUX152CcNpZkcmoPzPq2ahPS xRu0Sbe9789OJYayu/Umtj7xSQCtaYUGsNaFaGP/TX/Q+k5N+VJxyOiCPALUPkFpMe YnezjAcVKgbIWs820EWEHQXaVAI+TreahPtIuzkOZoquLecFcf7KAKQnO2NmzRRolI N5SQr1Q9Vo5a5/ZYQLzBhwTa8U7ddBm7pfcJgHyCwnhKvjV92T1G7+ak8qGvKZ5ed8 xKaL4Tk49EddJkU8RkxNkecID1gb1jIw5CIijv86kUg1X5Cn32+37MC56ljWeClXJc 1kJfsTBdQYRlg== Received: from localhost (unknown [31.46.242.24]) by mta-08.privateemail.com (Postfix) with ESMTPA; Thu, 20 Feb 2025 04:53:33 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> To: Vladimir Kazanov <vekazanov@HIDDEN> Subject: Re: bug#76372: 31.0.50; False () in ert-font-lock macro signatures In-Reply-To: <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Thu, 20 Feb 2025 10:53:28 +0100 Message-ID: <87msehvt5z.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: 76372 <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.0 (-) --=-=-= Content-Type: text/plain found 76372 30.0.93 quit Vladimir Kazanov [2025-02-20 08:23 +0000] wrote: > Feel free to push, I was about to, but then it occurred to me that ert-font-lock is new in Emacs 30. Perhaps the docstring fixes at least should go to emacs-30 instead of master? If Eli/Stefan/Andrea agree, I propose the first patch for emacs-30, and the second for master (they just separate the documentation/test changes from those to code). To recap, the main issue in this report is that the arglist of ert-font-lock-deftest and ert-font-lock-deftest-file is misrepresented in their documentation and declare specs, which can lead to minor confusion, misindentation, and misfontification. > Thanks for looking into this! Thank *you* for the neat feature and review! -- Basil --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-ert-font-lock-macro-signatures.patch From ea2b2e3612e026129d9cf043d7e2444981084605 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" <basil@HIDDEN> Date: Thu, 20 Feb 2025 10:29:54 +0100 Subject: [PATCH 1/2] Fix ert-font-lock macro signatures * doc/misc/ert.texi (Syntax Highlighting Tests): * test/lisp/emacs-lisp/ert-font-lock-tests.el (test-line-comment-p--emacs-lisp, test-line-comment-p--shell-script) (test-line-comment-p--javascript, test-line-comment-p--python) (test-line-comment-p--c, test-macro-test--correct-highlighting) (test-macro-test--docstring, test-macro-test--failing) (test-macro-test--file, test-macro-test--file-no-asserts) (test-macro-test--file-failing): Reindent macro calls. (with-temp-buffer-str-mode): Evaluate macro arguments left-to-right. (ert-font-lock--wrap-begin-end): Use rx for more robust composition. (test-line-comment-p--php): Require that php-mode is callable, not already loaded. * lisp/emacs-lisp/ert-font-lock.el (ert-font-lock-deftest) (ert-font-lock-deftest-file): NAME is not followed by an empty list like in ert-deftest, so the optional DOCSTRING is actually the second argument. Adapt calling convention in docstring, and debug, doc-string, and indent properties accordingly (bug#76372). Fix docstring grammar, document MAJOR-MODE, and avoid referring to a file name as a path. --- doc/misc/ert.texi | 10 +-- lisp/emacs-lisp/ert-font-lock.el | 39 +++++---- test/lisp/emacs-lisp/ert-font-lock-tests.el | 94 ++++++++++----------- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 566fa03bf3f..8f9e4fff415 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -962,7 +962,7 @@ Syntax Highlighting Tests comments directly and can be read either from inline strings or files. The parser expects the input string to contain at least one assertion. -Test assertion parser extracts tests from comment-only lines. Every +The test assertion parser extracts tests from comment-only lines. Every comment assertion line starts either with a caret (@samp{^}) or an arrow (@samp{<-}). A single caret/arrow or carets should be followed immediately by the name of a face or a list of faces to be checked @@ -984,7 +984,7 @@ Syntax Highlighting Tests @end example Both symbol-only @code{:face} property values and assertion face values -are normalized to single element lists so assertions below are +are normalized to single element lists so the assertions below are equivalent: @example @@ -1061,7 +1061,7 @@ Syntax Highlighting Tests @lisp (ert-font-lock-deftest test-macro-test--inline - emacs-lisp-mode + emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face @@ -1075,13 +1075,13 @@ Syntax Highlighting Tests @lisp (ert-font-lock-deftest-file test-macro-test--file - "Test reading correct assertions from a file" + "Test reading correct assertions from a file." javascript-mode "correct.js") @end lisp The @code{ert-font-lock-deftest} and @code{ert-font-lock-deftest-file} -macros accept the same keyword parameters as @code{ert-deftest} i.e., +macros accept the same keyword arguments as @code{ert-deftest}, i.e., @code{:tag} and @code{:expected-result}. diff --git a/lisp/emacs-lisp/ert-font-lock.el b/lisp/emacs-lisp/ert-font-lock.el index e584eb679fd..80f4a6d5467 100644 --- a/lisp/emacs-lisp/ert-font-lock.el +++ b/lisp/emacs-lisp/ert-font-lock.el @@ -27,8 +27,8 @@ ;; highlighting provided by font-lock. ;; ;; ert-font-lock entry points are functions -;; `ert-font-lock-test-string' and `ert-font-lock-test-file' and -;; convenience macros: `ert-font-lock-deftest' and +;; `ert-font-lock-test-string' and `ert-font-lock-test-file', and +;; convenience macros `ert-font-lock-deftest' and ;; `ert-font-lock-deftest-file'. ;; ;; See unit tests in ert-font-lock-tests.el for usage examples. @@ -124,19 +124,21 @@ ert-font-lock--parse-macro-args (defmacro ert-font-lock-deftest (name &rest docstring-keys-mode-and-str) "Define test NAME (a symbol) using assertions from TEST-STR. -Other than MAJOR-MODE and TEST-STR parameters, this macro accepts -the same parameters and keywords as `ert-deftest' and is intended -to be used through `ert'. +The MAJOR-MODE symbol determines the syntax and font lock of TEST-STR. -\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ +Except for the MAJOR-MODE and TEST-STR parameters, this macro accepts +the same arguments and keywords as `ert-deftest' and is intended to be +used through `ert'. + +\(fn NAME [DOCSTRING] [:expected-result RESULT-TYPE] \ [:tags \\='(TAG...)] MAJOR-MODE TEST-STR)" (declare (debug (&define [&name "test@" symbolp] - sexp [&optional stringp] + [&optional stringp] [&rest keywordp sexp] symbolp stringp)) - (doc-string 3) - (indent 2)) + (doc-string 2) + (indent 1)) (pcase-let ((`(,documentation ,documentation-supplied-p ,keys ,mode ,arg) @@ -159,22 +161,23 @@ ert-font-lock-deftest (defmacro ert-font-lock-deftest-file (name &rest docstring-keys-mode-and-file) "Define test NAME (a symbol) using assertions from FILE. -FILE - path to a file with assertions in ERT resource director as -return by `ert-resource-directory'. +FILE names a file with assertions in the ERT resource directory, as +returned by `ert-resource-directory'. The MAJOR-MODE symbol determines +the syntax and font lock of FILE's contents. -Other than MAJOR-MODE and FILE parameters, this macro accepts the -same parameters and keywords as `ert-deftest' and is intended to -be used through `ert'. +Except for the MAJOR-MODE and FILE parameters, this macro accepts the +same arguments and keywords as `ert-deftest' and is intended to be used +through `ert'. -\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ +\(fn NAME [DOCSTRING] [:expected-result RESULT-TYPE] \ [:tags \\='(TAG...)] MAJOR-MODE FILE)" (declare (debug (&define [&name "test@" symbolp] - sexp [&optional stringp] + [&optional stringp] [&rest keywordp sexp] symbolp stringp)) - (doc-string 3) - (indent 2)) + (doc-string 2) + (indent 1)) (pcase-let ((`(,documentation ,documentation-supplied-p diff --git a/test/lisp/emacs-lisp/ert-font-lock-tests.el b/test/lisp/emacs-lisp/ert-font-lock-tests.el index e410cf5fa13..0c3e4405562 100644 --- a/test/lisp/emacs-lisp/ert-font-lock-tests.el +++ b/test/lisp/emacs-lisp/ert-font-lock-tests.el @@ -39,13 +39,13 @@ with-temp-buffer-str-mode "Create a buffer with STR contents and MODE. " (declare (indent 1) (debug t)) `(with-temp-buffer - (insert ,str) (,mode) + (insert ,str) (goto-char (point-min)) ,@body)) (defun ert-font-lock--wrap-begin-end (re) - (concat "^" re "$")) + (rx bol (regexp re) eol)) ;;; Regexp tests ;;; @@ -97,89 +97,89 @@ test-line-comment-p--fundamental (ert-deftest test-line-comment-p--emacs-lisp () (with-temp-buffer-str-mode emacs-lisp-mode - "not comment + "not comment ;; comment " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--shell-script () (with-temp-buffer-str-mode shell-script-mode - "echo Not a comment + "echo Not a comment # comment " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (declare-function php-mode "php-mode") (ert-deftest test-line-comment-p--php () - (skip-unless (featurep 'php-mode)) + (skip-unless (fboundp 'php-mode)) (with-temp-buffer-str-mode php-mode - "echo 'Not a comment' + "echo 'Not a comment' // comment /* comment */ " - (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--javascript () (with-temp-buffer-str-mode javascript-mode - "// comment + "// comment // comment, after a blank line var abc = function(d) {}; " - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--python () (with-temp-buffer-str-mode python-mode - "# comment + "# comment # comment print(\"Hello, world!\")" - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)) + (forward-line) + (should-not (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)) + (forward-line) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should-not (ert-font-lock--line-comment-p)))) + (forward-line) + (should-not (ert-font-lock--line-comment-p)))) (ert-deftest test-line-comment-p--c () (with-temp-buffer-str-mode c-mode - "// comment + "// comment /* also comment */" - (should (ert-font-lock--line-comment-p)) + (should (ert-font-lock--line-comment-p)) - (forward-line) - (should (ert-font-lock--line-comment-p)))) + (forward-line) + (should (ert-font-lock--line-comment-p)))) (ert-deftest test-parse-comments--no-assertion-error () (let* ((str " @@ -568,14 +568,14 @@ test-font-lock-test-file--wrong ;; (ert-font-lock-deftest test-macro-test--correct-highlighting - emacs-lisp-mode + emacs-lisp-mode " (defun fun ()) ;; ^ font-lock-keyword-face ;; ^ font-lock-function-name-face") (ert-font-lock-deftest test-macro-test--docstring - "A test with a docstring." + "A test with a docstring." emacs-lisp-mode " (defun fun ()) @@ -583,7 +583,7 @@ fun ) (ert-font-lock-deftest test-macro-test--failing - "A failing test." + "A failing test." :expected-result :failed emacs-lisp-mode " @@ -591,18 +591,18 @@ fun ;; ^ wrong-face") (ert-font-lock-deftest-file test-macro-test--file - "Test reading correct assertions from a file" + "Test reading correct assertions from a file." javascript-mode "correct.js") (ert-font-lock-deftest-file test-macro-test--file-no-asserts - "Check failing on files without assertions" + "Check failing on files without assertions." :expected-result :failed javascript-mode "no-asserts.js") (ert-font-lock-deftest-file test-macro-test--file-failing - "Test reading wrong assertions from a file" + "Test reading wrong assertions from a file." :expected-result :failed javascript-mode "broken.js") -- 2.47.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Clean-up-ert-font-lock-error-messages.patch From e53bcc902db2223045f518facf8d95ac102bfb56 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" <basil@HIDDEN> Date: Thu, 20 Feb 2025 10:34:00 +0100 Subject: [PATCH 2/2] Clean up ert-font-lock error messages * lisp/emacs-lisp/ert-font-lock.el: Remove redundant requires. (ert-font-lock--parse-macro-args): First return value 'doc' being nil already indicates omission of a docstring, so remove redundant second return value doc-p. All users updated. Fix error messages (bug#76372). (ert-font-lock--check-faces): Simplify with ensure-list. --- lisp/emacs-lisp/ert-font-lock.el | 38 ++++++++++++-------------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/lisp/emacs-lisp/ert-font-lock.el b/lisp/emacs-lisp/ert-font-lock.el index 80f4a6d5467..0f8e90d747c 100644 --- a/lisp/emacs-lisp/ert-font-lock.el +++ b/lisp/emacs-lisp/ert-font-lock.el @@ -37,8 +37,6 @@ (require 'ert) (require 'ert-x) -(require 'newcomment) -(require 'pcase) (defconst ert-font-lock--face-symbol-re (rx (+ (or alphanumeric "-" "_" "." "/"))) @@ -100,25 +98,24 @@ ert-font-lock--test-body-file (defun ert-font-lock--parse-macro-args (doc-keys-mode-arg) "Parse DOC-KEYS-MODE-ARG macro argument list." - (let (doc doc-p mode arg) + (let (doc mode arg) (when (stringp (car doc-keys-mode-arg)) - (setq doc (pop doc-keys-mode-arg) - doc-p t)) + (setq doc (pop doc-keys-mode-arg))) (pcase-let ((`(,keys ,mode-arg) (ert--parse-keys-and-body doc-keys-mode-arg))) (unless (symbolp (car mode-arg)) - (error "A major mode symbol expected: %S" (car mode-arg))) + (error "Expected a major mode symbol: %S" (car mode-arg))) (setq mode (pop mode-arg)) (unless (stringp (car mode-arg)) - (error "A string or file with assertions expected: %S" (car mode-arg))) + (error "Expected a string or file with assertions: %S" (car mode-arg))) (setq arg (pop mode-arg)) - (list doc doc-p keys mode arg)))) + (list doc keys mode arg)))) ;;;###autoload (defmacro ert-font-lock-deftest (name &rest docstring-keys-mode-and-str) @@ -139,22 +136,20 @@ ert-font-lock-deftest stringp)) (doc-string 2) (indent 1)) - (pcase-let ((`(,documentation - ,documentation-supplied-p - ,keys ,mode ,arg) + (pcase-let ((`(,documentation ,keys ,mode ,arg) (ert-font-lock--parse-macro-args docstring-keys-mode-and-str))) `(ert-set-test ',name (make-ert-test :name ',name - ,@(when documentation-supplied-p + ,@(when documentation `(:documentation ,documentation)) ,@(when (map-contains-key keys :expected-result) `(:expected-result-type ,(map-elt keys :expected-result))) ,@(when (map-contains-key keys :tags) `(:tags ,(map-elt keys :tags))) - :body (lambda () (ert-font-lock--test-body-str ',mode ,arg ',name)) - + :body (lambda () + (ert-font-lock--test-body-str ',mode ,arg ',name)) :file-name ,(or (macroexp-file-name) buffer-file-name))))) ;;;###autoload @@ -178,23 +173,20 @@ ert-font-lock-deftest-file stringp)) (doc-string 2) (indent 1)) - - (pcase-let ((`(,documentation - ,documentation-supplied-p - ,keys ,mode ,arg) + (pcase-let ((`(,documentation ,keys ,mode ,arg) (ert-font-lock--parse-macro-args docstring-keys-mode-and-file))) `(ert-set-test ',name (make-ert-test :name ',name - ,@(when documentation-supplied-p + ,@(when documentation `(:documentation ,documentation)) ,@(when (map-contains-key keys :expected-result) `(:expected-result-type ,(map-elt keys :expected-result))) ,@(when (map-contains-key keys :tags) `(:tags ,(map-elt keys :tags))) :body (lambda () (ert-font-lock--test-body-file - ',mode (ert-resource-file ,arg) ',name)) + ',mode (ert-resource-file ,arg) ',name)) :file-name ,(or (macroexp-file-name) buffer-file-name))))) (defun ert-font-lock--in-comment-p () @@ -357,10 +349,8 @@ ert-font-lock--check-faces ;; normalize both expected and resulting face - these can be ;; either symbols, nils or lists of symbols - (when (not (listp actual-face)) - (setq actual-face (list actual-face))) - (when (not (listp expected-face)) - (setq expected-face (list expected-face))) + (setq actual-face (ensure-list actual-face)) + (setq expected-face (ensure-list expected-face)) ;; fail when lists are not 'equal and the assertion is *not negated* (when (and (not negation) (not (equal actual-face expected-face))) -- 2.47.2 --=-=-=--
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: Vladimir Kazanov <vekazanov@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Mon, 24 Feb 2025 09:26:02 +0000 Resent-Message-ID: <handler.76372.B76372.174038915110209 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: "Basil L. Contovounesios" <basil@HIDDEN> Cc: 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.174038915110209 (code B ref 76372); Mon, 24 Feb 2025 09:26:02 +0000 Received: (at 76372) by debbugs.gnu.org; 24 Feb 2025 09:25:51 +0000 Received: from localhost ([127.0.0.1]:38481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tmUik-0002ea-Sd for submit <at> debbugs.gnu.org; Mon, 24 Feb 2025 04:25:51 -0500 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:54413) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <vekazanov@HIDDEN>) id 1tmUig-0002eI-9u for 76372 <at> debbugs.gnu.org; Mon, 24 Feb 2025 04:25:48 -0500 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-5452ed5b5b2so4213957e87.0 for <76372 <at> debbugs.gnu.org>; Mon, 24 Feb 2025 01:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740389139; x=1740993939; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Vir+D3CqTuwKgqSfUC4KIxJmsYSYAndIn0XrOTTOKnc=; b=FMJN0y6dNoVfi5zbUCrQ97B3/apvRoT3j5xwPCsLTgAqoJqykfHTK+OJ+VTuncpUiL Mg8qMRBl1AfxndRj5Xm7eiMtoW0fh+ozW4RKnjwd9L64Q7s0TYrdH3T4zkxn7QTHC6kN AINfJfPjSIWszIoCGy1P5OvabzmBUvgue8j9jp3d1F+lTGmLyC5WQcsiASMcjhSjz04m GXROvxu6WQ10MJ+hipyCj1xoPNl1Aox7JEJ6/GhDD94cfrvAXWocxZtSyvf0/bQj2l6H sWvYCkfSK/ziekXdwbxEwUT3QLnmgs+CB3vum0kzRax9eHrjLzFlag4ixJZfdxbTmJ9D gvyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740389139; x=1740993939; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Vir+D3CqTuwKgqSfUC4KIxJmsYSYAndIn0XrOTTOKnc=; b=h964CA5hh8+yfConX3fVGCwk/fVK6EpcgAbccG2922FwsExXbtzCneyw2869vjcdBP zARQqu8U/8TgfMfhaFJDcl5/TjdGuqSrlW1C8eiLimFxyhyCwzyeI0VgFEWEij5gZ3zS GlmzXOlZqnlCD9i53XsgbRgKrXZyQUuae4tl6QRQq+K2ydajrFWj3bnRRODxGd+hHq8z EVJbMW3dlmv0smdjKU7TThum+x9+TRje8tVQn2riIDoZY7KMVBXpujQpxMaEVljZM/xU X22TJwUKH6JKMEeDDv7Cl9lwkz6XyEeH0MKiRDDpGmUNuqxxfpv1obI1G0JBj4O8+HM9 1ZiA== X-Gm-Message-State: AOJu0Yx6XbPRMF+9cA+JyJKqCsoS9zSbdLXdDWj0No1LtcPWg0GOx3z2 nFbXSDPHBOHk1w8Xrbrin4/HSB+1I+N60YdYYvJLs+gHP1rcZWDzIU50h1ru/gUnsuW5k5BBE0D LMOKeu7AsX1Ox0Rha7o0xexe5eg== X-Gm-Gg: ASbGncugjz6z9XKgeCp1N0uW6Q2HXRCZqn5grXu7UoEhuT/YSonWSHplQZ6dyOS8DNo f2qHh0uKZrTzrvwkvWnz4Gg4VTcrJNSeA5RpYkveDlsonju17OqKwkulDUJqrMPgjNDyaq9T7/s vRmy68CVA= X-Google-Smtp-Source: AGHT+IGKiN+zuIE6qPaNM5WAu+0lVPf0KbSw7Nn3QanzGWBh1kxXdbiHdGuHwlqoZnmPS2FuGLayUARLOLNkIrnlvyg= X-Received: by 2002:a05:6512:ba6:b0:545:9e4:ca91 with SMTP id 2adb3069b0e04-54838f4e59bmr5051994e87.39.1740389138430; Mon, 24 Feb 2025 01:25:38 -0800 (PST) MIME-Version: 1.0 References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> <87msehvt5z.fsf@HIDDEN> In-Reply-To: <87msehvt5z.fsf@HIDDEN> From: Vladimir Kazanov <vekazanov@HIDDEN> Date: Mon, 24 Feb 2025 09:25:26 +0000 X-Gm-Features: AWEUYZnQyfWkt8QXUhs-yTqU1ZOiInjXj2HjYyoP4JgeJm9DKALmLALfdtNB0Qs Message-ID: <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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.0 (-) Hi Basil, I guess we're not making it in time for emacs-30. So master it is. The problem is inconvenient but not deal breaking for users. On Thu, 20 Feb 2025 at 09:53, Basil L. Contovounesios <basil@HIDDEN> wrote: > > found 76372 30.0.93 > quit > > Vladimir Kazanov [2025-02-20 08:23 +0000] wrote: > > > Feel free to push, > > I was about to, but then it occurred to me that ert-font-lock is new in > Emacs 30. > > Perhaps the docstring fixes at least should go to emacs-30 instead of > master? > > If Eli/Stefan/Andrea agree, I propose the first patch for emacs-30, and > the second for master (they just separate the documentation/test changes > from those to code). > > To recap, the main issue in this report is that the arglist of > ert-font-lock-deftest and ert-font-lock-deftest-file is misrepresented > in their documentation and declare specs, which can lead to minor > confusion, misindentation, and misfontification. > > > Thanks for looking into this! > > Thank *you* for the neat feature and review! > -- > Basil > -- Regards, Vladimir Kazanov
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: "Basil L. Contovounesios" <basil@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Mon, 24 Feb 2025 13:58:02 +0000 Resent-Message-ID: <handler.76372.B76372.174040543828253 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Vladimir Kazanov <vekazanov@HIDDEN> Cc: 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.174040543828253 (code B ref 76372); Mon, 24 Feb 2025 13:58:02 +0000 Received: (at 76372) by debbugs.gnu.org; 24 Feb 2025 13:57:18 +0000 Received: from localhost ([127.0.0.1]:39011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tmYxS-0007Lc-5J for submit <at> debbugs.gnu.org; Mon, 24 Feb 2025 08:57:18 -0500 Received: from mta-15-3.privateemail.com ([198.54.122.111]:32910) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tmYxO-0007Ks-8I for 76372 <at> debbugs.gnu.org; Mon, 24 Feb 2025 08:57:15 -0500 Received: from mta-15.privateemail.com (localhost [127.0.0.1]) by mta-15.privateemail.com (Postfix) with ESMTP id 4Z1j3654wnz3hhTr; Mon, 24 Feb 2025 08:57:06 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1740405426; bh=JYDsMwNYvS6wDAJ1d+XeKs9hhLbLyDdchCzi9tnHg88=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=AvEh5ejD+IEQ4wVJ/GhpAh0OOKmv8gT2DcWsIeyNkbup1IO/FkPsEMEni8MushN5W mqe9SKcBCPseFeUh0KdrQMEJmN5ErRMYZcNRS1O91vyhoe5H/24yp8gLtaOEJ7AN01 /jnmuXu/X/Z4K29WYWI1BDdHK6AKyC8ljTAl8yc/OabsRk+pZk2vNgNChYgvI12/JB 63g2cBpxIKfXrIkfGkrk6tbCS8p+C//Bu3iGWzTHCc7KkMaKLrBhmWsx7lDMoJ/ccb gvlNMC5fXyyNyDVDvwJtmyj/yWgPlC0YOiSu/su8WQPLIXy/RJpxXEGxPvPtWoLRkX sWG0SvsTGX9FQ== Received: from localhost (unknown [31.46.241.197]) by mta-15.privateemail.com (Postfix) with ESMTPA; Mon, 24 Feb 2025 08:57:04 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> In-Reply-To: <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> <87msehvt5z.fsf@HIDDEN> <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> Date: Mon, 24 Feb 2025 14:56:59 +0100 Message-ID: <87bjursaxg.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 0.0 (/) 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.0 (-) Vladimir Kazanov [2025-02-24 09:25 +0000] wrote: > I guess we're not making it in time for emacs-30. So master it is. The > problem is inconvenient but not deal breaking for users. Not in time for 30.1, but still in time for 30.2, assuming the maintainers agree. > On Thu, 20 Feb 2025 at 09:53, Basil L. Contovounesios > <basil@HIDDEN> wrote: >> >> found 76372 30.0.93 >> quit >> >> Vladimir Kazanov [2025-02-20 08:23 +0000] wrote: >> >> > Feel free to push, >> >> I was about to, but then it occurred to me that ert-font-lock is new in >> Emacs 30. >> >> Perhaps the docstring fixes at least should go to emacs-30 instead of >> master? >> >> If Eli/Stefan/Andrea agree, I propose the first patch for emacs-30, and >> the second for master (they just separate the documentation/test changes >> from those to code). >> >> To recap, the main issue in this report is that the arglist of >> ert-font-lock-deftest and ert-font-lock-deftest-file is misrepresented >> in their documentation and declare specs, which can lead to minor >> confusion, misindentation, and misfontification. Thanks, -- Basil
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: Stefan Kangas <stefankangas@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Mon, 24 Feb 2025 17:34:03 +0000 Resent-Message-ID: <handler.76372.B76372.174041841721387 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: "Basil L. Contovounesios" <basil@HIDDEN>, Vladimir Kazanov <vekazanov@HIDDEN> Cc: 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.174041841721387 (code B ref 76372); Mon, 24 Feb 2025 17:34:03 +0000 Received: (at 76372) by debbugs.gnu.org; 24 Feb 2025 17:33:37 +0000 Received: from localhost ([127.0.0.1]:42425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tmcKm-0005Ys-IC for submit <at> debbugs.gnu.org; Mon, 24 Feb 2025 12:33:36 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:51315) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <stefankangas@HIDDEN>) id 1tmcKj-0005YU-Uy for 76372 <at> debbugs.gnu.org; Mon, 24 Feb 2025 12:33:34 -0500 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-abb9709b5b5so863942466b.2 for <76372 <at> debbugs.gnu.org>; Mon, 24 Feb 2025 09:33:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740418407; x=1741023207; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=93+lTXZnUeJWZ2UTKiOBNCmXdforCOg6dyH7GsQ69K8=; b=FaLCmEnRi0pU5vvF4uMAfpOVO4IwPQi+gj40aPidAD+6FDUFV9QquHxmAW2tkxqBtv ZSAl6HsBb/xEeGHMKsgrs0gwAwq2der05b16HJlVR4XHd+S/0dsYOn4W7Kh8GHcJ0CZx WQ+yXBhmKm+jvtSmO3XBQAb90V6YWEzXiJms59LqXHIIemFa5kferUQrC67M7uJZSWrs jbOFCFvfDX5kPkRaJvmphoQNHeqKA0OapkCBwpwtsj/WHJy8Ekk+/wogVU2mUbvY4VtZ FMDA1uG0DdIcaS3wfmKkFxLamxlD6W255LT6n6zmXcVzKydJFZ/s94beTlevkWdRTbzq p1lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740418407; x=1741023207; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=93+lTXZnUeJWZ2UTKiOBNCmXdforCOg6dyH7GsQ69K8=; b=jLdZ5pY7jSmNP6U4CgEpwjTmIosPudSQ20qLiVbXOpx8LvIISJP1Qm6xZqF6mJ4wE7 6kYklpJhwxmg3WbJu1sgvHN7usEuh6sYKtiFtwR4fiay4bLes96UUFSKUJHAA87qElWu DajpiPPTDTeGfPAzoqS0DRX6NDDAfGt/AioaSIXGbY22MQcNN/m0yJsFTAS+UmP5Rx8B 4uBlKHOKgte+fzv/OiCEW12IJUBdWttIJDPeVaIhp60kO1PJPQI6L4ASis0bRMHZi7tN ypgGIx2caFz/fgSLoQ7HnYBV/eK6jk1dNHUgnbP7vG/Ywl57qtwDHyWxWudMsKbFLCPc K3/Q== X-Gm-Message-State: AOJu0YyFn/nqQy5xxz6DOEJGrSBvJx6hpPLrrBTsdAGa0aqIV1J/AscT kcqL12GIRppFxqd1XCjSPU7VOO3EN6YMKzBWXjwTJYoNRMSH5JMk0vAfVj4P0bB9D98osg6CQLM m9o9pjQNCqB+9Ng0OI/Rj8uyj0Tk= X-Gm-Gg: ASbGncucPuiIpnHjWlnf2vYe4YwTXdrLWSMnWh5ij/AOqoutE6d2rSG4OrCV6VZDJR0 SNiI1IjdC/LlUOGLoLLOyPBy9eqDqYTWz/zToZshSvue4qIih5LTdZ6ssm3IDHQFqJkCZV1IG0C O0LuvHD82zGQ== X-Google-Smtp-Source: AGHT+IG0juc+mfFZVVeWHKXgc36pnxUAOFznRyhEj71KpgpW3MxhZpHB2Z3CrnU4HRwKQmttXLdPRl+2HCXEFqwstG4= X-Received: by 2002:a17:906:c147:b0:ab6:d575:3c4c with SMTP id a640c23a62f3a-abed0cc511bmr9212066b.17.1740418407441; Mon, 24 Feb 2025 09:33:27 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 24 Feb 2025 17:33:25 +0000 From: Stefan Kangas <stefankangas@HIDDEN> In-Reply-To: <87bjursaxg.fsf@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> <87msehvt5z.fsf@HIDDEN> <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> <87bjursaxg.fsf@HIDDEN> MIME-Version: 1.0 Date: Mon, 24 Feb 2025 17:33:25 +0000 X-Gm-Features: AWEUYZlIi8CS8-8N1-ToQR_91EEkwW8LRX4n7TIHElPOafgNZjtqcprtYO8slcQ Message-ID: <CADwFkmkMODWBmy=gfa-ncMc9pgYemhnPhMhSMgFMCbo_eiLfMw@HIDDEN> Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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.0 (-) "Basil L. Contovounesios" <basil@HIDDEN> writes: > Vladimir Kazanov [2025-02-24 09:25 +0000] wrote: > >> I guess we're not making it in time for emacs-30. So master it is. The >> problem is inconvenient but not deal breaking for users. > > Not in time for 30.1, but still in time for 30.2, assuming the > maintainers agree. No objection from me.
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: "Basil L. Contovounesios" <basil@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Tue, 25 Feb 2025 11:14:02 +0000 Resent-Message-ID: <handler.76372.B76372.174048198610138 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Kangas <stefankangas@HIDDEN> Cc: Vladimir Kazanov <vekazanov@HIDDEN>, 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.174048198610138 (code B ref 76372); Tue, 25 Feb 2025 11:14:02 +0000 Received: (at 76372) by debbugs.gnu.org; 25 Feb 2025 11:13:06 +0000 Received: from localhost ([127.0.0.1]:45023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tmss5-0002dR-EF for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 06:13:06 -0500 Received: from mta-09-4.privateemail.com ([198.54.127.118]:53235) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tmss2-0002cs-7i for 76372 <at> debbugs.gnu.org; Tue, 25 Feb 2025 06:13:03 -0500 Received: from mta-09.privateemail.com (localhost [127.0.0.1]) by mta-09.privateemail.com (Postfix) with ESMTP id 4Z2FM85LBJz3hhSR; Tue, 25 Feb 2025 06:12:52 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1740481972; bh=JvrgyPRL9Xo0cILOPKBqs+y/o/S1VepMA/BUc7Ed4zA=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Gc9cAA3tiucZrCjF6mP+Of3hUb9kt7WLvAK4c8QYNw93mYYc259r+0cxAtPlsVRfI Q6qBz3d9WzogeDyTqnweZ3aGo7lhJUibShoh/41LQxX/RtowaNGOkfC3DXcMrLHDty SI0XdD3hPlDTc8ZTBnhD4bjSOoIBS+n++FjISaAkrnEi6mSiOecISUMuxSbagMeeke YidyeIFyU7pZtPutZLkPGXLLIpk0GMIQCKkutsdS7JmVmH0x97BcmLpIbKk+kU3Tuh 9NQEBQdVCIw+QuZVKw3MoYRa4dX8iSF6xWdFWI6mqRiQDStSNEfjcv+gB4xX4FR3wd b7V3Kue8QZ+pQ== Received: from localhost (unknown [146.70.196.201]) by mta-09.privateemail.com (Postfix) with ESMTPA; Tue, 25 Feb 2025 06:12:49 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> In-Reply-To: <CADwFkmkMODWBmy=gfa-ncMc9pgYemhnPhMhSMgFMCbo_eiLfMw@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> <87msehvt5z.fsf@HIDDEN> <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> <87bjursaxg.fsf@HIDDEN> <CADwFkmkMODWBmy=gfa-ncMc9pgYemhnPhMhSMgFMCbo_eiLfMw@HIDDEN> Date: Tue, 25 Feb 2025 12:12:47 +0100 Message-ID: <87o6yql1lc.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 0.0 (/) 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.0 (-) Stefan Kangas [2025-02-24 17:33 +0000] wrote: > "Basil L. Contovounesios" <basil@HIDDEN> writes: >> Vladimir Kazanov [2025-02-24 09:25 +0000] wrote: >>> I guess we're not making it in time for emacs-30. So master it is. The >>> problem is inconvenient but not deal breaking for users. >> Not in time for 30.1, but still in time for 30.2, assuming the >> maintainers agree. > > No objection from me. Thanks, pushed the first patch to emacs-30: Fix ert-font-lock macro signatures 02c830ba22b 2025-02-25 11:02:55 +0100 https://git.sv.gnu.org/cgit/emacs.git/commit/?id=02c830ba22b I'll wait until that's merged to master before applying the second one. -- Basil
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: Stefan Kangas <stefankangas@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Tue, 04 Mar 2025 02:41:02 +0000 Resent-Message-ID: <handler.76372.B76372.174105603220729 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: "Basil L. Contovounesios" <basil@HIDDEN> Cc: Vladimir Kazanov <vekazanov@HIDDEN>, 76372 <at> debbugs.gnu.org Received: via spool by 76372-submit <at> debbugs.gnu.org id=B76372.174105603220729 (code B ref 76372); Tue, 04 Mar 2025 02:41:02 +0000 Received: (at 76372) by debbugs.gnu.org; 4 Mar 2025 02:40:32 +0000 Received: from localhost ([127.0.0.1]:53699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tpICt-0005OH-HF for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 21:40:31 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:53415) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <stefankangas@HIDDEN>) id 1tpICq-0005Nt-0P for 76372 <at> debbugs.gnu.org; Mon, 03 Mar 2025 21:40:29 -0500 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-abf3cf3d142so428033566b.2 for <76372 <at> debbugs.gnu.org>; Mon, 03 Mar 2025 18:40:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741056022; x=1741660822; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=OaUSArJWEyQtlAGseJaoUP7xF2miAejO7lgnz1bilUA=; b=ULA1BHIz3zo4UiBozsuhL9xGJQFRpP3IHtrHS55dNG968aSB+gH24TkktMMCsyI9o6 dVxQuv1MapDsm8kJ7FC04//lVU27R6+qYF7gYF70YhomC0JLWvm25kY4qTM9ZbxAq9Mp +XzqPPB/rCaKVmI0Yj7dvMCp4hQIIQVA/CF2+diJyqmHvQJaez2AHhN0Ba/tdxxwIyHk Eb7FY29TdqrdZIr9UirlZ9HIa/9lyh7xuCI99p1YrTrxT8kRK2lWSsixc9hc/Bgf3yCu RV3exAIwub8HDKJNhZRrkMGLJ9IL4PhDAVqVQ0QXPQQfcTzlI8QlARCi+gbF+tLUeMTm 56fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741056022; x=1741660822; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OaUSArJWEyQtlAGseJaoUP7xF2miAejO7lgnz1bilUA=; b=tJVowGUEUUJyrNd2LW3/mEWW9au4KirgPG0967LYVEcsaOUT+Dn0TrhW+uR3Zrw20V Ib0mUA/U13CHE6QCLWGkWjtWJCgUGwCuRZ0g8XrbWd3Sv/R1+NR6ZAwxP090x1jzHzYd Cp06wW9TugIT0R1qNnZTryMZkQKQy4+fL8XXvn7QNGhThSOgAgsv41Qdl+MBImGJNf0x 3hQrYPivBXvPcMj8vuw/0OIxCICMrTHlXlG6tRfV/It6DnM8jgzToBzjopgMcj+KhMZW E6n6PfptwY6UUOx9QLAI2GJrXu/gJQ8/2kMuKISxse6DOfeR3eyl/hVgmNIqfOf/KjIy piOQ== X-Forwarded-Encrypted: i=1; AJvYcCWkhAGy9Aj+IBuV/ct8bzFOQ7HVOqGAZhD+8SNtME+vA88Z0zr20fjL48k0lLGdF7t7N1m6qA==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzBiB14tnocAXNEtUgh9cBYFLB9nsKOX/P1pZpTJU+MFEmocVBu Kejs+xh1+ppNpUErGwV6FQFN3wyGwWzMApo2Jn4u0t2kums+hSt0OE5+U7zXOEdw29tchgx1zeg EKaU6XaeJeb/IftGTMQhqICoa13mD3XmXI80ZwA== X-Gm-Gg: ASbGncsyNAGu5pEZGhweg3SKIdnntuNhnrk4o64TQAZ+CoxNzr7GxkQk9oIlNP8yXvX /KsZ28QUN4Tr5TJzmXfKGq7WP5bE5yz0XvMYrXp+J6ByUTr5jIUwn4nWE6HUywMxSSj0jfWCFvx /j92xbZvrlZ4ixQC3wPEXdv0mLRTU= X-Google-Smtp-Source: AGHT+IE/rPX19YXQ4SwuKTpV91iZDMEsRoNEi8r/N4L68L3pd8SnXURFhR0hreEsGKCPOFcObTh2aad0eng4MIIMqYk= X-Received: by 2002:a05:6402:42c8:b0:5df:25e8:26d2 with SMTP id 4fb4d7f45d1cf-5e4d6ac58fdmr37626456a12.5.1741056021683; Mon, 03 Mar 2025 18:40:21 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 4 Mar 2025 02:40:21 +0000 From: Stefan Kangas <stefankangas@HIDDEN> In-Reply-To: <87o6yql1lc.fsf@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> <87msehvt5z.fsf@HIDDEN> <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> <87bjursaxg.fsf@HIDDEN> <CADwFkmkMODWBmy=gfa-ncMc9pgYemhnPhMhSMgFMCbo_eiLfMw@HIDDEN> <87o6yql1lc.fsf@HIDDEN> MIME-Version: 1.0 Date: Tue, 4 Mar 2025 02:40:21 +0000 X-Gm-Features: AQ5f1JqG6q7VzlaaT3Ge3JDxOKviMsv8nDl_fX7kyxoKqkskIZJOLMe82yzEsbU Message-ID: <CADwFkmnV7wE1ZbVx5tSpOe+0sx4Npgz_Eo=+DKVx9btNikKOsg@HIDDEN> Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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.0 (-) "Basil L. Contovounesios" <basil@HIDDEN> writes: > Stefan Kangas [2025-02-24 17:33 +0000] wrote: >> "Basil L. Contovounesios" <basil@HIDDEN> writes: >>> Vladimir Kazanov [2025-02-24 09:25 +0000] wrote: >>>> I guess we're not making it in time for emacs-30. So master it is. The >>>> problem is inconvenient but not deal breaking for users. >>> Not in time for 30.1, but still in time for 30.2, assuming the >>> maintainers agree. >> >> No objection from me. > > Thanks, pushed the first patch to emacs-30: > > Fix ert-font-lock macro signatures > 02c830ba22b 2025-02-25 11:02:55 +0100 > https://git.sv.gnu.org/cgit/emacs.git/commit/?id=02c830ba22b > > I'll wait until that's merged to master before applying the second one. It's merged now.
Received: (at control) by debbugs.gnu.org; 4 Mar 2025 02:40:49 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 03 21:40:49 2025 Received: from localhost ([127.0.0.1]:53702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tpIDA-0005Ox-Ve for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 21:40:49 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:51594) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <stefankangas@HIDDEN>) id 1tpID8-0005Oc-HE for control <at> debbugs.gnu.org; Mon, 03 Mar 2025 21:40:47 -0500 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-5dc89df7eccso8403277a12.3 for <control <at> debbugs.gnu.org>; Mon, 03 Mar 2025 18:40:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741056040; x=1741660840; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=FvHrOS+7WKKs5SXRIincsT4vKO2wxt3pC1Qb4YCaXEc=; b=BehLY4R7MjY1GSlh6+MtkrJEeROcuWJDac1Y2XsymImRHe6eUU0IkYN5y61iC9NLOJ HMmfYMGCn0+GAehzKWrQ6lPBW0qf1U1txA4oKXAfjJpjB53BAGPrUYy5aNDGdFgBlpPz NfpEQO5vQKv71kk2+JrEh7Yv8TxwMdRNlI+YF+03dNzrF6sULEuK9XFfi2ao9XTVhHQn zm7ThPt27zI0joUydgexjb1fDc5Nc1vYZIXPhzBDCV/8kiD/AmAG6x9epGUVpfAxpjxl hzHoP7kByrvq4y9NiQ8H7YyLn/SbPlEaUupD4IBM7TprOrQRD9zVVhbOKOuz/g3+oBPO AHBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741056040; x=1741660840; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FvHrOS+7WKKs5SXRIincsT4vKO2wxt3pC1Qb4YCaXEc=; b=YCgS1VVH4Q8C3LZLLz8CaMrBsKk5b0I4uHzBU8ooiZtEC9ot3UNiWRvrR7KmjwNABj 0IktEZHL93V9zBKH7IUKeA9DqdqU2hA/eDErJCSbLMsEynkWDuHZErR7UbnM9XITOS1P x+OcNWBurxeccvUpdEn+PJEhi4yEjebqp5t0u4PdXIUwsYQnSpDmcD1CUB/owPqocCkf g24GcRPWktBHqoha0hevygAQaDcWdHP0KRKKssmGpPFqna+54XQ6apUSgLDp9Hu72vPR lDYCiO78iqqD+FdN13l6ScyI+/BD4l9EEE/bfA8TyYTOR5MTQQP70YsxiR7rF5LFlapC tKgw== X-Gm-Message-State: AOJu0YwxPyw5UgZDazLKZKVp79qt9JgTMcJyCGCIF/42pl2us310RLRy XuUNdMEcUVTcFEk7elifQCHFy2cIRoV9tXMIVUT/GwVWXKYX+h5ffe7w5zuFGbG4x4u/vTwN/X0 ENwPlW0IHLIKaA2SGH8R0ZrhPekA8GZ0AwGpI/g== X-Gm-Gg: ASbGncueAcNBqc0brxu+n3Gvq0ZzqjE/KPq/3Yd4GbqCW/zO+i4/c2AvQAn2Qe1xc97 wskGV3pVeB4Y70n/U3qAc4TkUqii/BaGRi+kucL1ogxOXydFwct78gMZvinh68dcMTagwU1SvG4 AHeeJMcR3Kug13o/JrngPoCo7SYtQ= X-Google-Smtp-Source: AGHT+IGtskYiJjR/vhOKBNDq4X1b76O9at2+FE6x3p4dPqF0DMSJNZdm4MKNGRSVpfSUJQXWcCJkNu94x3xoULcINnc= X-Received: by 2002:a05:6402:3905:b0:5e0:95ae:af91 with SMTP id 4fb4d7f45d1cf-5e4d6b75e26mr17893044a12.29.1741056040288; Mon, 03 Mar 2025 18:40:40 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 4 Mar 2025 02:40:40 +0000 From: Stefan Kangas <stefankangas@HIDDEN> MIME-Version: 1.0 Date: Tue, 4 Mar 2025 02:40:40 +0000 X-Gm-Features: AQ5f1JqOGtLwOqoLXWjdMIzo_mzZz73CTgNuctAwCGXho2erEp9xJctLhN2qNz8 Message-ID: <CADwFkmnJriD7HPJ94JY+pDG8xs9DXUjcR2-Yv8eUG0p4h-MVJw@HIDDEN> Subject: control message for bug #76372 To: control <at> debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control 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.0 (-) tags 76372 + patch quit
Received: (at control) by debbugs.gnu.org; 7 Mar 2025 15:14:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 07 10:14:56 2025 Received: from localhost ([127.0.0.1]:49602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tqZPb-0007Yx-13 for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 10:14:55 -0500 Received: from mta-07-3.privateemail.com ([198.54.118.214]:62583) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tqZPM-0007Y7-Qg; Fri, 07 Mar 2025 10:14:41 -0500 Received: from mta-07.privateemail.com (localhost [127.0.0.1]) by mta-07.privateemail.com (Postfix) with ESMTP id 4Z8VFQ2lRhz3hhVb; Fri, 7 Mar 2025 10:14:34 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1741360474; bh=VGCbll43CLhcuOaLsYcRCpSw96CdS8L0HSW31At8LcM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=qfRAfp2zh02BT1sCCn3XD874wWD5ib0T9yqG+2gCukDGzvPvk2vTHIbGzmIUQ/TjV AEuhGOV6FG6udxd+0r5yy+h3UqZ/ZQvRuLurNIFsDT/vDdLUjBmH0uVZre52HFo51b BXdiJGgb8po6kLw10sF8w71jmzgeRB1SvvwV5uY5igHl8GH0ZLeWRTYB9UXpVkV10X VHiZA4YCTWYqv6eu11uZ4z9R74U0sNNvqWXD8JQ5KTh3dpRW9YandvAsa30bIM0exF KMlq6q5bwydesB2cXKZzXCVbaAzL28e9VyCUJjoP4dZaeWWYVvU3xz/WvoGjuIPrI4 Fvwrxaha3zaxw== Received: from localhost (unknown [31.152.169.121]) by mta-07.privateemail.com (Postfix) with ESMTPA; Fri, 7 Mar 2025 10:14:28 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> To: Stefan Kangas <stefankangas@HIDDEN> Subject: Re: bug#76372: 31.0.50; False () in ert-font-lock macro signatures In-Reply-To: <CADwFkmnV7wE1ZbVx5tSpOe+0sx4Npgz_Eo=+DKVx9btNikKOsg@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> <87msehvt5z.fsf@HIDDEN> <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> <87bjursaxg.fsf@HIDDEN> <CADwFkmkMODWBmy=gfa-ncMc9pgYemhnPhMhSMgFMCbo_eiLfMw@HIDDEN> <87o6yql1lc.fsf@HIDDEN> <CADwFkmnV7wE1ZbVx5tSpOe+0sx4Npgz_Eo=+DKVx9btNikKOsg@HIDDEN> Date: Fri, 07 Mar 2025 16:14:21 +0100 Message-ID: <87a59wdgaa.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: Vladimir Kazanov <vekazanov@HIDDEN>, 76372-done <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.0 (-) close 76372 31.1 quit Stefan Kangas [2025-03-04 02:40 +0000] wrote: > "Basil L. Contovounesios" <basil@HIDDEN> writes: >> Thanks, pushed the first patch to emacs-30: >> >> Fix ert-font-lock macro signatures >> 02c830ba22b 2025-02-25 11:02:55 +0100 >> https://git.sv.gnu.org/cgit/emacs.git/commit/?id=02c830ba22b >> >> I'll wait until that's merged to master before applying the second one. > > It's merged now. Thank you. Pushed the second patch, and closing. Clean up ert-font-lock error messages e62e7aa8990 2025-03-07 15:58:08 +0100 https://git.sv.gnu.org/cgit/emacs.git/commit/?id=e62e7aa8990 -- Basil
X-Loop: help-debbugs@HIDDEN Subject: bug#76372: 31.0.50; False () in ert-font-lock macro signatures Resent-From: "Basil L. Contovounesios" <basil@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Fri, 07 Mar 2025 15:15:03 +0000 Resent-Message-ID: <handler.76372.D76372.174136048529055 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Stefan Kangas <stefankangas@HIDDEN> Cc: Vladimir Kazanov <vekazanov@HIDDEN>, 76372-done <at> debbugs.gnu.org Received: via spool by 76372-done <at> debbugs.gnu.org id=D76372.174136048529055 (code D ref 76372); Fri, 07 Mar 2025 15:15:03 +0000 Received: (at 76372-done) by debbugs.gnu.org; 7 Mar 2025 15:14:45 +0000 Received: from localhost ([127.0.0.1]:49599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tqZPP-0007YT-3p for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 10:14:44 -0500 Received: from mta-07-3.privateemail.com ([198.54.118.214]:62583) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <basil@HIDDEN>) id 1tqZPM-0007Y7-Qg; Fri, 07 Mar 2025 10:14:41 -0500 Received: from mta-07.privateemail.com (localhost [127.0.0.1]) by mta-07.privateemail.com (Postfix) with ESMTP id 4Z8VFQ2lRhz3hhVb; Fri, 7 Mar 2025 10:14:34 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=contovou.net; s=default; t=1741360474; bh=VGCbll43CLhcuOaLsYcRCpSw96CdS8L0HSW31At8LcM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=qfRAfp2zh02BT1sCCn3XD874wWD5ib0T9yqG+2gCukDGzvPvk2vTHIbGzmIUQ/TjV AEuhGOV6FG6udxd+0r5yy+h3UqZ/ZQvRuLurNIFsDT/vDdLUjBmH0uVZre52HFo51b BXdiJGgb8po6kLw10sF8w71jmzgeRB1SvvwV5uY5igHl8GH0ZLeWRTYB9UXpVkV10X VHiZA4YCTWYqv6eu11uZ4z9R74U0sNNvqWXD8JQ5KTh3dpRW9YandvAsa30bIM0exF KMlq6q5bwydesB2cXKZzXCVbaAzL28e9VyCUJjoP4dZaeWWYVvU3xz/WvoGjuIPrI4 Fvwrxaha3zaxw== Received: from localhost (unknown [31.152.169.121]) by mta-07.privateemail.com (Postfix) with ESMTPA; Fri, 7 Mar 2025 10:14:28 -0500 (EST) From: "Basil L. Contovounesios" <basil@HIDDEN> In-Reply-To: <CADwFkmnV7wE1ZbVx5tSpOe+0sx4Npgz_Eo=+DKVx9btNikKOsg@HIDDEN> References: <87pljgcnpp.fsf@HIDDEN> <CAAs=0-1iJpQg3OW4dDaYGh0G-rfBGSfF5_ROtX_Z4tUs6S3JUw@HIDDEN> <87eczt6689.fsf@HIDDEN> <CAAs=0-0WhQLfkpijsc0BkNKK0ZU4auT6+=CeZK4uFJs1Y4XoWg@HIDDEN> <87msehvt5z.fsf@HIDDEN> <CAAs=0-3-6wnrg_dubJL5j99jj=vcez9t7F=2z3tw6VBFhT1QwA@HIDDEN> <87bjursaxg.fsf@HIDDEN> <CADwFkmkMODWBmy=gfa-ncMc9pgYemhnPhMhSMgFMCbo_eiLfMw@HIDDEN> <87o6yql1lc.fsf@HIDDEN> <CADwFkmnV7wE1ZbVx5tSpOe+0sx4Npgz_Eo=+DKVx9btNikKOsg@HIDDEN> Date: Fri, 07 Mar 2025 16:14:21 +0100 Message-ID: <87a59wdgaa.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 0.0 (/) 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.0 (-) close 76372 31.1 quit Stefan Kangas [2025-03-04 02:40 +0000] wrote: > "Basil L. Contovounesios" <basil@HIDDEN> writes: >> Thanks, pushed the first patch to emacs-30: >> >> Fix ert-font-lock macro signatures >> 02c830ba22b 2025-02-25 11:02:55 +0100 >> https://git.sv.gnu.org/cgit/emacs.git/commit/?id=02c830ba22b >> >> I'll wait until that's merged to master before applying the second one. > > It's merged now. Thank you. Pushed the second patch, and closing. Clean up ert-font-lock error messages e62e7aa8990 2025-03-07 15:58:08 +0100 https://git.sv.gnu.org/cgit/emacs.git/commit/?id=e62e7aa8990 -- Basil
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.