From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id mO+/K3FuSmZ2egEAe85BDQ:P1 (envelope-from ) for ; Sun, 19 May 2024 23:26:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id mO+/K3FuSmZ2egEAe85BDQ (envelope-from ) for ; Sun, 19 May 2024 23:26:09 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=iro.umontreal.ca header.s=mail header.b=amnCt37w; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=quarantine) header.from=iro.umontreal.ca ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716153969; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=btt2rVvcRJNUv8WjA/bfbVj6EwerPmijUbDVhZKJEIU=; b=lnYMRnAWh/MfkqQtW6+63JrVytLk/hvZw9/eX0dRiLqO6G5RqCpbzwc69b23aEGjMVRflj Ne1xY9ZRGsu6s1e5kKC9hxKRNou8unycXqxrxpVEBBiVcU8vI8NBTw/lIEF4Ra1w9vtL/c +LAWZcWrCpjp2hbvqwl210LbG8q6slUmkBh6bTVPq3jU1Gz9YJkkfeIF1s1CFrLBK6a0vr woWfHM3UkTqquM1WH3/oAf2E3Rnd3Bp8lUR7dDYgGQd0XNL+7I2+bCD+ztcYoUF2HqSAqR yD4XVynYQjz4V+eWJE7N6HyvB/mQHrmzPNUOX/vKngeVfFZhsdMYQHLsUeFxAw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=iro.umontreal.ca header.s=mail header.b=amnCt37w; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=quarantine) header.from=iro.umontreal.ca ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716153969; a=rsa-sha256; cv=none; b=gqqmVq0yPABNopJYHlrwPl66H0XVZIFi0yJmF6Klm1Uy0GAgeCY/lMpdcShexst+5w15Qc tEnwKUqXAseKUbupxJVISJpwbxkOuLwov1PqRtiaZPmIGvVEqsgd6NE/kakmHtKomYsTx4 FtaULrVVs+6wHOF0fQtx10DgO8cP9Fug1e7j4zCPeeOofz+n02guwcRX0QB7ShdP+IemaW 3SoANIH1OmMjCdgU8XYe1qHaBmwowH3lqlEcV5kA02Em+gWeNNBxKnt9wuYGwNS48Wow9/ gvD0Vac0PlFpU/FH0QFpj4YC4dGKii+qZn1+3+dWwnovMp6KIUoySVAIBHaxcA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7236CAE55 for ; Sun, 19 May 2024 23:26:08 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8o1i-00045p-Lh; Sun, 19 May 2024 17:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s8o1h-00045f-0l for emacs-orgmode@gnu.org; Sun, 19 May 2024 17:25:05 -0400 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s8o1d-0002nY-AX for emacs-orgmode@gnu.org; Sun, 19 May 2024 17:25:04 -0400 Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 50F8480ABE; Sun, 19 May 2024 17:24:59 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1716153896; bh=V+brjOfHLxuPlBsZDYELZGC6plYAjVr1jBa+furRut8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=amnCt37wb94ivg+w/b2cizk810XE4qkTNYrP6WM61vjLJiVXIvKPwdmMWRLS4KO/G yWTs12C6jUW/7jd9B2zUoLk57CjUMe8RbYUe8iPbjlCpt9+V5a/ro/u+YvvXyKrTjB 0RBBAOh28XdT5AcAWlzNPeXQnmlPC5EOkCvBeuNwK3O4l/OkI1lzxcpZK6F7W1FC/+ KS+hycnED15sCFivD1XXWL264iaH2IrhBhr9hC4qKNbgpeHfw+Chzr9DLG14XlATjT dCMWgWhrJO/hA0f5L6YVwUhM+WvbFLiikQNXbtKqfwaToR4azP4fclVZs/nsLq8FYp 05tm1mzIzAb8g== Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 2A05E80348; Sun, 19 May 2024 17:24:56 -0400 (EDT) Received: from pastel (unknown [45.72.201.215]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id EA3781206AC; Sun, 19 May 2024 17:24:55 -0400 (EDT) From: Stefan Monnier To: Ihor Radchenko Cc: emacs-orgmode@gnu.org Subject: Re: Saving some kitten, plus some questions along the way In-Reply-To: <87a5klsvvi.fsf@localhost> (Ihor Radchenko's message of "Sun, 19 May 2024 14:45:53 +0000") Message-ID: References: <87ikza3thi.fsf@localhost> <87a5klsvvi.fsf@localhost> Date: Sun, 19 May 2024 17:24:54 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -10.48 X-Migadu-Queue-Id: 7236CAE55 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -10.48 X-TUID: eZlXbZ+Qh3de --=-=-= Content-Type: text/plain >> I understand it's important in general, but the question is for this >> specific use of `org-funcall-in-calendar` where all we do (apparently) >> is to set `cursor-type` which shouldn't require any change to the >> overlay (nor does it require to `select-window`), or should it? > No, it should not, and it does not require `select-window'. OK, changed it to `with-current-buffer`. I pushed the resulting patch (along with three other patches resulting from running the tests) to `scratch/org` on `elpa.git`. You can also find them attached, Stefan --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-org-in-calendar-Prefer-apply-to-eval.patch >From 30f64453a570004524de07aa352f7c631414df7c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 May 2024 17:12:36 -0400 Subject: [PATCH 1/4] (org-*-in-calendar): Prefer `apply` to `eval * lisp/org.el (org-funcall-in-calendar): Rename from `org-eval-in-calendar`. Use `apply` rather than `eval`. Use `with-selected-window` rather than cooking our own version of it. Update all callers. (org-read-date): Use `with-current-buffer` to set `cursor-type` since it's not affected by the selected window. Move the `calendar-forward-day` call to `org-funcall-in-calendar` to clarify the need to update `org-date-ovl`. (org-eval-in-calendar): New backward compatibility function. * lisp/org-keys.el (org-eval-in-calendar): Remove unused declaration. --- lisp/org-keys.el | 7 +++-- lisp/org.el | 66 +++++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/lisp/org-keys.el b/lisp/org-keys.el index 50e05efa1b..fc5fd53aa8 100644 --- a/lisp/org-keys.el +++ b/lisp/org-keys.el @@ -89,7 +89,6 @@ (declare-function org-emphasize "org" (&optional char)) (declare-function org-end-of-line "org" (&optional n)) (declare-function org-entry-put "org" (pom property value)) -(declare-function org-eval-in-calendar "org" (form &optional keepdate)) (declare-function org-calendar-goto-today-or-insert-dot "org" ()) (declare-function org-calendar-goto-today "org" ()) (declare-function org-calendar-backward-month "org" ()) @@ -390,9 +389,9 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names." ;;; Global bindings ;;;; Outline functions -(define-key org-mode-map [menu-bar headings] 'undefined) -(define-key org-mode-map [menu-bar hide] 'undefined) -(define-key org-mode-map [menu-bar show] 'undefined) +(define-key org-mode-map [menu-bar headings] #'undefined) +(define-key org-mode-map [menu-bar hide] #'undefined) +(define-key org-mode-map [menu-bar show] #'undefined) (define-key org-mode-map [remap outline-mark-subtree] #'org-mark-subtree) (define-key org-mode-map [remap outline-show-subtree] #'org-fold-show-subtree) diff --git a/lisp/org.el b/lisp/org.el index 4342ddd735..9604887623 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -14009,13 +14009,15 @@ user." (setq cal-frame (window-frame (get-buffer-window calendar-buffer 'visible))) (select-frame cal-frame)) - (org-eval-in-calendar '(setq cursor-type nil) t) + ;; FIXME: Not sure we need `with-current-buffer' but I couldn't + ;; convince myself that we're always in `calendar-buffer' after + ;; the call to `calendar'. + (with-current-buffer calendar-buffer (setq cursor-type nil)) (unwind-protect - (progn - (calendar-forward-day (- (time-to-days org-def) - (calendar-absolute-from-gregorian - (calendar-current-date)))) - (org-eval-in-calendar nil t) + (let ((days (- (time-to-days org-def) + (calendar-absolute-from-gregorian + (calendar-current-date))))) + (org-funcall-in-calendar #'calendar-forward-day t days) (let* ((old-map (current-local-map)) (map (copy-keymap calendar-mode-map)) (minibuffer-local-map @@ -14398,20 +14400,20 @@ user function argument order change dependent on argument order." (`european (list arg2 arg1 arg3)) (`iso (list arg2 arg3 arg1)))) -(defun org-eval-in-calendar (form &optional keepdate) - "Eval FORM in the calendar window and return to current window. +(defun org-funcall-in-calendar (func &optional keepdate &rest args) + "Call FUNC in the calendar window and return to current window. Unless KEEPDATE is non-nil, update `org-ans2' to the cursor date." - (let ((sf (selected-frame)) - (sw (selected-window))) - (select-window (get-buffer-window calendar-buffer t)) - (eval form t) + (with-selected-window (get-buffer-window calendar-buffer t) + (apply func args) (when (and (not keepdate) (calendar-cursor-to-date)) (let* ((date (calendar-cursor-to-date)) (time (org-encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date)))) (setq org-ans2 (format-time-string "%Y-%m-%d" time)))) - (move-overlay org-date-ovl (1- (point)) (1+ (point)) (current-buffer)) - (select-window sw) - (select-frame-set-input-focus sf))) + (move-overlay org-date-ovl (1- (point)) (1+ (point)) (current-buffer)))) + +(defun org-eval-in-calendar (form &optional keepdate) + (declare (obsolete org-funcall-in-calendar "2024")) + (org-funcall-in-calendar (lambda () (eval form t)) keepdate)) (defun org-calendar-goto-today-or-insert-dot () "Go to the current date, or insert a dot. @@ -14423,81 +14425,81 @@ insert \".\"." (if (looking-back "^[^:]+: " (let ((inhibit-field-text-motion t)) (line-beginning-position))) - (org-eval-in-calendar '(calendar-goto-today)) + (org-funcall-in-calendar #'calendar-goto-today) (insert "."))) (defun org-calendar-goto-today () "Reposition the calendar window so the current date is visible." (interactive) - (org-eval-in-calendar '(calendar-goto-today))) + (org-funcall-in-calendar #'calendar-goto-today)) (defun org-calendar-backward-month () "Move the cursor backward by one month." (interactive) - (org-eval-in-calendar '(calendar-backward-month 1))) + (org-funcall-in-calendar #'calendar-backward-month nil 1)) (defun org-calendar-forward-month () "Move the cursor forward by one month." (interactive) - (org-eval-in-calendar '(calendar-forward-month 1))) + (org-funcall-in-calendar #'calendar-forward-month nil 1)) (defun org-calendar-backward-year () "Move the cursor backward by one year." (interactive) - (org-eval-in-calendar '(calendar-backward-year 1))) + (org-funcall-in-calendar #'calendar-backward-year nil 1)) (defun org-calendar-forward-year () "Move the cursor forward by one year." (interactive) - (org-eval-in-calendar '(calendar-forward-year 1))) + (org-funcall-in-calendar #'calendar-forward-year nil 1)) (defun org-calendar-backward-week () "Move the cursor backward by one week." (interactive) - (org-eval-in-calendar '(calendar-backward-week 1))) + (org-funcall-in-calendar #'calendar-backward-week nil 1)) (defun org-calendar-forward-week () "Move the cursor forward by one week." (interactive) - (org-eval-in-calendar '(calendar-forward-week 1))) + (org-funcall-in-calendar #'calendar-forward-week nil 1)) (defun org-calendar-backward-day () "Move the cursor backward by one day." (interactive) - (org-eval-in-calendar '(calendar-backward-day 1))) + (org-funcall-in-calendar #'calendar-backward-day nil 1)) (defun org-calendar-forward-day () "Move the cursor forward by one day." (interactive) - (org-eval-in-calendar '(calendar-forward-day 1))) + (org-funcall-in-calendar #'calendar-forward-day nil 1)) (defun org-calendar-view-entries () "Prepare and display a buffer with diary entries." (interactive) - (org-eval-in-calendar '(diary-view-entries)) + (org-funcall-in-calendar #'diary-view-entries) (message "")) (defun org-calendar-scroll-month-left () "Scroll the displayed calendar left by one month." (interactive) - (org-eval-in-calendar '(calendar-scroll-left 1))) + (org-funcall-in-calendar #'calendar-scroll-left nil 1)) (defun org-calendar-scroll-month-right () "Scroll the displayed calendar right by one month." (interactive) - (org-eval-in-calendar '(calendar-scroll-right 1))) + (org-funcall-in-calendar #'calendar-scroll-right nil 1)) (defun org-calendar-scroll-three-months-left () "Scroll the displayed calendar left by three months." (interactive) - (org-eval-in-calendar - '(calendar-scroll-left-three-months 1))) + (org-funcall-in-calendar + #'calendar-scroll-left-three-months nil 1)) (defun org-calendar-scroll-three-months-right () "Scroll the displayed calendar right by three months." (interactive) - (org-eval-in-calendar - '(calendar-scroll-right-three-months 1))) + (org-funcall-in-calendar + #'calendar-scroll-right-three-months nil 1)) (defun org-calendar-select () "Return to `org-read-date' with the date currently selected. -- 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-mk-default.mk-BTEST-Remove-l-cl.patch >From 3bb14f3c7065c42b310a7d761be3a0d369cda334 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 May 2024 17:15:21 -0400 Subject: [PATCH 2/4] mk/default.mk (BTEST): Remove `-l cl` The CL library is deprecated and it's not needed here any more. I suspect other `-l` could be removed here since `org-test` loads those libraries anyway. --- mk/default.mk | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mk/default.mk b/mk/default.mk index 979a6c07e6..4690ef035b 100644 --- a/mk/default.mk +++ b/mk/default.mk @@ -78,20 +78,20 @@ BTEST_LOAD = \ --eval '(add-to-list `load-path (concat default-directory "testing"))' BTEST_INIT = $(BTEST_PRE) $(BTEST_LOAD) $(BTEST_POST) -BTEST = $(BATCH) $(BTEST_INIT) \ - -l org-batch-test-init \ - --eval '(setq \ - org-batch-test t \ - org-babel-load-languages \ - (quote ($(foreach ob-lang,\ - $(BTEST_OB_LANGUAGES) emacs-lisp shell org,\ - $(lst-ob-lang)))) \ - org-test-select-re "$(BTEST_RE)" \ - )' \ - -l org-loaddefs.el \ - -l cl -l testing/org-test.el \ - -l ert -l org -l ox -l ol \ - $(foreach req,$(BTEST_EXTRA),$(req-extra)) \ +BTEST = $(BATCH) $(BTEST_INIT) \ + -l org-batch-test-init \ + --eval '(setq \ + org-batch-test t \ + org-babel-load-languages \ + (quote ($(foreach ob-lang, \ + $(BTEST_OB_LANGUAGES) emacs-lisp shell org, \ + $(lst-ob-lang)))) \ + org-test-select-re "$(BTEST_RE)" \ + )' \ + -l org-loaddefs.el \ + -l testing/org-test.el \ + -l ert -l org -l ox -l ol \ + $(foreach req,$(BTEST_EXTRA),$(req-extra)) \ --eval '(org-test-run-batch-tests org-test-select-re)' # Running a plain emacs with no config and this Org mode loaded. This -- 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0003-testing-org-test.el-toplevel-Remove-dead-code.patch >From f471f5b16c4ebf2f079779e5691e38aae9a6b705 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 May 2024 17:18:08 -0400 Subject: [PATCH 3/4] testing/org-test.el (): Remove dead code (featurep 'org) is always non-nil here since we have a (require 'org) further up. I suspect other `require`s nearby could be removed or moved to toplevel. --- testing/org-test.el | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/testing/org-test.el b/testing/org-test.el index d9fe33284c..8060e1d210 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -48,25 +48,16 @@ (file-name-directory (or load-file-name buffer-file-name)))) (org-lisp-dir (expand-file-name - (concat org-test-dir "../lisp")))) - - (unless (featurep 'org) - (setq load-path (cons org-lisp-dir load-path)) - (require 'org) - (require 'org-id) - (require 'ox) - (org-babel-do-load-languages - 'org-babel-load-languages '((shell . t) (org . t)))) - - (let ((load-path (cons org-test-dir - (cons (expand-file-name "jump" org-test-dir) - load-path)))) - (require 'cl-lib) - (require 'ert) - (require 'ert-x) - (when (file-exists-p (expand-file-name "jump/jump.el" org-test-dir)) - (require 'jump) - (require 'which-func))))) + (concat org-test-dir "../lisp"))) + (load-path (cons org-test-dir + (cons (expand-file-name "jump" org-test-dir) + load-path)))) + (require 'cl-lib) + (require 'ert) + (require 'ert-x) + (when (file-exists-p (expand-file-name "jump/jump.el" org-test-dir)) + (require 'jump) + (require 'which-func)))) (defconst org-test-default-test-file-name "tests.el" "For each defun a separate file with tests may be defined. -- 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0004-testing-lisp-.el-Fix-second-arg-to-signal.patch >From dc62e4a1f943f7ca49b3075d9160dc19856fae7b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 May 2024 17:19:51 -0400 Subject: [PATCH 4/4] testing/lisp/*.el: Fix second arg to `signal` The second argument to `signal` should be a list, as explained in its docstring. Fix `missing-test-dependency` signals accordingly. --- testing/lisp/test-ob-C.el | 2 +- testing/lisp/test-ob-R.el | 4 ++-- testing/lisp/test-ob-awk.el | 2 +- testing/lisp/test-ob-calc.el | 2 +- testing/lisp/test-ob-clojure.el | 2 +- testing/lisp/test-ob-eshell.el | 2 +- testing/lisp/test-ob-fortran.el | 2 +- testing/lisp/test-ob-haskell-ghci.el | 4 ++-- testing/lisp/test-ob-java.el | 2 +- testing/lisp/test-ob-julia.el | 4 ++-- testing/lisp/test-ob-lua.el | 2 +- testing/lisp/test-ob-maxima.el | 2 +- testing/lisp/test-ob-octave.el | 2 +- testing/lisp/test-ob-perl.el | 2 +- testing/lisp/test-ob-python.el | 2 +- testing/lisp/test-ob-ruby.el | 4 ++-- testing/lisp/test-ob-scheme.el | 6 +++--- testing/lisp/test-ob-sed.el | 2 +- testing/lisp/test-ob-shell.el | 2 +- testing/lisp/test-ob-sql.el | 2 +- testing/lisp/test-ob-sqlite.el | 2 +- testing/lisp/test-org-ctags.el | 2 +- testing/lisp/test-org-tempo.el | 2 +- testing/lisp/test-ox-ascii.el | 2 +- testing/lisp/test-ox-beamer.el | 2 +- testing/lisp/test-ox-latex.el | 2 +- testing/lisp/test-ox-texinfo.el | 2 +- 27 files changed, 33 insertions(+), 33 deletions(-) diff --git a/testing/lisp/test-ob-C.el b/testing/lisp/test-ob-C.el index c70534a51f..5399aed122 100644 --- a/testing/lisp/test-ob-C.el +++ b/testing/lisp/test-ob-C.el @@ -20,7 +20,7 @@ ;;; Code: (unless (featurep 'ob-C) - (signal 'missing-test-dependency "Support for C code blocks")) + (signal 'missing-test-dependency '("Support for C code blocks"))) (ert-deftest ob-C/simple-program () "Hello world program." diff --git a/testing/lisp/test-ob-R.el b/testing/lisp/test-ob-R.el index 9ffbf3afd9..0d291bf543 100644 --- a/testing/lisp/test-ob-R.el +++ b/testing/lisp/test-ob-R.el @@ -22,7 +22,7 @@ (org-test-for-executable "R") (require 'ob-core) (unless (featurep 'ess) - (signal 'missing-test-dependency "ESS")) + (signal 'missing-test-dependency '("ESS"))) (defvar ess-ask-for-ess-directory) (defvar ess-history-file) (defvar ess-r-post-run-hook) @@ -32,7 +32,7 @@ (declare-function ess-calculate-width "ext:ess-inf" (opt)) (unless (featurep 'ob-R) - (signal 'missing-test-dependency "Support for R code blocks")) + (signal 'missing-test-dependency '("Support for R code blocks"))) (ert-deftest test-ob-R/simple-session () (let (ess-ask-for-ess-directory ess-history-file) diff --git a/testing/lisp/test-ob-awk.el b/testing/lisp/test-ob-awk.el index 874d2c0268..b3a2a50fce 100644 --- a/testing/lisp/test-ob-awk.el +++ b/testing/lisp/test-ob-awk.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "awk") (unless (featurep 'ob-awk) - (signal 'missing-test-dependency "Support for Awk code blocks")) + (signal 'missing-test-dependency '("Support for Awk code blocks"))) (ert-deftest ob-awk/input-none () "Test with no input file" diff --git a/testing/lisp/test-ob-calc.el b/testing/lisp/test-ob-calc.el index 12f97279f6..f6e8a5a2fd 100644 --- a/testing/lisp/test-ob-calc.el +++ b/testing/lisp/test-ob-calc.el @@ -21,7 +21,7 @@ (require 'ob-calc) (unless (featurep 'ob-calc) - (signal 'missing-test-dependency "Support for Calc code blocks")) + (signal 'missing-test-dependency '("Support for Calc code blocks"))) (ert-deftest ob-calc/simple-program-mult () "Test of simple multiplication." diff --git a/testing/lisp/test-ob-clojure.el b/testing/lisp/test-ob-clojure.el index 33052c98c9..4836917b3a 100644 --- a/testing/lisp/test-ob-clojure.el +++ b/testing/lisp/test-ob-clojure.el @@ -25,7 +25,7 @@ ;;; Code: (unless (featurep 'ob-clojure) - (signal 'missing-test-dependency "Support for Clojure code blocks")) + (signal 'missing-test-dependency '("Support for Clojure code blocks"))) ;; FIXME: The old tests where totally off. We need to write new tests. diff --git a/testing/lisp/test-ob-eshell.el b/testing/lisp/test-ob-eshell.el index 0d704b16a3..5d0da8d991 100644 --- a/testing/lisp/test-ob-eshell.el +++ b/testing/lisp/test-ob-eshell.el @@ -24,7 +24,7 @@ ;;; Code: (unless (featurep 'ob-eshell) - (signal 'missing-test-dependency "Support for Eshell code blocks")) + (signal 'missing-test-dependency '("Support for Eshell code blocks"))) (ert-deftest ob-eshell/execute () "Test ob-eshell execute." diff --git a/testing/lisp/test-ob-fortran.el b/testing/lisp/test-ob-fortran.el index 4947d142b7..209a966b16 100644 --- a/testing/lisp/test-ob-fortran.el +++ b/testing/lisp/test-ob-fortran.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "gfortran") (unless (featurep 'ob-fortran) - (signal 'missing-test-dependency "Support for Fortran code blocks")) + (signal 'missing-test-dependency '("Support for Fortran code blocks"))) (ert-deftest ob-fortran/simple-program () "Test of hello world program." diff --git a/testing/lisp/test-ob-haskell-ghci.el b/testing/lisp/test-ob-haskell-ghci.el index 990addcd44..6eca0a141a 100644 --- a/testing/lisp/test-ob-haskell-ghci.el +++ b/testing/lisp/test-ob-haskell-ghci.el @@ -32,9 +32,9 @@ (require 'org-test "../testing/org-test") (org-test-for-executable "ghci") (unless (featurep 'haskell-mode) - (signal 'missing-test-dependency "haskell-mode")) + (signal 'missing-test-dependency '("haskell-mode"))) (unless (featurep 'haskell) - (signal 'missing-test-dependency "haskell")) + (signal 'missing-test-dependency '("haskell"))) ;;; Helpers diff --git a/testing/lisp/test-ob-java.el b/testing/lisp/test-ob-java.el index e0c19fe03c..5f00917e51 100644 --- a/testing/lisp/test-ob-java.el +++ b/testing/lisp/test-ob-java.el @@ -27,7 +27,7 @@ ;; ob-java is needed for linter tests as well. org-lint relies on ;; default header arg value. (unless (featurep 'ob-java) - (signal 'missing-test-dependency "Support for java code blocks")) + (signal 'missing-test-dependency '("Support for java code blocks"))) ;;; No Java required diff --git a/testing/lisp/test-ob-julia.el b/testing/lisp/test-ob-julia.el index 4472972624..c0d21fbd85 100644 --- a/testing/lisp/test-ob-julia.el +++ b/testing/lisp/test-ob-julia.el @@ -23,9 +23,9 @@ (org-test-for-executable "julia") (require 'ob-core) (unless (featurep 'ob-julia) - (signal 'missing-test-dependency "Support for julia code blocks")) + (signal 'missing-test-dependency '("Support for julia code blocks"))) (unless (featurep 'ess) - (signal 'missing-test-dependency "ESS")) + (signal 'missing-test-dependency '("ESS"))) (ert-deftest test-ob-julia/colnames-yes-header-argument () (should diff --git a/testing/lisp/test-ob-lua.el b/testing/lisp/test-ob-lua.el index 0a60c68caf..864d5107a3 100644 --- a/testing/lisp/test-ob-lua.el +++ b/testing/lisp/test-ob-lua.el @@ -20,7 +20,7 @@ ;;; Code: (unless (featurep 'ob-lua) - (signal 'missing-test-dependency "Support for Lua code blocks")) + (signal 'missing-test-dependency '("Support for Lua code blocks"))) (ert-deftest test-ob-lua/simple-value () "Test associative array return by value." diff --git a/testing/lisp/test-ob-maxima.el b/testing/lisp/test-ob-maxima.el index 653ed40417..4320c46137 100644 --- a/testing/lisp/test-ob-maxima.el +++ b/testing/lisp/test-ob-maxima.el @@ -20,7 +20,7 @@ (org-test-for-executable "maxima") (unless (featurep 'ob-maxima) - (signal 'missing-test-dependency "Support for Maxima code blocks")) + (signal 'missing-test-dependency '("Support for Maxima code blocks"))) (ert-deftest ob-maxima/integer-input () "Test of integer input" diff --git a/testing/lisp/test-ob-octave.el b/testing/lisp/test-ob-octave.el index dfcfc01906..3c58fad741 100644 --- a/testing/lisp/test-ob-octave.el +++ b/testing/lisp/test-ob-octave.el @@ -20,7 +20,7 @@ (org-test-for-executable "octave") (unless (featurep 'ob-octave) - (signal 'missing-test-dependency "Support for Octave code blocks")) + (signal 'missing-test-dependency '("Support for Octave code blocks"))) (ert-deftest ob-octave/input-none () "Number output" diff --git a/testing/lisp/test-ob-perl.el b/testing/lisp/test-ob-perl.el index 5826e8cca2..e079d09d9b 100644 --- a/testing/lisp/test-ob-perl.el +++ b/testing/lisp/test-ob-perl.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "perl") (unless (featurep 'ob-perl) - (signal 'missing-test-dependency "Support for perl code blocks")) + (signal 'missing-test-dependency '("Support for perl code blocks"))) (ert-deftest test-ob-perl/simple-output () (org-test-with-temp-text " diff --git a/testing/lisp/test-ob-python.el b/testing/lisp/test-ob-python.el index e3c6a40096..9ee76f2a8d 100644 --- a/testing/lisp/test-ob-python.el +++ b/testing/lisp/test-ob-python.el @@ -22,7 +22,7 @@ (org-test-for-executable "python") (require 'ob-core) (unless (featurep 'ob-python) - (signal 'missing-test-dependency "Support for Python code blocks")) + (signal 'missing-test-dependency '("Support for Python code blocks"))) (ert-deftest test-ob-python/colnames-yes-header-argument () (should diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el index 2e4cd020be..27f96f6da3 100644 --- a/testing/lisp/test-ob-ruby.el +++ b/testing/lisp/test-ob-ruby.el @@ -19,9 +19,9 @@ ;;; Code: (org-test-for-executable "ruby") (unless (featurep 'ob-ruby) - (signal 'missing-test-dependency "Support for Ruby code blocks")) + (signal 'missing-test-dependency '("Support for Ruby code blocks"))) (unless (featurep 'inf-ruby) - (signal 'missing-test-dependency "inf-ruby")) + (signal 'missing-test-dependency '("inf-ruby"))) (ert-deftest test-ob-ruby/session-output-1 () (should (equal (org-test-with-temp-text "#+begin_src ruby :session org-test-ruby :results output diff --git a/testing/lisp/test-ob-scheme.el b/testing/lisp/test-ob-scheme.el index 3e9a4707c1..79ce2b4537 100644 --- a/testing/lisp/test-ob-scheme.el +++ b/testing/lisp/test-ob-scheme.el @@ -24,11 +24,11 @@ ;;; Code: (unless (featurep 'ob-scheme) - (signal 'missing-test-dependency "Support for Scheme code blocks")) + (signal 'missing-test-dependency '("Support for Scheme code blocks"))) (unless (featurep 'geiser) - (signal 'missing-test-dependency "geiser")) + (signal 'missing-test-dependency '("geiser"))) (unless (version<= "27.1" emacs-version) - (signal 'missing-test-dependency "Geiser required for Scheme code blocks needs Emacs >=27.1")) + (signal 'missing-test-dependency '("Geiser required for Scheme code blocks needs Emacs >=27.1"))) (ert-deftest test-ob-scheme/tables () "Test table output." diff --git a/testing/lisp/test-ob-sed.el b/testing/lisp/test-ob-sed.el index a91aa54cce..c57c798994 100644 --- a/testing/lisp/test-ob-sed.el +++ b/testing/lisp/test-ob-sed.el @@ -23,7 +23,7 @@ (require 'ob-sed) (org-test-for-executable "sed") (unless (featurep 'ob-sed) - (signal 'missing-test-dependency "Support for Sed code blocks")) + (signal 'missing-test-dependency '("Support for Sed code blocks"))) (ert-deftest ob-sed-test/simple-execution-of-script () "Test simple execution of script." diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el index b760031b4e..9addd045bb 100644 --- a/testing/lisp/test-ob-shell.el +++ b/testing/lisp/test-ob-shell.el @@ -30,7 +30,7 @@ (require 'org-macs) (unless (featurep 'ob-shell) - (signal 'missing-test-dependency "Support for Shell code blocks")) + (signal 'missing-test-dependency '("Support for Shell code blocks"))) (org-test-for-executable "sh") diff --git a/testing/lisp/test-ob-sql.el b/testing/lisp/test-ob-sql.el index 919741571f..ac8a1ccb22 100644 --- a/testing/lisp/test-ob-sql.el +++ b/testing/lisp/test-ob-sql.el @@ -21,7 +21,7 @@ ;;; Code: (unless (featurep 'ob-sql) - (signal 'missing-test-dependency "Support for sql code blocks")) + (signal 'missing-test-dependency '("Support for sql code blocks"))) (defmacro ob-sql/command (&rest body) "Execute body and return the command that would have been executed." diff --git a/testing/lisp/test-ob-sqlite.el b/testing/lisp/test-ob-sqlite.el index 621a11b0b8..0d04643cf3 100644 --- a/testing/lisp/test-ob-sqlite.el +++ b/testing/lisp/test-ob-sqlite.el @@ -21,7 +21,7 @@ ;;; Code: (org-test-for-executable "sqlite3") (unless (featurep 'ob-sqlite) - (signal 'missing-test-dependency "Support for sqlite code blocks")) + (signal 'missing-test-dependency '("Support for sqlite code blocks"))) (ert-deftest ob-sqlite/table-variables-with-commas () "Test of a table variable that contains commas. This guarantees that this code path results in a valid CSV." diff --git a/testing/lisp/test-org-ctags.el b/testing/lisp/test-org-ctags.el index b8e3e4d223..4e0ee37ffe 100644 --- a/testing/lisp/test-org-ctags.el +++ b/testing/lisp/test-org-ctags.el @@ -23,7 +23,7 @@ ;; Alternative implementation for `test-org-ctags/mock-command' ;; is required for cmd.exe. (unless (string-equal "-c" shell-command-switch) - (signal 'missing-test-dependency "POSIX shell")) + (signal 'missing-test-dependency '("POSIX shell"))) (require 'org-ctags) diff --git a/testing/lisp/test-org-tempo.el b/testing/lisp/test-org-tempo.el index 0760d45326..7382b6dc42 100644 --- a/testing/lisp/test-org-tempo.el +++ b/testing/lisp/test-org-tempo.el @@ -24,7 +24,7 @@ (require 'org-tempo) (unless (featurep 'org-tempo) - (signal 'missing-test-dependency "org-tempo")) + (signal 'missing-test-dependency '("org-tempo"))) (ert-deftest test-org-tempo/completion () "Test that blocks and keywords are expanded correctly by org-tempo." diff --git a/testing/lisp/test-ox-ascii.el b/testing/lisp/test-ox-ascii.el index 2df1bd795a..0532b89ee1 100644 --- a/testing/lisp/test-ox-ascii.el +++ b/testing/lisp/test-ox-ascii.el @@ -25,7 +25,7 @@ (require 'ox-ascii nil t) (unless (featurep 'ox-ascii) - (signal 'missing-test-dependency "org-export-ascii")) + (signal 'missing-test-dependency '("org-export-ascii"))) diff --git a/testing/lisp/test-ox-beamer.el b/testing/lisp/test-ox-beamer.el index be83b12e03..f5743409f3 100644 --- a/testing/lisp/test-ox-beamer.el +++ b/testing/lisp/test-ox-beamer.el @@ -25,7 +25,7 @@ (require 'ox-beamer nil t) (unless (featurep 'ox-beamer) - (signal 'missing-test-dependency "org-export-beamer")) + (signal 'missing-test-dependency '("org-export-beamer"))) diff --git a/testing/lisp/test-ox-latex.el b/testing/lisp/test-ox-latex.el index d0be4e5a4c..892ac44374 100644 --- a/testing/lisp/test-ox-latex.el +++ b/testing/lisp/test-ox-latex.el @@ -25,7 +25,7 @@ (require 'ox-latex nil t) (unless (featurep 'ox-latex) - (signal 'missing-test-dependency "org-export-latex")) + (signal 'missing-test-dependency '("org-export-latex"))) diff --git a/testing/lisp/test-ox-texinfo.el b/testing/lisp/test-ox-texinfo.el index b67d2f4c17..b16a344e7e 100644 --- a/testing/lisp/test-ox-texinfo.el +++ b/testing/lisp/test-ox-texinfo.el @@ -27,7 +27,7 @@ (eval-when-compile (require 'subr-x)) (unless (featurep 'ox-texinfo) - (signal 'missing-test-dependency "org-export-texinfo")) + (signal 'missing-test-dependency '("org-export-texinfo"))) ;;; TeX fragments -- 2.39.2 --=-=-=--