Hello!
Pretty simple patch. The byte code is the same before and after
so I'm pretty confident this does absolutely nothing. It is a
1000 line code-base wide patch though so I thought I'd present it
before I apply it.
No warnings when compiling with emacs 28, 29, 30, 31, or 32.0.
>From 533c207743dedaf37fa24d09cf224b5eb0858957 Mon Sep 17 00:00:00 2001
From: Morgan Smith <[email protected]>
Date: Mon, 11 Aug 2025 12:32:10 -0400
Subject: [PATCH] Do not quote function names
This enables more compile time warnings but examining the byte code
before and after shows no difference.
* lisp/ob-js.el (org-babel-js-initiate-session):
* lisp/ol.el (org-store-link):
* lisp/org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command, org-agenda-run-series)
(org-agenda-view-mode-dispatch, org-agenda-next-line)
(org-agenda-previous-line, org-agenda-todo, org-agenda-set-tags)
(org-agenda-set-property, org-agenda-set-effort)
(org-agenda-toggle-archive-tag, org-agenda-bulk-mark-regexp)
(org-agenda-capture):
* lisp/org-archive.el (org-archive-subtree):
* lisp/org-attach.el (org-attach-attach-cp, org-attach-attach-mv)
(org-attach-attach-ln, org-attach-attach-lns):
* lisp/org-capture.el (org-capture-refile):
* lisp/org-cycle.el (org-cycle-force-archived):
* lisp/org-table.el: (org-table-create-with-table.el)
(org-table-eval-formula, org-table-fedit-lisp-indent)
(orgtbl-ctrl-c-ctrl-c, orgtbl-create-or-convert-from-region):
* lisp/org-timer.el (org-timer-start):
* lisp/org.el (org-sparse-tree, org-cdlatex-underscore-caret)
(org-cdlatex-math-modify, org-self-insert-command, org-transpose-words)
(org-shifttab, org-shiftmetaleft, org-shiftmetaright, org-shiftmetaup)
(org-shiftmetadown, org-metaleft, org-metaright, org-metaup)
(org-metadown, org-shiftup, org-shiftdown, org-shiftright)
(org-shiftleft, org-shiftcontrolright, org-shiftcontrolleft)
(org-ctrl-c-ret, org-edit-special, org-ctrl-c-ctrl-c, org-ctrl-c-star)
(org-ctrl-c-minus, org-mark-subtree, org-insert-comment)
(org-reftex-citation, org-kill-line):
* lisp/ox-odt.el (org-odt-export-as-odf-and-open):
* testing/lisp/test-org-tempo.el (test-org-tempo/completion):
* testing/lisp/test-org.el (test-org/with-electric-indent)
(test-org/with-electric-indent, test-org/without-electric-indent)
(test-org/sort-entries):
Use "#'" instead of "'". Silence any new compile warnings using
'declare-function'.
---
lisp/ob-js.el | 3 +-
lisp/ol.el | 2 +-
lisp/org-agenda.el | 74 ++++++++--------
lisp/org-archive.el | 2 +-
lisp/org-attach.el | 8 +-
lisp/org-capture.el | 2 +-
lisp/org-cycle.el | 2 +-
lisp/org-table.el | 15 ++--
lisp/org-timer.el | 2 +-
lisp/org.el | 154 +++++++++++++++++----------------
lisp/ox-odt.el | 2 +-
testing/lisp/test-org-tempo.el | 4 +-
testing/lisp/test-org.el | 28 +++---
13 files changed, 152 insertions(+), 146 deletions(-)
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index d025886fb..996178df1 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -186,11 +186,12 @@ org-babel-js-initiate-session
;; SIC, JavaScript miscapitalized in `js-comint.el'.
((string= "*Javascript REPL*" session)
(org-require-package 'js-comint)
+ (declare-function run-js "ext:js-comint" ())
(let ((session-buffer "*Javascript REPL*"))
(if (and (org-babel-comint-buffer-livep (get-buffer session-buffer))
(comint-check-proc session-buffer))
session-buffer
- (call-interactively 'run-js)
+ (call-interactively #'run-js)
(sit-for .5)
session-buffer)))
((string= "mozrepl" org-babel-js-cmd)
diff --git a/lisp/ol.el b/lisp/ol.el
index 3b15df020..958caf856 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -2680,7 +2680,7 @@ org-store-link
(while (< (line-end-position) end)
(move-end-of-line 1) (activate-mark)
(let (current-prefix-arg)
- (call-interactively 'org-store-link))
+ (call-interactively #'org-store-link))
(move-beginning-of-line 2)
(set-mark (point)))))
(setq org-store-link-plist nil)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 1fa976b67..8afe631eb 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3066,14 +3066,14 @@ org-agenda
((equal org-keys "C")
(setq org-agenda-custom-commands org-agenda-custom-commands-orig)
(customize-variable 'org-agenda-custom-commands))
- ((equal org-keys "a") (call-interactively 'org-agenda-list))
- ((equal org-keys "s") (call-interactively 'org-search-view))
- ((equal org-keys "S") (org-call-with-arg 'org-search-view (or arg '(4))))
- ((equal org-keys "t") (call-interactively 'org-todo-list))
- ((equal org-keys "T") (org-call-with-arg 'org-todo-list (or arg '(4))))
- ((equal org-keys "m") (call-interactively 'org-tags-view))
- ((equal org-keys "M") (org-call-with-arg 'org-tags-view (or arg '(4))))
- ((equal org-keys "e") (call-interactively 'org-store-agenda-views))
+ ((equal org-keys "a") (call-interactively #'org-agenda-list))
+ ((equal org-keys "s") (call-interactively #'org-search-view))
+ ((equal org-keys "S") (org-call-with-arg #'org-search-view (or arg '(4))))
+ ((equal org-keys "t") (call-interactively #'org-todo-list))
+ ((equal org-keys "T") (org-call-with-arg #'org-todo-list (or arg '(4))))
+ ((equal org-keys "m") (call-interactively #'org-tags-view))
+ ((equal org-keys "M") (org-call-with-arg #'org-tags-view (or arg '(4))))
+ ((equal org-keys "e") (call-interactively #'org-store-agenda-views))
((equal org-keys "?") (org-tags-view nil "+FLAGGED")
(add-hook
'post-command-hook
@@ -3089,8 +3089,8 @@ org-agenda
(copy-sequence note))
nil 'face 'org-warning))))))
t t))
- ((equal org-keys "#") (call-interactively 'org-agenda-list-stuck-projects))
- ((equal org-keys "/") (call-interactively 'org-occur-in-agenda-files))
+ ((equal org-keys "#") (call-interactively #'org-agenda-list-stuck-projects))
+ ((equal org-keys "/") (call-interactively #'org-occur-in-agenda-files))
((equal org-keys "!") (customize-variable 'org-stuck-projects))
(t (user-error "Invalid agenda key"))))))
@@ -3290,7 +3290,7 @@ org-agenda-get-restriction-and-command
(cons (substring (car x) 1) (cdr x))))
custom))))
((eq c ?*)
- (call-interactively 'org-toggle-sticky-agenda)
+ (call-interactively #'org-toggle-sticky-agenda)
(sit-for 2))
((and (not restrict-ok) (memq c '(?1 ?0 ?<)))
(message "Restriction is only possible in Org buffers")
@@ -3373,15 +3373,15 @@ org-agenda-run-series
(cl-progv (append gvars lvars) (append gvals lvals)
(pcase type
(`agenda
- (call-interactively 'org-agenda-list))
+ (call-interactively #'org-agenda-list))
(`agenda*
(funcall 'org-agenda-list nil nil nil t))
(`alltodo
- (call-interactively 'org-todo-list))
+ (call-interactively #'org-todo-list))
(`search
(org-search-view current-prefix-arg match nil))
(`stuck
- (call-interactively 'org-agenda-list-stuck-projects))
+ (call-interactively #'org-agenda-list-stuck-projects))
(`tags
(org-tags-view current-prefix-arg match))
(`tags-todo
@@ -8832,23 +8832,23 @@ org-agenda-view-mode-dispatch
time[G]rid [[]inactive [f]ollow [l]og [L]og-all [c]lockcheck
[a]rch-trees [A]rch-files clock[R]eport include[D]iary [E]ntryText")
(pcase (read-char-exclusive)
- (?\ (call-interactively 'org-agenda-reset-view))
- (?d (call-interactively 'org-agenda-day-view))
- (?w (call-interactively 'org-agenda-week-view))
- (?t (call-interactively 'org-agenda-fortnight-view))
- (?m (call-interactively 'org-agenda-month-view))
- (?y (call-interactively 'org-agenda-year-view))
- (?l (call-interactively 'org-agenda-log-mode))
+ (?\ (call-interactively #'org-agenda-reset-view))
+ (?d (call-interactively #'org-agenda-day-view))
+ (?w (call-interactively #'org-agenda-week-view))
+ (?t (call-interactively #'org-agenda-fortnight-view))
+ (?m (call-interactively #'org-agenda-month-view))
+ (?y (call-interactively #'org-agenda-year-view))
+ (?l (call-interactively #'org-agenda-log-mode))
(?L (org-agenda-log-mode '(4)))
(?c (org-agenda-log-mode 'clockcheck))
- ((or ?F ?f) (call-interactively 'org-agenda-follow-mode))
- (?a (call-interactively 'org-agenda-archives-mode))
+ ((or ?F ?f) (call-interactively #'org-agenda-follow-mode))
+ (?a (call-interactively #'org-agenda-archives-mode))
(?A (org-agenda-archives-mode 'files))
- ((or ?R ?r) (call-interactively 'org-agenda-clockreport-mode))
- ((or ?E ?e) (call-interactively 'org-agenda-entry-text-mode))
- (?G (call-interactively 'org-agenda-toggle-time-grid))
- (?D (call-interactively 'org-agenda-toggle-diary))
- (?\! (call-interactively 'org-agenda-toggle-deadlines))
+ ((or ?R ?r) (call-interactively #'org-agenda-clockreport-mode))
+ ((or ?E ?e) (call-interactively #'org-agenda-entry-text-mode))
+ (?G (call-interactively #'org-agenda-toggle-time-grid))
+ (?D (call-interactively #'org-agenda-toggle-diary))
+ (?\! (call-interactively #'org-agenda-toggle-deadlines))
(?\[ (let ((org-agenda-include-inactive-timestamps t))
(org-agenda-check-type t 'agenda)
(org-agenda-redo))
@@ -9220,13 +9220,13 @@ org-agenda-update-agenda-type
(defun org-agenda-next-line ()
"Move cursor to the next line, and show if follow mode is active."
(interactive nil org-agenda-mode)
- (call-interactively 'next-line)
+ (call-interactively #'next-line)
(org-agenda-do-context-action))
(defun org-agenda-previous-line ()
"Move cursor to the previous line, and show if follow mode is active."
(interactive nil org-agenda-mode)
- (call-interactively 'previous-line)
+ (call-interactively #'previous-line)
(org-agenda-do-context-action))
(defun org-agenda-next-item (n)
@@ -9787,7 +9787,7 @@ org-agenda-todo
(goto-char pos)
(org-fold-show-context 'agenda)
(let ((current-prefix-arg arg))
- (call-interactively 'org-todo)
+ (call-interactively #'org-todo)
;; Make sure that log is recorded in current undo.
(when (and org-log-setup
(not (eq org-log-note-how 'note)))
@@ -9992,7 +9992,7 @@ org-agenda-set-tags
(interactive nil org-agenda-mode)
(org-agenda-check-no-diary)
(if (and (org-region-active-p) (called-interactively-p 'any))
- (call-interactively 'org-change-tag-in-region)
+ (call-interactively #'org-change-tag-in-region)
(let* ((hdmarker (or (org-get-at-bol 'org-hd-marker)
(org-agenda-error)))
(buffer (marker-buffer hdmarker))
@@ -10029,7 +10029,7 @@ org-agenda-set-property
(widen)
(goto-char pos)
(org-fold-show-context 'agenda)
- (call-interactively 'org-set-property))))))
+ (call-interactively #'org-set-property))))))
(defun org-agenda-set-effort ()
"Set the effort property for the current headline."
@@ -10048,7 +10048,7 @@ org-agenda-set-effort
(widen)
(goto-char pos)
(org-fold-show-context 'agenda)
- (call-interactively 'org-set-effort)
+ (call-interactively #'org-set-effort)
(end-of-line 1)
(setq newhead (org-get-heading)))
(org-agenda-change-all-lines newhead hdmarker)))))
@@ -10070,7 +10070,7 @@ org-agenda-toggle-archive-tag
(widen)
(goto-char pos)
(org-fold-show-context 'agenda)
- (call-interactively 'org-toggle-archive-tag)
+ (call-interactively #'org-toggle-archive-tag)
(end-of-line 1)
(setq newhead (org-get-heading)))
(org-agenda-change-all-lines newhead hdmarker)
@@ -10751,7 +10751,7 @@ org-agenda-bulk-mark-regexp
(forward-line 1)
(when (string-match-p regexp txt-at-point)
(setq entries-marked (1+ entries-marked))
- (call-interactively 'org-agenda-bulk-mark)))))
+ (call-interactively #'org-agenda-bulk-mark)))))
(unless entries-marked
(message "No entry matching this regexp."))))
@@ -11055,7 +11055,7 @@ org-agenda-capture
(user-error "You cannot do this outside of agenda buffers")
(let ((org-overriding-default-time
(org-get-cursor-date (equal with-time 1))))
- (call-interactively 'org-capture))))
+ (call-interactively #'org-capture))))
;;; Dragging agenda lines forward/backward
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index e7c46f647..9843d73fe 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -333,7 +333,7 @@ org-archive-subtree
;; Force the mode for future visits.
(let ((org-insert-mode-line-in-empty-file t)
(org-inhibit-startup t))
- (call-interactively 'org-mode)))
+ (call-interactively #'org-mode)))
(when (and newfile-p org-archive-file-header-format)
(goto-char (point-max))
(insert (format org-archive-file-header-format
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 07366afb0..9f1804d5b 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -655,24 +655,24 @@ org-attach-attach
(defun org-attach-attach-cp ()
"Attach a file by copying it."
(interactive nil org-mode)
- (let ((org-attach-method 'cp)) (call-interactively 'org-attach-attach)))
+ (let ((org-attach-method 'cp)) (call-interactively #'org-attach-attach)))
(defun org-attach-attach-mv ()
"Attach a file by moving (renaming) it."
(interactive nil org-mode)
- (let ((org-attach-method 'mv)) (call-interactively 'org-attach-attach)))
+ (let ((org-attach-method 'mv)) (call-interactively #'org-attach-attach)))
(defun org-attach-attach-ln ()
"Attach a file by creating a hard link to it.
Beware that this does not work on systems that do not support hard links.
On some systems, this apparently does copy the file instead."
(interactive nil org-mode)
- (let ((org-attach-method 'ln)) (call-interactively 'org-attach-attach)))
+ (let ((org-attach-method 'ln)) (call-interactively #'org-attach-attach)))
(defun org-attach-attach-lns ()
"Attach a file by creating a symbolic link to it.
Beware that this does not work on systems that do not support symbolic links.
On some systems, this apparently does copy the file instead."
(interactive nil org-mode)
- (let ((org-attach-method 'lns)) (call-interactively 'org-attach-attach)))
+ (let ((org-attach-method 'lns)) (call-interactively #'org-attach-attach)))
(defun org-attach-new (file)
"Create a new attachment FILE for the current outline node.
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 448a4243c..1c4f3ab77 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1034,7 +1034,7 @@ org-capture-refile
(save-window-excursion
(with-current-buffer base
(org-with-point-at pos
- (call-interactively 'org-refile)))))
+ (call-interactively #'org-refile)))))
(when kill-buffer
(with-current-buffer base (save-buffer))
(kill-buffer base))
diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el
index 437637bc2..1a9a3a3ed 100644
--- a/lisp/org-cycle.el
+++ b/lisp/org-cycle.el
@@ -450,7 +450,7 @@ org-cycle-force-archived
(interactive nil org-mode)
(setq this-command 'org-cycle)
(let ((org-cycle-open-archived-trees t))
- (call-interactively 'org-cycle)))
+ (call-interactively #'org-cycle)))
(defun org-cycle-internal-global ()
"Do the global cycling action."
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 56c3d83f3..d8da0f9cb 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -68,6 +68,7 @@
(declare-function org-indent-line "org" ())
(declare-function org-load-modules-maybe "org" (&optional force))
(declare-function org-restart-font-lock "org" ())
+(declare-function org-return "org" (&optional indent arg interactive))
(declare-function org-sort-remove-invisible "org" (s))
(declare-function org-time-stamp-format "org" (&optional long inactive custom))
(declare-function org-time-string-to-absolute "org" (s &optional daynr prefer buffer pos))
@@ -812,7 +813,7 @@ org-table-create-with-table.el
(y-or-n-p "Convert table to table.el table? "))
(org-table-align)
(org-table-convert))
- (t (call-interactively 'table-insert))))
+ (t (call-interactively #'table-insert))))
;;;###autoload
(defun org-table-create-or-convert-from-region (arg)
@@ -2707,7 +2708,7 @@ org-table-eval-formula
;; agenda.
(t (replace-regexp-in-string org-ts-regexp "[\\1]" ev)))))
(if (and down (> ndown 0) (looking-at ".*\n[ \t]*|[^-]"))
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(setq ndown 0)))
(and down (org-table-maybe-recalculate-line))
(or suppress-align (and org-table-may-need-update
@@ -3737,7 +3738,7 @@ org-table-fedit-lisp-indent
(cond
((looking-at "[ \t]")
(goto-char pos)
- (call-interactively 'lisp-indent-line))
+ (call-interactively #'lisp-indent-line))
((looking-at "[$&@0-9a-zA-Z]+ *= *[^ \t\n']") (goto-char pos))
((looking-at "[$&@0-9a-zA-Z]+ *= *'(")
(goto-char (- (match-end 0) 2))
@@ -5407,9 +5408,9 @@ orgtbl-ctrl-c-ctrl-c
(goto-char action)
(org-table-maybe-eval-formula)
(if arg
- (call-interactively 'org-table-recalculate)
+ (call-interactively #'org-table-recalculate)
(org-table-maybe-recalculate-line))
- (call-interactively 'org-table-align)
+ (call-interactively #'org-table-align)
(when (orgtbl-send-table 'maybe)
(run-hooks 'orgtbl-after-send-table-hook)))
((eq action 'recalc)
@@ -5417,7 +5418,7 @@ orgtbl-ctrl-c-ctrl-c
(forward-line 0)
(skip-chars-backward " \r\n\t")
(if (org-at-table-p)
- (org-call-with-arg 'org-table-recalculate t))))
+ (org-call-with-arg #'org-table-recalculate t))))
(t (let (orgtbl-mode)
(call-interactively (key-binding "\C-c\C-c")))))))
@@ -5429,7 +5430,7 @@ orgtbl-create-or-convert-from-region
(let* (orgtbl-mode (cmd (key-binding "\C-c|")))
(if cmd
(call-interactively cmd)
- (call-interactively 'org-table-create-or-convert-from-region))))
+ (call-interactively #'org-table-create-or-convert-from-region))))
(defun orgtbl-tab (arg)
"Justification and field motion for `orgtbl-mode'."
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 8eb6a8eb7..c27bda4c2 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -123,7 +123,7 @@ org-timer-start
(interactive "P")
(cond
((equal offset '(16))
- (call-interactively 'org-timer-change-times-in-region))
+ (call-interactively #'org-timer-change-times-in-region))
(org-timer-countdown-timer
(user-error "Countdown timer is running. Cancel first"))
(t
diff --git a/lisp/org.el b/lisp/org.el
index 0959a25ec..6a698bdd9 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -164,6 +164,8 @@ org-priority-regexp
(declare-function calendar-check-holidays "holidays" (date))
(declare-function cdlatex-environment "ext:cdlatex" (environment item))
(declare-function cdlatex-math-symbol "ext:cdlatex")
+(declare-function cdlatex-math-modify "ext:cdlatex")
+(declare-function cdlatex-sub-superscript "ext:cdlatex")
(declare-function Info-goto-node "info" (nodename &optional fork strict-case))
(declare-function isearch-no-upper-case-p "isearch" (string regexp-flag))
(declare-function org-add-archive-files "org-archive" (files))
@@ -243,6 +245,8 @@ org-priority-regexp
(declare-function org-goto "org-goto" (&optional alternative-interface))
(declare-function org-id-get-create "org-id" (&optional force))
(declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
+(declare-function org-inlinetask-demote "org-inlinetask" ())
+(declare-function org-inlinetask-promote "org-inlinetask" ())
(declare-function org-latex-make-preamble "ox-latex" (info &optional template snippet?))
(declare-function org-num-mode "org-num" (&optional arg))
(declare-function org-plot/gnuplot "org-plot" (&optional params))
@@ -11389,13 +11393,13 @@ org-sparse-tree
arg
(cadr
(memq type '(nil all scheduled deadline active inactive closed)))))
- (?d (call-interactively 'org-check-deadlines))
- (?b (call-interactively 'org-check-before-date))
- (?a (call-interactively 'org-check-after-date))
- (?D (call-interactively 'org-check-dates-range))
- (?t (call-interactively 'org-show-todo-tree))
+ (?d (call-interactively #'org-check-deadlines))
+ (?b (call-interactively #'org-check-before-date))
+ (?a (call-interactively #'org-check-after-date))
+ (?D (call-interactively #'org-check-dates-range))
+ (?t (call-interactively #'org-show-todo-tree))
(?T (org-show-todo-tree '(4)))
- (?m (call-interactively 'org-match-sparse-tree))
+ (?m (call-interactively #'org-match-sparse-tree))
((?p ?P)
(let* ((kwd (completing-read
"Property: " (mapcar #'list (org-buffer-property-keys))))
@@ -11407,7 +11411,7 @@ org-sparse-tree
(unless (string-match "\\`{.*}\\'" value)
(setq value (concat "\"" value "\"")))
(org-match-sparse-tree arg (concat kwd "=" value))))
- ((?r ?R ?/) (call-interactively 'org-occur))
+ ((?r ?R ?/) (call-interactively #'org-occur))
(otherwise (user-error "No such sparse tree command \"%c\"" answer)))))
(defvar-local org-occur-highlights nil
@@ -16541,7 +16545,7 @@ org-cdlatex-underscore-caret
Revert to the normal definition outside of these fragments."
(interactive "P" org-mode)
(if (org-inside-LaTeX-fragment-p)
- (call-interactively 'cdlatex-sub-superscript)
+ (call-interactively #'cdlatex-sub-superscript)
(let (org-cdlatex-mode)
(call-interactively (key-binding (vector last-input-event))))))
@@ -16550,7 +16554,7 @@ org-cdlatex-math-modify
Revert to the normal definition outside of these fragments."
(interactive "P" org-mode)
(if (org-inside-LaTeX-fragment-p)
- (call-interactively 'cdlatex-math-modify)
+ (call-interactively #'cdlatex-math-modify)
(let (org-cdlatex-mode)
(call-interactively (key-binding (vector last-input-event))))))
@@ -17224,7 +17228,7 @@ org-self-insert-command
((consp org-speed-command)
(eval org-speed-command t))
(t (let (org-use-speed-commands)
- (call-interactively 'org-self-insert-command)))))
+ (call-interactively #'org-self-insert-command)))))
((and
(= N 1)
(not (org-region-active-p))
@@ -17355,7 +17359,7 @@ org-transpose-words
word constituents."
(interactive nil org-mode)
(org-with-syntax-table org-mode-transpose-word-syntax-table
- (call-interactively 'transpose-words)))
+ (call-interactively #'transpose-words)))
(defvar org-ctrl-c-ctrl-c-hook nil
"Hook for functions attaching themselves to \\`C-c C-c'.
@@ -17518,7 +17522,7 @@ org-shifttab
When ARG is a numeric prefix, show contents of this level."
(interactive "P" org-mode)
(cond
- ((org-at-table-p) (call-interactively 'org-table-previous-field))
+ ((org-at-table-p) (call-interactively #'org-table-previous-field))
((integerp arg)
(let ((arg2 (if org-odd-levels-only (1- (* 2 arg)) arg)))
(message "Content view to level: %d" arg)
@@ -17526,7 +17530,7 @@ org-shifttab
(org-cycle-show-empty-lines t)
(setq org-cycle-global-status 'overview)
(run-hook-with-args 'org-cycle-hook 'overview)))
- (t (call-interactively 'org-cycle-global))))
+ (t (call-interactively #'org-cycle-global))))
(defun org-shiftmetaleft ()
"Promote subtree or delete table column.
@@ -17546,12 +17550,12 @@ org-shiftmetaleft
(and org-support-shift-select (org-region-active-p))))
(org-call-for-shift-select 'backward-char))
((run-hook-with-args-until-success 'org-shiftmetaleft-hook))
- ((org-at-table-p) (call-interactively 'org-table-delete-column))
- ((org-at-heading-p) (call-interactively 'org-promote-subtree))
+ ((org-at-table-p) (call-interactively #'org-table-delete-column))
+ ((org-at-heading-p) (call-interactively #'org-promote-subtree))
((if (not (org-region-active-p)) (org-at-item-p)
(save-excursion (goto-char (region-beginning))
(org-at-item-p)))
- (call-interactively 'org-outdent-item-tree))
+ (call-interactively #'org-outdent-item-tree))
((run-hook-with-args-until-success 'org-shiftmetaleft-final-hook))
(t (org-modifier-cursor-error))))
@@ -17573,12 +17577,12 @@ org-shiftmetaright
(and org-support-shift-select (org-region-active-p))))
(org-call-for-shift-select 'forward-char))
((run-hook-with-args-until-success 'org-shiftmetaright-hook))
- ((org-at-table-p) (call-interactively 'org-table-insert-column))
- ((org-at-heading-p) (call-interactively 'org-demote-subtree))
+ ((org-at-table-p) (call-interactively #'org-table-insert-column))
+ ((org-at-heading-p) (call-interactively #'org-demote-subtree))
((if (not (org-region-active-p)) (org-at-item-p)
(save-excursion (goto-char (region-beginning))
(org-at-item-p)))
- (call-interactively 'org-indent-item-tree))
+ (call-interactively #'org-indent-item-tree))
((run-hook-with-args-until-success 'org-shiftmetaright-final-hook))
(t (org-modifier-cursor-error))))
@@ -17597,11 +17601,11 @@ org-shiftmetaup
(interactive "P" org-mode)
(cond
((run-hook-with-args-until-success 'org-shiftmetaup-hook))
- ((org-at-table-p) (call-interactively 'org-table-kill-row))
+ ((org-at-table-p) (call-interactively #'org-table-kill-row))
((org-at-clock-log-p) (let ((org-clock-adjust-closest t))
- (call-interactively 'org-timestamp-up)))
+ (call-interactively #'org-timestamp-up)))
((run-hook-with-args-until-success 'org-shiftmetaup-final-hook))
- (t (call-interactively 'org-drag-line-backward))))
+ (t (call-interactively #'org-drag-line-backward))))
(defun org-shiftmetadown (&optional _arg)
"Drag the line at point down.
@@ -17618,11 +17622,11 @@ org-shiftmetadown
(interactive "P" org-mode)
(cond
((run-hook-with-args-until-success 'org-shiftmetadown-hook))
- ((org-at-table-p) (call-interactively 'org-table-insert-row))
+ ((org-at-table-p) (call-interactively #'org-table-insert-row))
((org-at-clock-log-p) (let ((org-clock-adjust-closest t))
- (call-interactively 'org-timestamp-down)))
+ (call-interactively #'org-timestamp-down)))
((run-hook-with-args-until-success 'org-shiftmetadown-final-hook))
- (t (call-interactively 'org-drag-line-forward))))
+ (t (call-interactively #'org-drag-line-forward))))
(defsubst org-hidden-tree-error ()
(user-error
@@ -17643,7 +17647,7 @@ org-metaleft
(interactive "P" org-mode)
(cond
((run-hook-with-args-until-success 'org-metaleft-hook))
- ((org-at-table-p) (org-call-with-arg 'org-table-move-column 'left))
+ ((org-at-table-p) (org-call-with-arg #'org-table-move-column 'left))
((org-with-limited-levels
(or (org-at-heading-p)
(and (org-region-active-p)
@@ -17651,19 +17655,19 @@ org-metaleft
(goto-char (region-beginning))
(org-at-heading-p)))))
(when (org-check-for-hidden 'headlines) (org-hidden-tree-error))
- (call-interactively 'org-do-promote))
+ (call-interactively #'org-do-promote))
;; At an inline task.
((org-at-heading-p)
- (call-interactively 'org-inlinetask-promote))
+ (call-interactively #'org-inlinetask-promote))
((or (org-at-item-p)
(and (org-region-active-p)
(save-excursion
(goto-char (region-beginning))
(org-at-item-p))))
(when (org-check-for-hidden 'items) (org-hidden-tree-error))
- (call-interactively 'org-outdent-item))
+ (call-interactively #'org-outdent-item))
((run-hook-with-args-until-success 'org-metaleft-final-hook))
- (t (call-interactively 'backward-word))))
+ (t (call-interactively #'backward-word))))
(defun org-metaright (&optional _arg)
"Demote heading, list item at point or move table column right.
@@ -17682,9 +17686,9 @@ org-metaright
(interactive "P" org-mode)
(cond
((run-hook-with-args-until-success 'org-metaright-hook))
- ((org-at-table-p) (call-interactively 'org-table-move-column))
- ((org-at-drawer-p) (call-interactively 'org-indent-drawer))
- ((org-at-block-p) (call-interactively 'org-indent-block))
+ ((org-at-table-p) (call-interactively #'org-table-move-column))
+ ((org-at-drawer-p) (call-interactively #'org-indent-drawer))
+ ((org-at-block-p) (call-interactively #'org-indent-block))
((org-with-limited-levels
(or (org-at-heading-p)
(and (org-region-active-p)
@@ -17692,19 +17696,19 @@ org-metaright
(goto-char (region-beginning))
(org-at-heading-p)))))
(when (org-check-for-hidden 'headlines) (org-hidden-tree-error))
- (call-interactively 'org-do-demote))
+ (call-interactively #'org-do-demote))
;; At an inline task.
((org-at-heading-p)
- (call-interactively 'org-inlinetask-demote))
+ (call-interactively #'org-inlinetask-demote))
((or (org-at-item-p)
(and (org-region-active-p)
(save-excursion
(goto-char (region-beginning))
(org-at-item-p))))
(when (org-check-for-hidden 'items) (org-hidden-tree-error))
- (call-interactively 'org-indent-item))
+ (call-interactively #'org-indent-item))
((run-hook-with-args-until-success 'org-metaright-final-hook))
- (t (call-interactively 'forward-word))))
+ (t (call-interactively #'forward-word))))
(defun org-check-for-hidden (what)
"Check if there are hidden headlines/items in the current visual line.
@@ -17772,7 +17776,7 @@ org-metaup
(user-error "Cannot move past superior level or buffer limit"))
;; Drag first subtree above below the selected.
(while (< (point) end)
- (call-interactively 'org-move-subtree-down)
+ (call-interactively #'org-move-subtree-down)
(setq deactivate-mark (org--deactivate-mark)))
;; When `org-move-subtree-down' inserts before markers, the
;; region boundaries will extend to the moved
@@ -17804,12 +17808,12 @@ org-metaup
(set-mark c)
(goto-char (+ c (- b a)))
(when swap? (exchange-point-and-mark))))
- ((org-at-table-p) (org-call-with-arg 'org-table-move-row 'up))
+ ((org-at-table-p) (org-call-with-arg #'org-table-move-row 'up))
((and (featurep 'org-inlinetask)
(org-inlinetask-in-task-p))
(org-drag-element-backward))
- ((org-at-heading-p) (call-interactively 'org-move-subtree-up))
- ((org-at-item-p) (call-interactively 'org-move-item-up))
+ ((org-at-heading-p) (call-interactively #'org-move-subtree-up))
+ ((org-at-item-p) (call-interactively #'org-move-item-up))
((run-hook-with-args-until-success 'org-metaup-final-hook))
(t (org-drag-element-backward))))
@@ -17847,7 +17851,7 @@ org-metadown
(user-error "Cannot move past superior level or buffer limit"))
;; Drag first subtree below above the selected.
(while (> (point) beg)
- (call-interactively 'org-move-subtree-up)
+ (call-interactively #'org-move-subtree-up)
(setq deactivate-mark (org--deactivate-mark)))))))
((org-region-active-p)
(let* ((a (save-excursion
@@ -17870,12 +17874,12 @@ org-metadown
(set-mark (+ 1 a (- d c)))
(goto-char (+ 1 a (- d c) (- b a)))
(when swap? (exchange-point-and-mark))))
- ((org-at-table-p) (call-interactively 'org-table-move-row))
+ ((org-at-table-p) (call-interactively #'org-table-move-row))
((and (featurep 'org-inlinetask)
(org-inlinetask-in-task-p))
(org-drag-element-forward))
- ((org-at-heading-p) (call-interactively 'org-move-subtree-down))
- ((org-at-item-p) (call-interactively 'org-move-item-down))
+ ((org-at-heading-p) (call-interactively #'org-move-subtree-down))
+ ((org-at-item-p) (call-interactively #'org-move-item-down))
((run-hook-with-args-until-success 'org-metadown-final-hook))
(t (org-drag-element-forward))))
@@ -17906,9 +17910,9 @@ org-shiftup
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
org-priority-enable-commands
(org-at-heading-p))
- (call-interactively 'org-priority-up))
+ (call-interactively #'org-priority-up))
((and (not org-support-shift-select) (org-at-item-p))
- (call-interactively 'org-previous-item))
+ (call-interactively #'org-previous-item))
((org-clocktable-try-shift 'up arg))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-table-p))
@@ -17946,9 +17950,9 @@ org-shiftdown
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
org-priority-enable-commands
(org-at-heading-p))
- (call-interactively 'org-priority-down))
+ (call-interactively #'org-priority-down))
((and (not org-support-shift-select) (org-at-item-p))
- (call-interactively 'org-next-item))
+ (call-interactively #'org-next-item))
((org-clocktable-try-shift 'down arg))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-table-p))
@@ -17984,22 +17988,22 @@ org-shiftright
(org-call-for-shift-select 'forward-char))
((and (not (eq org-support-shift-select 'everywhere))
(org-at-timestamp-p 'lax))
- (call-interactively 'org-timestamp-up-day))
+ (call-interactively #'org-timestamp-up-day))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-heading-p))
(let ((org-inhibit-logging
(not org-treat-S-cursor-todo-selection-as-state-change))
(org-inhibit-blocking
(not org-treat-S-cursor-todo-selection-as-state-change)))
- (org-call-with-arg 'org-todo 'right)))
+ (org-call-with-arg #'org-todo 'right)))
((or (and org-support-shift-select
(not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-item-bullet-p))
(and (not org-support-shift-select) (org-at-item-p)))
- (org-call-with-arg 'org-cycle-list-bullet nil))
+ (org-call-with-arg #'org-cycle-list-bullet nil))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-property-p))
- (call-interactively 'org-property-next-allowed-value))
+ (call-interactively #'org-property-next-allowed-value))
((org-clocktable-try-shift 'right arg))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-table-p))
@@ -18035,22 +18039,22 @@ org-shiftleft
(org-call-for-shift-select 'backward-char))
((and (not (eq org-support-shift-select 'everywhere))
(org-at-timestamp-p 'lax))
- (call-interactively 'org-timestamp-down-day))
+ (call-interactively #'org-timestamp-down-day))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-heading-p))
(let ((org-inhibit-logging
(not org-treat-S-cursor-todo-selection-as-state-change))
(org-inhibit-blocking
(not org-treat-S-cursor-todo-selection-as-state-change)))
- (org-call-with-arg 'org-todo 'left)))
+ (org-call-with-arg #'org-todo 'left)))
((or (and org-support-shift-select
(not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-item-bullet-p))
(and (not org-support-shift-select) (org-at-item-p)))
- (org-call-with-arg 'org-cycle-list-bullet 'previous))
+ (org-call-with-arg #'org-cycle-list-bullet 'previous))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-property-p))
- (call-interactively 'org-property-previous-allowed-value))
+ (call-interactively #'org-property-previous-allowed-value))
((org-clocktable-try-shift 'left arg))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-table-p))
@@ -18068,7 +18072,7 @@ org-shiftcontrolright
(org-call-for-shift-select 'forward-word))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-heading-p))
- (org-call-with-arg 'org-todo 'nextset))
+ (org-call-with-arg #'org-todo 'nextset))
(org-support-shift-select
(org-call-for-shift-select 'forward-word))
(t (org-shiftselect-error))))
@@ -18081,7 +18085,7 @@ org-shiftcontrolleft
(org-call-for-shift-select 'backward-word))
((and (not (memq org-support-shift-select '(always except-timestamps everywhere)))
(org-at-heading-p))
- (org-call-with-arg 'org-todo 'previousset))
+ (org-call-with-arg #'org-todo 'previousset))
(org-support-shift-select
(org-call-for-shift-select 'backward-word))
(t (org-shiftselect-error))))
@@ -18140,8 +18144,8 @@ org-ctrl-c-ret
"Call `org-table-hline-and-move' or `org-insert-heading'."
(interactive nil org-mode)
(cond
- ((org-at-table-p) (call-interactively 'org-table-hline-and-move))
- (t (call-interactively 'org-insert-heading))))
+ ((org-at-table-p) (call-interactively #'org-table-hline-and-move))
+ (t (call-interactively #'org-insert-heading))))
(defun org-copy-visible (beg end)
"Copy the visible parts of the region."
@@ -18237,9 +18241,9 @@ org-edit-special
(`table
(if (eq (org-element-property :type element) 'table.el)
(org-edit-table.el)
- (call-interactively 'org-table-edit-formulas)))
+ (call-interactively #'org-table-edit-formulas)))
;; Only Org tables contain `table-row' type elements.
- (`table-row (call-interactively 'org-table-edit-formulas))
+ (`table-row (call-interactively #'org-table-edit-formulas))
(`example-block (org-edit-src-code))
(`export-block (org-edit-export-block))
(`comment-block (org-edit-comment-block))
@@ -18381,7 +18385,7 @@ org-ctrl-c-ctrl-c
(org-update-dblock)))
(`footnote-definition
(goto-char (org-element-post-affiliated context))
- (call-interactively 'org-footnote-action))
+ (call-interactively #'org-footnote-action))
(`footnote-reference (call-interactively #'org-footnote-action))
((or `headline `inlinetask)
(save-excursion (goto-char (org-element-begin context))
@@ -18506,7 +18510,7 @@ org-ctrl-c-ctrl-c
(if (org-at-TBLFM-p)
(org-table-calc-current-TBLFM)
(goto-char (org-element-contents-begin context))
- (org-call-with-arg 'org-table-recalculate (or arg t))
+ (org-call-with-arg #'org-table-recalculate (or arg t))
(orgtbl-send-table 'maybe))))
(t
(org-table-maybe-eval-formula)
@@ -18762,10 +18766,10 @@ org-ctrl-c-star
(interactive nil org-mode)
(cond
((org-at-table-p)
- (call-interactively 'org-table-recalculate))
+ (call-interactively #'org-table-recalculate))
(t
;; Convert all lines in region to list items
- (call-interactively 'org-toggle-heading))))
+ (call-interactively #'org-toggle-heading))))
(defun org-ctrl-c-minus ()
"Insert separator line in table or modify bullet status of line.
@@ -18775,13 +18779,13 @@ org-ctrl-c-minus
(interactive nil org-mode)
(cond
((org-at-table-p)
- (call-interactively 'org-table-insert-hline))
+ (call-interactively #'org-table-insert-hline))
((org-region-active-p)
- (call-interactively 'org-toggle-item))
+ (call-interactively #'org-toggle-item))
((org-in-item-p)
- (call-interactively 'org-cycle-list-bullet))
+ (call-interactively #'org-cycle-list-bullet))
(t
- (call-interactively 'org-toggle-item))))
+ (call-interactively #'org-toggle-item))))
(defun org-toggle-heading (&optional nstars)
"Convert headings to normal text, or items or text to headings.
@@ -19771,7 +19775,7 @@ org-mark-subtree
(t (outline-previous-visible-heading 1))))
(when up (while (and (> up 0) (org-up-heading-safe)) (cl-decf up)))
(if (called-interactively-p 'any)
- (call-interactively 'org-mark-element)
+ (call-interactively #'org-mark-element)
(org-mark-element)))
;;; Indentation
@@ -20773,7 +20777,7 @@ org-insert-comment
(skip-chars-backward " \r\t\n")
(line-beginning-position))
(point))))
- (org-babel-do-in-edit-buffer (call-interactively 'comment-dwim))
+ (org-babel-do-in-edit-buffer (call-interactively #'comment-dwim))
(forward-line 0)
(if (looking-at "\\s-*$") (delete-region (point) (line-end-position))
(open-line 1))
@@ -21346,7 +21350,7 @@ org-reftex-citation
(user-error "No bibliography defined in file")
(setq bib (concat (match-string 1) ".bib")
org--rds (list (list 'bib bib))))))
- (call-interactively 'reftex-citation)))
+ (call-interactively #'reftex-citation)))
;;;; Functions extending outline functionality
@@ -21546,7 +21550,7 @@ org-kill-line
(substitute-command-keys
"`\\[org-kill-line]' aborted as it would kill a hidden subtree")))
(call-interactively
- (if (bound-and-true-p visual-line-mode) 'kill-visual-line 'kill-line)))
+ (if (bound-and-true-p visual-line-mode) #'kill-visual-line #'kill-line)))
((org-match-line org-tag-line-re)
(let ((end (save-excursion
(goto-char (match-beginning 1))
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 883f23608..fe3c53a8d 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -4286,7 +4286,7 @@ org-odt-export-as-odf-and-open
Use `org-odt-export-as-odf' to read LaTeX fragment and OpenDocument
formula file."
(interactive)
- (org-open-file (call-interactively 'org-odt-export-as-odf) 'system))
+ (org-open-file (call-interactively #'org-odt-export-as-odf) 'system))
;;;; Export to OpenDocument Text
diff --git a/testing/lisp/test-org-tempo.el b/testing/lisp/test-org-tempo.el
index af0cd795e..d0d233c55 100644
--- a/testing/lisp/test-org-tempo.el
+++ b/testing/lisp/test-org-tempo.el
@@ -45,7 +45,7 @@ test-org-tempo/completion
(should
(equal (org-test-with-temp-text "<l<point>"
(org-tempo-setup)
- (call-interactively 'org-cycle)
+ (call-interactively #'org-cycle)
(buffer-string))
"#+begin_export latex\n\n#+end_export"))
;; Tab should work for expansion.
@@ -62,7 +62,7 @@ test-org-tempo/completion
(should
(equal (org-test-with-temp-text "<k"
(org-tempo-setup)
- (call-interactively 'org-cycle)
+ (call-interactively #'org-cycle)
(buffer-string))
"<k")))
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 572e6673a..fb7f86f54 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -1693,13 +1693,13 @@ test-org/with-electric-indent
(equal " Para\n graph"
(org-test-with-temp-text " Para<point>graph"
(electric-indent-local-mode 1)
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(buffer-string))))
(should
(equal "- item1\n item2"
(org-test-with-temp-text "- item1<point>item2"
(electric-indent-local-mode 1)
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(buffer-string))))
;; TODO: test more values of `org-adapt-indentation'.
(let ((org-adapt-indentation t))
@@ -1707,7 +1707,7 @@ test-org/with-electric-indent
(equal "* heading\n body"
(org-test-with-temp-text "* heading<point>body"
(electric-indent-local-mode 1)
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(buffer-string)))))
;; Make sure that we do not mess things up when indenting remotely
;; in src block buffer.
@@ -1718,7 +1718,7 @@ test-org/with-electric-indent
(equal "#+begin_src fundamental\n \n#+end_src" ; 2 spaces
(org-test-with-temp-text "#+begin_src fundamental<point>\n#+end_src"
(electric-indent-local-mode 1)
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(should (looking-at-p "\n\\#"))
(buffer-string)))))
;; C-j, like `electric-newline-and-maybe-indent', should not indent.
@@ -1726,13 +1726,13 @@ test-org/with-electric-indent
(equal " Para\ngraph"
(org-test-with-temp-text " Para<point>graph"
(electric-indent-local-mode 1)
- (call-interactively 'org-return-and-maybe-indent)
+ (call-interactively #'org-return-and-maybe-indent)
(buffer-string))))
(should
(equal "- item1\nitem2"
(org-test-with-temp-text "- item1<point>item2"
(electric-indent-local-mode 1)
- (call-interactively 'org-return-and-maybe-indent)
+ (call-interactively #'org-return-and-maybe-indent)
(buffer-string))))
;; TODO: test more values of `org-adapt-indentation'.
(let ((org-adapt-indentation t))
@@ -1740,7 +1740,7 @@ test-org/with-electric-indent
(equal "* heading\nbody"
(org-test-with-temp-text "* heading<point>body"
(electric-indent-local-mode 1)
- (call-interactively 'org-return-and-maybe-indent)
+ (call-interactively #'org-return-and-maybe-indent)
(buffer-string))))))
(ert-deftest test-org/without-electric-indent ()
@@ -1753,32 +1753,32 @@ test-org/without-electric-indent
(equal " Para\ngraph"
(org-test-with-temp-text " Para<point>graph"
(electric-indent-local-mode 0)
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(buffer-string))))
(should
(equal "- item1\nitem2"
(org-test-with-temp-text "- item1<point>item2"
(electric-indent-local-mode 0)
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(buffer-string))))
(should
(equal "* heading\nbody"
(org-test-with-temp-text "* heading<point>body"
(electric-indent-local-mode 0)
- (call-interactively 'org-return)
+ (call-interactively #'org-return)
(buffer-string))))
;; C-j, like `electric-newline-and-maybe-indent', should indent.
(should
(equal " Para\n graph"
(org-test-with-temp-text " Para<point>graph"
(electric-indent-local-mode 0)
- (call-interactively 'org-return-and-maybe-indent)
+ (call-interactively #'org-return-and-maybe-indent)
(buffer-string))))
(should
(equal "- item1\n item2"
(org-test-with-temp-text "- item1<point>item2"
(electric-indent-local-mode 0)
- (call-interactively 'org-return-and-maybe-indent)
+ (call-interactively #'org-return-and-maybe-indent)
(buffer-string))))
;; TODO: test more values of `org-adapt-indentation'.
(let ((org-adapt-indentation t))
@@ -1786,7 +1786,7 @@ test-org/without-electric-indent
(equal "* heading\n body"
(org-test-with-temp-text "* heading<point>body"
(electric-indent-local-mode 0)
- (call-interactively 'org-return-and-maybe-indent)
+ (call-interactively #'org-return-and-maybe-indent)
(buffer-string))))))
(ert-deftest test-org/meta-return ()
@@ -4246,7 +4246,7 @@ test-org/sort-entries
(org-overview)
(goto-char 13)
(let ((unread-command-events (listify-key-sequence (kbd "a"))))
- (call-interactively 'org-sort-entries))
+ (call-interactively #'org-sort-entries))
(buffer-string))))
;; Sort region
--
2.54.0
