diff --git a/lisp/ob-C.el b/lisp/ob-C.el index 28784843a..842e0d3e8 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -478,18 +478,18 @@ specifying a variable with the name of the table." ((or `c `cpp) "const char*") (`d "string")))))) (concat - (pcase org-babel-c-variant - ((or `c `cpp) - (format "const char* %s_header[%d] = {%s};" - table - (length headers) - (mapconcat (lambda (h) (format "\"%s\"" h)) headers ","))) - (`d - (format "string[%d] %s_header = [%s];" - (length headers) - table - (mapconcat (lambda (h) (format "\"%s\"" h)) headers ",")))) - "\n" + (pcase org-babel-c-variant + ((or `c `cpp) + (format "const char* %s_header[%d] = {%s};" + table + (length headers) + (mapconcat (lambda (h) (format "\"%s\"" h)) headers ","))) + (`d + (format "string[%d] %s_header = [%s];" + (length headers) + table + (mapconcat (lambda (h) (format "\"%s\"" h)) headers ",")))) + "\n" (pcase org-babel-c-variant ((or `c `cpp) (format diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 6389e128f..db527730b 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -324,7 +324,7 @@ Each member of this list is a list with three members: (device-info (or (assq (intern (concat ":" device)) org-babel-R-graphics-devices) (assq :png org-babel-R-graphics-devices))) - (extra-args (cdr (assq :R-dev-args params))) filearg args) + (extra-args (cdr (assq :R-dev-args params))) filearg args) (setq device (nth 1 device-info)) (setq filearg (nth 2 device-info)) (setq args (mapconcat @@ -373,14 +373,14 @@ Has four %s escapes to be filled in: 4. The name of the file to write to") (defun org-babel-R-evaluate - (session body result-type result-params column-names-p row-names-p async) + (session body result-type result-params column-names-p row-names-p async) "Evaluate R code in BODY." (if session (if async (ob-session-async-org-babel-R-evaluate-session session body result-type result-params column-names-p row-names-p) - (org-babel-R-evaluate-session - session body result-type result-params column-names-p row-names-p)) + (org-babel-R-evaluate-session + session body result-type result-params column-names-p row-names-p)) (org-babel-R-evaluate-external-process body result-type result-params column-names-p row-names-p))) @@ -521,7 +521,7 @@ by `org-babel-comint-async-filter'." (process-name (get-buffer-process session)))) (with-temp-buffer (insert (format ob-session-async-R-indicator - "start" uuid)) + "start" uuid)) (insert "\n") (insert body) (insert "\n") diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el index 8f63fe1d6..28e9d3275 100644 --- a/lisp/ob-awk.el +++ b/lisp/ob-awk.el @@ -59,12 +59,12 @@ This function is called by `org-babel-execute-src-block'." (code-file (let ((file (org-babel-temp-file "awk-"))) (with-temp-file file (insert full-body)) file)) (stdin (let ((stdin (cdr (assq :stdin params)))) - (when stdin - (let ((tmp (org-babel-temp-file "awk-stdin-")) - (res (org-babel-ref-resolve stdin))) - (with-temp-file tmp - (insert (org-babel-awk-var-to-awk res))) - tmp)))) + (when stdin + (let ((tmp (org-babel-temp-file "awk-stdin-")) + (res (org-babel-ref-resolve stdin))) + (with-temp-file tmp + (insert (org-babel-awk-var-to-awk res))) + tmp)))) (cmd (mapconcat #'identity (append (list org-babel-awk-command diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el index 520f39145..5962d3876 100644 --- a/lisp/ob-calc.el +++ b/lisp/ob-calc.el @@ -91,7 +91,7 @@ (save-excursion (with-current-buffer (get-buffer "*Calculator*") (prog1 - (calc-eval (calc-top 1)) + (calc-eval (calc-top 1)) (calc-pop 1))))) (defun org-babel-calc-maybe-resolve-var (el) diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el index 27270714a..20ae76fad 100644 --- a/lisp/ob-comint.el +++ b/lisp/ob-comint.el @@ -130,7 +130,7 @@ statement (not large blocks of code)." (accept-process-output (get-buffer-process buffer))))) (defun org-babel-comint-eval-invisibly-and-wait-for-file - (buffer file string &optional period) + (buffer file string &optional period) "Evaluate STRING in BUFFER invisibly. Don't return until FILE exists. Code in STRING must ensure that FILE exists at end of evaluation." @@ -192,8 +192,8 @@ STRING contains the output originally inserted into the comint buffer." ;; Remove outdated Org mode buffers (setq org-babel-comint-async-buffers (cl-loop for buf in org-babel-comint-async-buffers - if (buffer-live-p buf) - collect buf)) + if (buffer-live-p buf) + collect buf)) (let* ((indicator org-babel-comint-async-indicator) (org-buffers org-babel-comint-async-buffers) (file-callback org-babel-comint-async-file-callback) @@ -214,23 +214,23 @@ STRING contains the output originally inserted into the comint buffer." ;; insert results from tmp-file (let ((tmp-file (match-string 2))) (cl-loop for buf in org-buffers - until - (with-current-buffer buf - (save-excursion - (goto-char (point-min)) - (when (search-forward tmp-file nil t) - (org-babel-previous-src-block) - (let* ((info (org-babel-get-src-block-info)) - (params (nth 2 info)) - (result-params - (cdr (assq :result-params params)))) - (org-babel-insert-result - (funcall file-callback - (nth - 2 (org-babel-get-src-block-info)) - tmp-file) - result-params info)) - t)))))))) + until + (with-current-buffer buf + (save-excursion + (goto-char (point-min)) + (when (search-forward tmp-file nil t) + (org-babel-previous-src-block) + (let* ((info (org-babel-get-src-block-info)) + (params (nth 2 info)) + (result-params + (cdr (assq :result-params params)))) + (org-babel-insert-result + (funcall file-callback + (nth + 2 (org-babel-get-src-block-info)) + tmp-file) + result-params info)) + t)))))))) ;; Truncate dangling to only the most recent output (when (> (length new-dangling) (length string)) (setq new-dangling string))) @@ -258,18 +258,18 @@ STRING contains the output originally inserted into the comint buffer." res-str-raw))) ;; Search for uuid in associated org-buffers to insert results (cl-loop for buf in org-buffers - until (with-current-buffer buf - (save-excursion - (goto-char (point-min)) - (when (search-forward uuid nil t) - (org-babel-previous-src-block) - (let* ((info (org-babel-get-src-block-info)) - (params (nth 2 info)) - (result-params - (cdr (assq :result-params params)))) - (org-babel-insert-result - res-str result-params info)) - t)))) + until (with-current-buffer buf + (save-excursion + (goto-char (point-min)) + (when (search-forward uuid nil t) + (org-babel-previous-src-block) + (let* ((info (org-babel-get-src-block-info)) + (params (nth 2 info)) + (result-params + (cdr (assq :result-params params)))) + (org-babel-insert-result + res-str result-params info)) + t)))) ;; Remove uuid from the list to search for (setq uuid-list (delete uuid uuid-list))))))))) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index bdc11d2a0..ec1191e8c 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -290,9 +290,9 @@ environment, to override this check." (format "Evaluate this %s code block%son your system? " lang name-string))) (progn - (message "Evaluation of this %s code block%sis aborted." - lang name-string) - nil))) + (message "Evaluation of this %s code block%sis aborted." + lang name-string) + nil))) (x (error "Unexpected value `%s' from `org-babel-check-confirm-evaluate'" x))))) ;;;###autoload @@ -1472,7 +1472,7 @@ portions of results lines." ;; Remove overlays when changing major mode (add-hook 'org-mode-hook (lambda () (add-hook 'change-major-mode-hook - #'org-babel-show-result-all 'append 'local))) + #'org-babel-show-result-all 'append 'local))) (defun org-babel-params-from-properties (&optional lang no-eval) "Retrieve source block parameters specified as properties. @@ -1576,11 +1576,11 @@ balanced instances of \"[ \t]:\", set ALTS to ((32 9) . 58)." (first= (lambda (str) (= ch (aref str 0))))) (reverse (cl-reduce (lambda (acc el) - (let ((head (car acc))) - (if (and head (or (funcall last= head) (funcall first= el))) - (cons (concat head el) (cdr acc)) - (cons el acc)))) - list :initial-value nil)))) + (let ((head (car acc))) + (if (and head (or (funcall last= head) (funcall first= el))) + (cons (concat head el) (cdr acc)) + (cons el acc)))) + list :initial-value nil)))) (defun org-babel-parse-header-arguments (string &optional no-eval) "Parse header arguments in STRING. @@ -1654,7 +1654,7 @@ shown below. (t 'value)))) (cl-remove-if (lambda (x) (memq (car x) '(:colname-names :rowname-names :result-params - :result-type :var))) + :result-type :var))) params)))) ;; row and column names @@ -1784,7 +1784,7 @@ If the point is not on a source block then return nil." "Go to the beginning of the current code block." (interactive) (let ((head (org-babel-where-is-src-block-head))) - (if head (goto-char head) (error "Not currently in a code block")))) + (if head (goto-char head) (error "Not currently in a code block")))) ;;;###autoload (defun org-babel-goto-named-src-block (name) @@ -2356,7 +2356,7 @@ INFO may provide the values of these header arguments (in the (if results-switches (concat " " results-switches) "")) (let ((wrap (lambda (start finish &optional no-escape no-newlines - inline-start inline-finish) + inline-start inline-finish) (when inline (setq start inline-start) (setq finish inline-finish) @@ -2603,9 +2603,9 @@ file's directory then expand relative links." (let ((same-directory? (and (buffer-file-name (buffer-base-buffer)) (not (string= (expand-file-name default-directory) - (expand-file-name - (file-name-directory - (buffer-file-name (buffer-base-buffer))))))))) + (expand-file-name + (file-name-directory + (buffer-file-name (buffer-base-buffer))))))))) (format "[[file:%s]%s]" (if (and default-directory (buffer-file-name (buffer-base-buffer)) same-directory?) @@ -3190,7 +3190,7 @@ For the format of SAFE-LIST, see `org-babel-safe-header-args'." (and entry (consp entry) (cond ((functionp (cdr entry)) - (funcall (cdr entry) (cdr pair))) + (funcall (cdr entry) (cdr pair))) ((listp (cdr entry)) (member (cdr pair) (cdr entry))) (t nil))))))) @@ -3210,10 +3210,10 @@ Otherwise, the :file parameter is treated as a full file name, and the output file name is the directory (as calculated above) plus the parameter value." (let* ((file-cons (assq :file params)) - (file-ext-cons (assq :file-ext params)) - (file-ext (cdr-safe file-ext-cons)) - (dir (cdr-safe (assq :output-dir params))) - fname) + (file-ext-cons (assq :file-ext params)) + (file-ext (cdr-safe file-ext-cons)) + (dir (cdr-safe (assq :output-dir params))) + fname) ;; create the output-dir if it does not exist (when dir (make-directory dir t)) diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index e9b304b86..d10d228eb 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -292,11 +292,11 @@ this template." "Return a string with the exported content of a code block. The function respects the value of the :exports header argument." (let ((silently (lambda () (let ((session (cdr (assq :session (nth 2 info))))) - (unless (equal "none" session) - (org-babel-exp-results info type 'silent))))) + (unless (equal "none" session) + (org-babel-exp-results info type 'silent))))) (clean (lambda () (if (eq type 'inline) - (org-babel-remove-inline-result) - (org-babel-remove-result info))))) + (org-babel-remove-inline-result) + (org-babel-remove-result info))))) (pcase (or (cdr (assq :exports (nth 2 info))) "code") ("none" (funcall silently) (funcall clean) "") ("code" (funcall silently) (funcall clean) (org-babel-exp-code info type)) @@ -396,10 +396,10 @@ inhibit insertion of results into the buffer." (setf (nth 1 info) body) (setf (nth 2 info) (org-babel-exp--at-source - (org-babel-process-params - (org-babel-merge-params - (nth 2 info) - `((:results . ,(if silent "silent" "replace"))))))) + (org-babel-process-params + (org-babel-merge-params + (nth 2 info) + `((:results . ,(if silent "silent" "replace"))))))) (pcase type (`block (org-babel-execute-src-block nil info)) (`inline diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el index 3b521bc4d..74dbc0217 100644 --- a/lisp/ob-forth.el +++ b/lisp/ob-forth.el @@ -75,8 +75,8 @@ This function is called by `org-babel-execute-src-block'." ((string= "\n:" case) ;; Report errors. (org-babel-eval-error-notify 1 - (buffer-substring - (+ (match-beginning 0) 1) (point-max))) + (buffer-substring + (+ (match-beginning 0) 1) (point-max))) nil)))) (split-string (org-trim (org-babel-expand-body:generic body params)) diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el index 4008f5ca5..3c84e4da1 100644 --- a/lisp/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el @@ -99,18 +99,18 @@ code." (file-remote-p val) ;; check if val is a remote file (file-exists-p val)) ;; call to file-exists-p is slow, maybe remove it (let* ((local-name (concat ;; create a unique filename to avoid multiple downloads - org-babel-temporary-directory - "/gnuplot/" - (file-remote-p val 'host) - (org-babel-local-file-name val)))) + org-babel-temporary-directory + "/gnuplot/" + (file-remote-p val 'host) + (org-babel-local-file-name val)))) (if (and (file-exists-p local-name) ;; only download file if remote is newer (file-newer-than-file-p local-name val)) local-name (make-directory (file-name-directory local-name) t) (copy-file val local-name t) - )) + )) val - ))))) + ))))) (org-babel--get-vars params)))) (defun org-babel-expand-body:gnuplot (body params) diff --git a/lisp/ob-java.el b/lisp/ob-java.el index c93c65b7f..60ef33bc6 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -481,7 +481,7 @@ for `value' RESULT-TYPE. Not used for `output' RESULT-TYPE." (`value (org-babel-eval cmd "") (org-babel-eval-read-file result-file))))) (org-babel-result-cond result-params raw - (org-babel-java-table-or-string raw)))) + (org-babel-java-table-or-string raw)))) (provide 'ob-java) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index a61e78523..2f051a5c2 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -201,13 +201,13 @@ end" (buffer-name)))) (current-buffer)))))) -; (defun org-babel-julia-associate-session (session) -; "Associate julia code buffer with a julia session. -; Make SESSION be the inferior ESS process associated with the -; current code buffer." -; (setq ess-local-process-name -; (process-name (get-buffer-process session))) -; (ess-make-buffer-current)) + ; (defun org-babel-julia-associate-session (session) + ; "Associate julia code buffer with a julia session. + ; Make SESSION be the inferior ESS process associated with the + ; current code buffer." + ; (setq ess-local-process-name + ; (process-name (get-buffer-process session))) + ; (ess-make-buffer-current)) (defun org-babel-julia-graphical-output-file (params) "Name of file to which julia should send graphical output." @@ -251,7 +251,7 @@ end" end") (defun org-babel-julia-evaluate - (session body result-type result-params column-names-p row-names-p) + (session body result-type result-params column-names-p row-names-p) "Evaluate julia code in BODY." (if session (org-babel-julia-evaluate-session @@ -260,7 +260,7 @@ end") body result-type result-params column-names-p row-names-p))) (defun org-babel-julia-evaluate-external-process - (body result-type result-params column-names-p row-names-p) + (body result-type result-params column-names-p row-names-p) "Evaluate BODY in external julia process. If RESULT-TYPE equals 'output then return standard output as a string. If RESULT-TYPE equals 'value then return the value of the @@ -284,7 +284,7 @@ last statement in BODY, as elisp." (output (org-babel-eval org-babel-julia-command body)))) (defun org-babel-julia-evaluate-session - (session body result-type result-params column-names-p row-names-p) + (session body result-type result-params column-names-p row-names-p) "Evaluate BODY in SESSION. If RESULT-TYPE equals 'output then return standard output as a string. If RESULT-TYPE equals 'value then return the value of the diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el index 748d15eba..7c6525697 100644 --- a/lisp/ob-latex.el +++ b/lisp/ob-latex.el @@ -151,23 +151,23 @@ This function is called by `org-babel-execute-src-block'." (let ((org-format-latex-header (concat org-format-latex-header "\n" (mapconcat #'identity headers "\n")))) - (org-create-formula-image - body out-file org-format-latex-options in-buffer))) + (org-create-formula-image + body out-file org-format-latex-options in-buffer))) ((string= "svg" extension) (with-temp-file tex-file - (insert (concat (funcall org-babel-latex-preamble params) - (mapconcat #'identity headers "\n") - (funcall org-babel-latex-begin-env params) - body - (funcall org-babel-latex-end-env params)))) + (insert (concat (funcall org-babel-latex-preamble params) + (mapconcat #'identity headers "\n") + (funcall org-babel-latex-begin-env params) + body + (funcall org-babel-latex-end-env params)))) (let ((tmp-pdf (org-babel-latex-tex-to-pdf tex-file))) - (let* ((log-buf (get-buffer-create "*Org Babel LaTeX Output*")) - (err-msg "org babel latex failed") - (img-out (org-compile-file - tmp-pdf - (list org-babel-latex-pdf-svg-process) - extension err-msg log-buf))) - (shell-command (format "mv %s %s" img-out out-file))))) + (let* ((log-buf (get-buffer-create "*Org Babel LaTeX Output*")) + (err-msg "org babel latex failed") + (img-out (org-compile-file + tmp-pdf + (list org-babel-latex-pdf-svg-process) + extension err-msg log-buf))) + (shell-command (format "mv %s %s" img-out out-file))))) ((string-suffix-p ".tikz" out-file) (when (file-exists-p out-file) (delete-file out-file)) (with-temp-file out-file diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index eae1779ce..37d1f8a53 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -205,9 +205,9 @@ specific arguments to =org-babel-tangle=." If error in compilation, attempt to mark the error in lilypond org file." (when org-babel-lilypond-compile-post-tangle (let ((org-babel-lilypond-tangled-file (org-babel-lilypond-switch-extension - (buffer-file-name) ".lilypond")) + (buffer-file-name) ".lilypond")) (org-babel-lilypond-temp-file (org-babel-lilypond-switch-extension - (buffer-file-name) ".ly"))) + (buffer-file-name) ".ly"))) (if (not (file-exists-p org-babel-lilypond-tangled-file)) (error "Error: Tangle Failed!") (when (file-exists-p org-babel-lilypond-temp-file) @@ -401,7 +401,7 @@ If TEST is non-nil, the shell command is returned and is not run." "Utility command to swap current FILE-NAME extension with EXT." (concat (file-name-sans-extension file-name) - ext)) + ext)) (defun org-babel-lilypond-get-header-args (mode) "Default arguments to use when evaluating a lilypond source block. @@ -413,7 +413,7 @@ These depend upon whether we are in Arrange mode i.e. MODE is t." (:cache . "yes") (:comments . "yes"))) (t - ob-lilypond-header-args))) + ob-lilypond-header-args))) (defun org-babel-lilypond-set-header-args (mode) "Set org-babel-default-header-args:lilypond diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el index ea0ceb8f7..faf117c40 100644 --- a/lisp/ob-ocaml.el +++ b/lisp/ob-ocaml.el @@ -112,8 +112,8 @@ session tuareg-interactive-buffer-name))) (save-window-excursion (if (fboundp 'tuareg-run-process-if-needed) - (tuareg-run-process-if-needed org-babel-ocaml-command) - (tuareg-run-caml))) + (tuareg-run-process-if-needed org-babel-ocaml-command) + (tuareg-run-caml))) (get-buffer tuareg-interactive-buffer-name))) (defun org-babel-variable-assignments:ocaml (params) diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index 7dc12d94e..bfe3e2aee 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -164,7 +164,7 @@ create. Return the initialized session." (current-buffer)))))) (defun org-babel-octave-evaluate - (session body result-type &optional matlabp) + (session body result-type &optional matlabp) "Pass BODY to the octave process in SESSION. If RESULT-TYPE equals `output' then return the outputs of the statements in BODY, if RESULT-TYPE equals `value' then return the @@ -181,12 +181,12 @@ value of the last statement in BODY, as elisp." (pcase result-type (`output (org-babel-eval cmd body)) (`value (let ((tmp-file (org-babel-temp-file "octave-"))) - (org-babel-eval - cmd - (format org-babel-octave-wrapper-method body - (org-babel-process-file-name tmp-file 'noquote) - (org-babel-process-file-name tmp-file 'noquote))) - (org-babel-octave-import-elisp-from-file tmp-file)))))) + (org-babel-eval + cmd + (format org-babel-octave-wrapper-method body + (org-babel-process-file-name tmp-file 'noquote) + (org-babel-process-file-name tmp-file 'noquote))) + (org-babel-octave-import-elisp-from-file tmp-file)))))) (defun org-babel-octave-evaluate-session (session body result-type &optional matlabp) diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 905e52e3f..fc621600c 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -84,9 +84,9 @@ contain multiple entries for the key `:var'. `:var' entries in PARAMS are expected to be scalar variables." (mapcar (lambda (pair) - (format "!define %s %s" - (car pair) - (replace-regexp-in-string "\"" "" (cdr pair)))) + (format "!define %s %s" + (car pair) + (replace-regexp-in-string "\"" "" (cdr pair)))) (org-babel--get-vars params))) (defun org-babel-plantuml-make-body (body params) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 45c33a453..3c095ad46 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -154,7 +154,7 @@ Emacs-lisp table, otherwise return the results as a string." (let ((res (org-babel-script-escape results))) (if (listp res) (mapcar (lambda (el) (if (eq el 'None) - org-babel-python-None-to el)) + org-babel-python-None-to el)) res) res))) @@ -280,7 +280,7 @@ else: (if (member "pp" result-params) "True" "False"))) (defun org-babel-python-evaluate - (session body &optional result-type result-params preamble async) + (session body &optional result-type result-params preamble async) "Evaluate BODY as Python code." (if session (if async diff --git a/lisp/ob-sed.el b/lisp/ob-sed.el index b95f41185..4d3eeee61 100644 --- a/lisp/ob-sed.el +++ b/lisp/ob-sed.el @@ -70,12 +70,12 @@ function is called by `org-babel-execute-src-block'." (insert body)) file)) (stdin (let ((stdin (cdr (assq :stdin params)))) - (when stdin - (let ((tmp (org-babel-temp-file "sed-stdin-")) - (res (org-babel-ref-resolve stdin))) - (with-temp-file tmp - (insert res)) - tmp)))) + (when stdin + (let ((tmp (org-babel-temp-file "sed-stdin-")) + (res (org-babel-ref-resolve stdin))) + (with-temp-file tmp + (insert res)) + tmp)))) (cmd (mapconcat #'identity (remq nil (list org-babel-sed-command diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index dc54139ec..f512d2952 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -95,13 +95,13 @@ "Expand BODY according to the values of PARAMS." (let ((prologue (cdr (assq :prologue params))) (epilogue (cdr (assq :epilogue params)))) - (mapconcat 'identity - (list - prologue - (org-babel-sql-expand-vars - body (org-babel--get-vars params)) - epilogue) - "\n"))) + (mapconcat 'identity + (list + prologue + (org-babel-sql-expand-vars + body (org-babel--get-vars params)) + epilogue) + "\n"))) (defun org-babel-edit-prep:sql (info) "Set `sql-product' in Org edit buffer. @@ -179,13 +179,13 @@ SQL Server on Windows and Linux platform." "Make Vertica command line args for database connection. Pass nil to omit that arg." (mapconcat #'identity - (delq nil - (list (when host (format "-h %s" host)) - (when port (format "-p %d" port)) - (when user (format "-U %s" user)) - (when password (format "-w %s" (shell-quote-argument password) )) - (when database (format "-d %s" database)))) - " ")) + (delq nil + (list (when host (format "-h %s" host)) + (when port (format "-p %d" port)) + (when user (format "-U %s" user)) + (when password (format "-w %s" (shell-quote-argument password) )) + (when database (format "-d %s" database)))) + " ")) (defun org-babel-sql-dbstring-saphana (host port instance user password database) "Make SAP HANA command line args for database connection. @@ -404,8 +404,8 @@ argument mechanism." val (if sqlite nil '(:fmt (lambda (el) (if (stringp el) - el - (format "%S" el)))))))) + el + (format "%S" el)))))))) data-file) (if (stringp val) val (format "%S" val)))) body))) diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el index 3c77e0354..50df12115 100644 --- a/lisp/oc-csl.el +++ b/lisp/oc-csl.el @@ -183,10 +183,10 @@ Used only when `second-field-align' is activated by the used CSL style." (defconst org-cite-csl--etc-dir (let* ((oc-root (file-name-directory (locate-library "oc"))) (oc-etc-dir-1 (expand-file-name "../etc/csl/" oc-root))) - ;; package.el and straight will put all of org-mode/lisp/ in org-mode/. - ;; This will cause .. to resolve to the directory above Org. - ;; To make life easier for people using package.el or straight, we can - ;; check to see if ../etc/csl exists, and if it doesn't try ./etc/csl. + ;; package.el and straight will put all of org-mode/lisp/ in org-mode/. + ;; This will cause .. to resolve to the directory above Org. + ;; To make life easier for people using package.el or straight, we can + ;; check to see if ../etc/csl exists, and if it doesn't try ./etc/csl. (if (file-exists-p oc-etc-dir-1) oc-etc-dir-1 (expand-file-name "etc/csl/" oc-root))) "Directory \"etc/\" from repository.") @@ -260,9 +260,9 @@ If nil then the Chicago author-date style is used as a fallback.") ;; Prior to Emacs-27.1 argument of `regexp' form must be a string literal. ;; It is the reason why `rx' is avoided here. (rx-to-string `(seq word-start - (regexp ,(regexp-opt (mapcar #'car org-cite-csl--label-alist) t)) - (0+ digit) - (or word-start line-end (any ?\s ?\t))) + (regexp ,(regexp-opt (mapcar #'car org-cite-csl--label-alist) t)) + (0+ digit) + (or word-start line-end (any ?\s ?\t))) t) "Regexp matching a label in a citation reference suffix. Label is in match group 1.") diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el index e70d847b4..476095d3e 100644 --- a/lisp/ol-bibtex.el +++ b/lisp/ol-bibtex.el @@ -659,7 +659,7 @@ This uses `bibtex-parse-entry'." (interactive) (let ((keyword (lambda (str) (intern (concat ":" (downcase str))))) (clean-space (lambda (str) (replace-regexp-in-string - "[[:space:]\n\r]+" " " str))) + "[[:space:]\n\r]+" " " str))) (strip-delim (lambda (str) ; strip enclosing "..." and {...} (dolist (pair '((34 . 34) (123 . 125))) diff --git a/lisp/ol-gnus.el b/lisp/ol-gnus.el index 4b003798f..72bdd7310 100644 --- a/lisp/ol-gnus.el +++ b/lisp/ol-gnus.el @@ -194,7 +194,7 @@ If `org-store-link' was called with a prefix arg the meaning of (message-tokenize-header (mail-fetch-field "gcc" nil t) " ,")))) (id (org-unbracket-string "<" ">" - (mail-fetch-field "Message-ID"))) + (mail-fetch-field "Message-ID"))) (to (mail-fetch-field "To")) (from (mail-fetch-field "From")) (subject (mail-fetch-field "Subject")) diff --git a/lisp/ol-w3m.el b/lisp/ol-w3m.el index 2738e01a2..9e03269e1 100644 --- a/lisp/ol-w3m.el +++ b/lisp/ol-w3m.el @@ -84,36 +84,36 @@ so that it can be yanked into an Org buffer with links working correctly." (or (get-text-property (point) 'w3m-href-anchor) (org-w3m-get-next-link-start)) (cond ((<= (point) transform-end) ; point is inside transform bound - ;; get content between two links. - (when (> (point) temp-position) - (setq return-content (concat return-content - (buffer-substring - temp-position (point))))) - (cond - ((setq link-location (get-text-property (point) 'w3m-href-anchor)) - ;; current point is a link - ;; (we thus also got link location at current point) - ;; get link title at current point. - (setq link-title (buffer-substring (point) - (org-w3m-get-anchor-end))) - ;; concat Org style url to `return-content'. - (setq return-content - (concat return-content - (if (org-string-nw-p link-location) - (org-link-make-string link-location link-title) - link-title)))) - ((setq link-location (get-text-property (point) 'w3m-image)) - ;; current point is an image - ;; (we thus also got image link location at current point) - ;; get link title at current point. - (setq link-title (buffer-substring (point) (org-w3m-get-image-end))) - ;; concat Org style url to `return-content'. - (setq return-content - (concat return-content - (if (org-string-nw-p link-location) - (org-link-make-string link-location link-title) - link-title)))) - (t nil))); current point is neither a link nor an image + ;; get content between two links. + (when (> (point) temp-position) + (setq return-content (concat return-content + (buffer-substring + temp-position (point))))) + (cond + ((setq link-location (get-text-property (point) 'w3m-href-anchor)) + ;; current point is a link + ;; (we thus also got link location at current point) + ;; get link title at current point. + (setq link-title (buffer-substring (point) + (org-w3m-get-anchor-end))) + ;; concat Org style url to `return-content'. + (setq return-content + (concat return-content + (if (org-string-nw-p link-location) + (org-link-make-string link-location link-title) + link-title)))) + ((setq link-location (get-text-property (point) 'w3m-image)) + ;; current point is an image + ;; (we thus also got image link location at current point) + ;; get link title at current point. + (setq link-title (buffer-substring (point) (org-w3m-get-image-end))) + ;; concat Org style url to `return-content'. + (setq return-content + (concat return-content + (if (org-string-nw-p link-location) + (org-link-make-string link-location link-title) + link-title)))) + (t nil))); current point is neither a link nor an image (t ; point is NOT inside transform bound (goto-char temp-position) ; reset point before jump next anchor (setq out-bound t)))) ; for break out `while' loop @@ -152,16 +152,16 @@ so that it can be yanked into an Org buffer with links working correctly." (let (pos start-pos anchor-pos image-pos) (setq pos (setq start-pos (point))) (setq anchor-pos - (catch 'reach - (while (setq pos (next-single-property-change pos 'w3m-anchor-sequence)) - (when (get-text-property pos 'w3m-href-anchor) - (throw 'reach pos))))) + (catch 'reach + (while (setq pos (next-single-property-change pos 'w3m-anchor-sequence)) + (when (get-text-property pos 'w3m-href-anchor) + (throw 'reach pos))))) (setq pos start-pos) (setq image-pos - (catch 'reach - (while (setq pos (next-single-property-change pos 'w3m-image)) - (when (get-text-property pos 'w3m-image) - (throw 'reach pos))))) + (catch 'reach + (while (setq pos (next-single-property-change pos 'w3m-image)) + (when (get-text-property pos 'w3m-image) + (throw 'reach pos))))) (goto-char (min (or anchor-pos (point-max)) (or image-pos (point-max)))))) (defun org-w3m-get-prev-link-start () diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index f6e2d4891..354f40867 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2260,26 +2260,26 @@ The following commands are available: (save (buffer-local-variables))) (kill-all-local-variables) (cl-flet ((reset-saved (var-set) - "Reset variables in VAR-SET to possibly stored value in SAVE." - (dolist (elem save) - (pcase elem - (`(,var . ,val) ;ignore unbound variables - (when (and val (memq var var-set)) - (set var val))))))) + "Reset variables in VAR-SET to possibly stored value in SAVE." + (dolist (elem save) + (pcase elem + (`(,var . ,val) ;ignore unbound variables + (when (and val (memq var var-set)) + (set var val))))))) (cond (org-agenda-doing-sticky-redo - ;; Refreshing sticky agenda-buffer - ;; - ;; Preserve the value of `org-agenda-local-vars' variables. - (mapc #'make-local-variable org-agenda-local-vars) - (reset-saved org-agenda-local-vars) - (setq-local org-agenda-this-buffer-is-sticky t)) + ;; Refreshing sticky agenda-buffer + ;; + ;; Preserve the value of `org-agenda-local-vars' variables. + (mapc #'make-local-variable org-agenda-local-vars) + (reset-saved org-agenda-local-vars) + (setq-local org-agenda-this-buffer-is-sticky t)) (org-agenda-sticky - ;; Creating a sticky Agenda buffer for the first time - (mapc #'make-local-variable org-agenda-local-vars) - (setq-local org-agenda-this-buffer-is-sticky t)) + ;; Creating a sticky Agenda buffer for the first time + (mapc #'make-local-variable org-agenda-local-vars) + (setq-local org-agenda-this-buffer-is-sticky t)) (t - ;; Creating a non-sticky agenda buffer - (setq-local org-agenda-this-buffer-is-sticky nil))) + ;; Creating a non-sticky agenda buffer + (setq-local org-agenda-this-buffer-is-sticky nil))) (mapc #'make-local-variable agenda-local-vars-to-keep) (reset-saved agenda-local-vars-to-keep))) (setq org-agenda-undo-list nil @@ -2970,7 +2970,7 @@ Pressing `<' twice means to restrict to the current subtree or region (org-occur org-match)) ((pred functionp) (funcall type org-match)) - ;; FIXME: Will signal an error since it's not `functionp'! + ;; FIXME: Will signal an error since it's not `functionp'! ((pred fboundp) (funcall type org-match)) (_ (user-error "Invalid custom agenda command type %s" type))))) (org-agenda-run-series (nth 1 entry) (cddr entry)))) @@ -3395,7 +3395,7 @@ agenda-day The day in the agenda where this is listed" ;; FIXME: Shouldn't this be 1 (see commit 10173ad6d610b)? (if (> (length cmd-key) 2) (org-tags-view nil cmd-key) - (org-agenda nil cmd-key)))) + (org-agenda nil cmd-key)))) (set-buffer org-agenda-buffer-name) (let ((lines (org-split-string (buffer-string) "\n"))) (dolist (line lines) @@ -3405,7 +3405,7 @@ agenda-day The day in the agenda where this is listed" (princ (mapconcat #'org-agenda-export-csv-mapper '(org-category txt type todo tags date time extra - priority-letter priority agenda-day) + priority-letter priority agenda-day) ",")) (princ "\n"))))) diff --git a/lisp/org-attach.el b/lisp/org-attach.el index c2d71514c..75db69c9c 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -284,31 +284,31 @@ Shows a list of commands and prompts for another key to execute a command." (org-switch-to-buffer-other-window "*Org Attach*") (erase-buffer) (setq cursor-type nil - header-line-format "Use C-v, M-v, C-n or C-p to navigate.") + header-line-format "Use C-v, M-v, C-n or C-p to navigate.") (insert - (concat "Attachment folder:\n" - (or dir - "Can't find an existing attachment-folder") - (unless (and dir (file-directory-p dir)) - "\n(Not yet created)") - "\n\n" - (format "Select an Attachment Command:\n\n%s" - (mapconcat - (lambda (entry) - (pcase entry - (`((,key . ,_) ,_ ,docstring) - (format "%c %s" - key - (replace-regexp-in-string "\n\\([\t ]*\\)" - " " - docstring - nil nil 1))) - (_ - (user-error - "Invalid `org-attach-commands' item: %S" - entry)))) - org-attach-commands - "\n"))))) + (concat "Attachment folder:\n" + (or dir + "Can't find an existing attachment-folder") + (unless (and dir (file-directory-p dir)) + "\n(Not yet created)") + "\n\n" + (format "Select an Attachment Command:\n\n%s" + (mapconcat + (lambda (entry) + (pcase entry + (`((,key . ,_) ,_ ,docstring) + (format "%c %s" + key + (replace-regexp-in-string "\n\\([\t ]*\\)" + " " + docstring + nil nil 1))) + (_ + (user-error + "Invalid `org-attach-commands' item: %S" + entry)))) + org-attach-commands + "\n"))))) (org-fit-window-to-buffer (get-buffer-window "*Org Attach*")) (let ((msg (format "Select command: [%s]" (concat (mapcar #'caar org-attach-commands))))) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 15c62e14f..a9350c58d 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -381,78 +381,78 @@ you can escape ambiguous cases with a backward slash, e.g., \\%i." (function :tag "Function") (variable :tag "Variable") (sexp :tag "Form")))) - `(repeat - (choice :value ("" "" entry (file "~/org/notes.org") "") - (list :tag "Multikey description" - (string :tag "Keys ") - (string :tag "Description")) - (list :tag "Template entry" - (string :tag "Keys ") - (string :tag "Description ") - (choice :tag "Capture Type " :value entry - (const :tag "Org entry" entry) - (const :tag "Plain list item" item) - (const :tag "Checkbox item" checkitem) - (const :tag "Plain text" plain) - (const :tag "Table line" table-line)) - (choice :tag "Target location" - (list :tag "File" - (const :format "" file) - ,file-variants) - (list :tag "ID" - (const :format "" id) - (string :tag " ID")) - (list :tag "File & Headline" - (const :format "" file+headline) - ,file-variants - (string :tag " Headline")) - (list :tag "File & Outline path" - (const :format "" file+olp) - ,file-variants - (repeat :tag "Outline path" :inline t - (string :tag "Headline"))) - (list :tag "File & Regexp" - (const :format "" file+regexp) - ,file-variants - (regexp :tag " Regexp")) - (list :tag "File [ & Outline path ] & Date tree" - (const :format "" file+olp+datetree) - ,file-variants - (option (repeat :tag "Outline path" :inline t - (string :tag "Headline")))) - (list :tag "File & function" - (const :format "" file+function) - ,file-variants - (sexp :tag " Function")) - (list :tag "Current clocking task" - (const :format "" clock)) - (list :tag "Function" - (const :format "" function) - (sexp :tag " Function"))) - (choice :tag "Template " - (string) - (list :tag "File" - (const :format "" file) - (file :tag "Template file")) - (list :tag "Function" - (const :format "" function) - (function :tag "Template function"))) - (plist :inline t - ;; Give the most common options as checkboxes - :options (((const :format "%v " :prepend) (const t)) - ((const :format "%v " :immediate-finish) (const t)) - ((const :format "%v " :jump-to-captured) (const t)) - ((const :format "%v " :empty-lines) (const 1)) - ((const :format "%v " :empty-lines-before) (const 1)) - ((const :format "%v " :empty-lines-after) (const 1)) - ((const :format "%v " :clock-in) (const t)) - ((const :format "%v " :clock-keep) (const t)) - ((const :format "%v " :clock-resume) (const t)) - ((const :format "%v " :time-prompt) (const t)) - ((const :format "%v " :tree-type) (const week)) - ((const :format "%v " :unnarrowed) (const t)) - ((const :format "%v " :table-line-pos) (string)) - ((const :format "%v " :kill-buffer) (const t))))))))) + `(repeat + (choice :value ("" "" entry (file "~/org/notes.org") "") + (list :tag "Multikey description" + (string :tag "Keys ") + (string :tag "Description")) + (list :tag "Template entry" + (string :tag "Keys ") + (string :tag "Description ") + (choice :tag "Capture Type " :value entry + (const :tag "Org entry" entry) + (const :tag "Plain list item" item) + (const :tag "Checkbox item" checkitem) + (const :tag "Plain text" plain) + (const :tag "Table line" table-line)) + (choice :tag "Target location" + (list :tag "File" + (const :format "" file) + ,file-variants) + (list :tag "ID" + (const :format "" id) + (string :tag " ID")) + (list :tag "File & Headline" + (const :format "" file+headline) + ,file-variants + (string :tag " Headline")) + (list :tag "File & Outline path" + (const :format "" file+olp) + ,file-variants + (repeat :tag "Outline path" :inline t + (string :tag "Headline"))) + (list :tag "File & Regexp" + (const :format "" file+regexp) + ,file-variants + (regexp :tag " Regexp")) + (list :tag "File [ & Outline path ] & Date tree" + (const :format "" file+olp+datetree) + ,file-variants + (option (repeat :tag "Outline path" :inline t + (string :tag "Headline")))) + (list :tag "File & function" + (const :format "" file+function) + ,file-variants + (sexp :tag " Function")) + (list :tag "Current clocking task" + (const :format "" clock)) + (list :tag "Function" + (const :format "" function) + (sexp :tag " Function"))) + (choice :tag "Template " + (string) + (list :tag "File" + (const :format "" file) + (file :tag "Template file")) + (list :tag "Function" + (const :format "" function) + (function :tag "Template function"))) + (plist :inline t + ;; Give the most common options as checkboxes + :options (((const :format "%v " :prepend) (const t)) + ((const :format "%v " :immediate-finish) (const t)) + ((const :format "%v " :jump-to-captured) (const t)) + ((const :format "%v " :empty-lines) (const 1)) + ((const :format "%v " :empty-lines-before) (const 1)) + ((const :format "%v " :empty-lines-after) (const 1)) + ((const :format "%v " :clock-in) (const t)) + ((const :format "%v " :clock-keep) (const t)) + ((const :format "%v " :clock-resume) (const t)) + ((const :format "%v " :time-prompt) (const t)) + ((const :format "%v " :tree-type) (const week)) + ((const :format "%v " :unnarrowed) (const t)) + ((const :format "%v " :table-line-pos) (string)) + ((const :format "%v " :kill-buffer) (const t))))))))) (defcustom org-capture-before-finalize-hook nil "Hook that is run right before a capture process is finalized. @@ -588,17 +588,17 @@ to avoid duplicates.)" (string :tag " Capture key") (string :tag "Replace by template") (repeat :tag "Available when" - (choice - (cons :tag "Condition" - (choice - (const :tag "In file" in-file) - (const :tag "Not in file" not-in-file) - (const :tag "In buffer" in-buffer) - (const :tag "Not in buffer" not-in-buffer) - (const :tag "In mode" in-mode) - (const :tag "Not in mode" not-in-mode)) - (regexp)) - (function :tag "Custom function")))))) + (choice + (cons :tag "Condition" + (choice + (const :tag "In file" in-file) + (const :tag "Not in file" not-in-file) + (const :tag "In buffer" in-buffer) + (const :tag "Not in buffer" not-in-buffer) + (const :tag "In mode" in-mode) + (const :tag "Not in mode" not-in-mode)) + (regexp)) + (function :tag "Custom function")))))) (defcustom org-capture-use-agenda-date nil "Non-nil means use the date at point when capturing from agendas. @@ -927,7 +927,7 @@ for `entry'-type templates")) (interactive) (org-goto-marker-or-bmk org-capture-last-stored-marker (plist-get org-bookmark-names-plist - :last-capture)) + :last-capture)) (message "This is the last note stored by a capture process")) ;;; Supporting functions for handling the process diff --git a/lisp/org-clock.el b/lisp/org-clock.el index acd1dd38b..143ed4f12 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -683,19 +683,19 @@ pointing to it." (let (cat task heading prefix) (with-current-buffer (org-base-buffer (marker-buffer marker)) (org-with-wide-buffer - (ignore-errors - (goto-char marker) - (setq cat (org-get-category) - heading (org-get-heading 'notags) - prefix (save-excursion - (org-back-to-heading t) - (looking-at org-outline-regexp) - (match-string 0)) - task (substring - (org-fontify-like-in-org-mode - (concat prefix heading) - org-odd-levels-only) - (length prefix)))))) + (ignore-errors + (goto-char marker) + (setq cat (org-get-category) + heading (org-get-heading 'notags) + prefix (save-excursion + (org-back-to-heading t) + (looking-at org-outline-regexp) + (match-string 0)) + task (substring + (org-fontify-like-in-org-mode + (concat prefix heading) + org-odd-levels-only) + (length prefix)))))) (when (and cat task) (insert (format "[%c] %-12s %s\n" i cat task)) (cons i marker))))) @@ -2756,13 +2756,13 @@ from the dynamic block definition." (if timestamp (concat ts "|") "") ;timestamp, maybe (if tags (concat (mapconcat #'identity tgs ", ") "|") "") ;tags, maybe (if properties ;properties columns, maybe - (concat (mapconcat (lambda (p) (or (cdr (assoc p props)) "")) - properties - "|") - "|") + (concat (mapconcat (lambda (p) (or (cdr (assoc p props)) "")) + properties + "|") + "|") "") (if indent ;indentation - (org-clocktable-indent-string level) + (org-clocktable-indent-string level) "") (format-field headline) ;; Empty fields for higher levels. @@ -2770,7 +2770,7 @@ from the dynamic block definition." (format-field (org-duration-from-minutes time)) (make-string (max 0 (- time-columns level)) ?|) (if (eq formula '%) - (format "%.1f |" (* 100 (/ time (float total-time)))) + (format "%.1f |" (* 100 (/ time (float total-time)))) "") "\n"))))))) (delete-char -1) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index ea6588893..9794382d8 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -878,7 +878,7 @@ When COLUMNS-FMT-STRING is non-nil, use it as the column format." (setq-local org-colview-initial-truncate-line-value truncate-lines)) (if (not global-visual-line-mode) - (setq truncate-lines t)) + (setq truncate-lines t)) (dolist (entry cache) (goto-char (car entry)) (org-columns--display-here (cdr entry))))))))) @@ -1272,7 +1272,7 @@ When PRINTF is non-nil, use it to format the result." "Summarize CHECK-BOXES with a check-box cookie." (format "[%d/%d]" (cl-count-if (lambda (b) (or (equal b "[X]") - (string-match-p "\\[\\([1-9]\\)/\\1\\]" b))) + (string-match-p "\\[\\([1-9]\\)/\\1\\]" b))) check-boxes) (length check-boxes))) @@ -1695,7 +1695,7 @@ This will add overlays to the date lines, to show the summary for each day." (delq nil (mapcar (lambda (e) (org-string-nw-p - (nth 1 (assoc spec e)))) + (nth 1 (assoc spec e)))) entries))) (final (if values (funcall summarize values printf) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index b6d548a05..d230ee2b1 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -534,16 +534,16 @@ use of this function is for the stuck project list." 'org-duration-to-minutes "9.1") (make-obsolete-variable 'org-time-clocksum-format - "set `org-duration-format' instead." "9.1") + "set `org-duration-format' instead." "9.1") (make-obsolete-variable 'org-time-clocksum-use-fractional - "set `org-duration-format' instead." "9.1") + "set `org-duration-format' instead." "9.1") (make-obsolete-variable 'org-time-clocksum-fractional-format - "set `org-duration-format' instead." "9.1") + "set `org-duration-format' instead." "9.1") (make-obsolete-variable 'org-time-clocksum-use-effort-durations - "set `org-duration-units' instead." "9.1") + "set `org-duration-units' instead." "9.1") (define-obsolete-function-alias 'org-babel-number-p 'org-babel--string-to-number "9.0") diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 103baeb49..48f76b79f 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -185,10 +185,10 @@ See `org-crypt-disable-auto-save'." ((eq org-crypt-disable-auto-save 'encrypt) (message "org-decrypt: Enabling re-encryption on auto-save.") (add-hook 'auto-save-hook - (lambda () - (message "org-crypt: Re-encrypting all decrypted entries due to auto-save.") - (org-encrypt-entries)) - nil t)) + (lambda () + (message "org-crypt: Re-encrypting all decrypted entries due to auto-save.") + (org-encrypt-entries)) + nil t)) (t nil)))) (defun org-crypt-key-for-heading () diff --git a/lisp/org-goto.el b/lisp/org-goto.el index c9cf1f6cf..0a3470f54 100644 --- a/lisp/org-goto.el +++ b/lisp/org-goto.el @@ -219,9 +219,9 @@ position or nil." (error (make-indirect-buffer (current-buffer) "*org-goto*" t)))) (let (temp-buffer-show-function temp-buffer-show-hook) (with-output-to-temp-buffer "*Org Help*" - (princ (format help (if org-goto-auto-isearch - " Just type for auto-isearch." - " n/p/f/b/u to navigate, q to quit."))))) + (princ (format help (if org-goto-auto-isearch + " Just type for auto-isearch." + " n/p/f/b/u to navigate, q to quit."))))) (org-fit-window-to-buffer (get-buffer-window "*Org Help*")) (org-overview) (setq buffer-read-only t) diff --git a/lisp/org-habit.el b/lisp/org-habit.el index 231c08be0..a355d8e5f 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -90,7 +90,7 @@ It will be green even if it was done after the deadline." :type 'boolean) (defcustom org-habit-scheduled-past-days nil -"Value to use instead of `org-scheduled-past-days', for habits only. + "Value to use instead of `org-scheduled-past-days', for habits only. If nil, `org-scheduled-past-days' is used. diff --git a/lisp/org-indent.el b/lisp/org-indent.el index b87cc4e5f..e0cb69780 100644 --- a/lisp/org-indent.el +++ b/lisp/org-indent.el @@ -148,10 +148,10 @@ useful to make it ever so slightly different." (aset org-indent--text-line-prefixes n (org-add-props - (concat (make-string (+ n indentation) ?\s) - (and (> n 0) - (char-to-string org-indent-boundary-char))) - nil 'face 'org-indent)))))) + (concat (make-string (+ n indentation) ?\s) + (and (> n 0) + (char-to-string org-indent-boundary-char))) + nil 'face 'org-indent)))))) (defsubst org-indent-remove-properties (beg end) "Remove indentations between BEG and END." diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index afa28920f..3379a2e46 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -265,8 +265,8 @@ If the task has an end part, also demote it." (replace-match down-task nil t nil 1) (org-inlinetask-goto-end) (if (and (eobp) (looking-back "END\\s-*" (point-at-bol))) - (beginning-of-line) - (forward-line -1)) + (beginning-of-line) + (forward-line -1)) (unless (= (point) beg) (looking-at (org-inlinetask-outline-regexp)) (replace-match down-task nil t nil 1) diff --git a/lisp/org-lint.el b/lisp/org-lint.el index 003fee0fa..5c64c5a5c 100644 --- a/lisp/org-lint.el +++ b/lisp/org-lint.el @@ -1251,7 +1251,7 @@ CHECKERS is the list of checkers used." (let ((c (org-lint--current-checker))) (setf tabulated-list-entries (cl-remove-if (lambda (e) (equal c (org-lint--current-checker e))) - tabulated-list-entries)) + tabulated-list-entries)) (tabulated-list-print))) (defun org-lint--ignore-checker () @@ -1305,7 +1305,7 @@ ARG can also be a list of checker names, as symbols, to run." (throw 'exit c))))))) ((pred consp) (cl-remove-if-not (lambda (c) (memq (org-lint-checker-name c) arg)) - org-lint--checkers)) + org-lint--checkers)) (_ (user-error "Invalid argument `%S' for `org-lint'" arg))))) (if (not (called-interactively-p 'any)) (org-lint--generate-reports (current-buffer) checkers) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 231e29db9..a8fb79ea3 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -473,8 +473,8 @@ is selected, only the bare key is returned." (goto-char (point-min)) (org-fit-window-to-buffer) (message "") ; With this line the prompt appears in - ; the minibuffer. Else keystrokes may - ; appear, which is spurious. + ; the minibuffer. Else keystrokes may + ; appear, which is spurious. (let ((pressed (org--mks-read-key allowed-keys prompt (not (pos-visible-in-window-p (1- (point-max))))))) @@ -1276,13 +1276,13 @@ window." (scrldn (if additional-keys `(?\d ?\M-v) ?\M-v))) (pcase key (?\C-n (if (not (pos-visible-in-window-p (point-max))) - (ignore-errors (scroll-up 1)) - (message "End of buffer") - (sit-for 1))) + (ignore-errors (scroll-up 1)) + (message "End of buffer") + (sit-for 1))) (?\C-p (if (not (pos-visible-in-window-p (point-min))) - (ignore-errors (scroll-down 1)) - (message "Beginning of buffer") - (sit-for 1))) + (ignore-errors (scroll-down 1)) + (message "Beginning of buffer") + (sit-for 1))) ;; SPC or ((guard (memq key scrlup)) (if (not (pos-visible-in-window-p (point-max))) diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index eae6cd98f..a35a19bca 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -220,7 +220,7 @@ this function is called. Otherwise, the current major mode menu is used." (if (fboundp 'mouse-menu-major-mode-map) (popup-menu (mouse-menu-major-mode-map) event prefix) (with-no-warnings ; don't warn about fallback, obsolete since 23.1 - (mouse-major-mode-menu event prefix))))) + (mouse-major-mode-menu event prefix))))) (setq this-command 'mouse-save-then-kill) (mouse-save-then-kill event))) @@ -291,18 +291,18 @@ string to (format ITEMFORMAT keyword). If it is neither a string nor a function, elements of KEYWORDS are used directly." (mapcar (lambda (keyword) - (vector (cond - ((functionp itemformat) (funcall itemformat keyword)) - ((stringp itemformat) (format itemformat keyword)) - (t keyword)) - (list 'funcall function keyword) - :style (cond - ((null selected) t) - ((functionp selected) 'toggle) - (t 'radio)) - :selected (if (functionp selected) - (and (funcall selected keyword) t) - (equal selected keyword)))) + (vector (cond + ((functionp itemformat) (funcall itemformat keyword)) + ((stringp itemformat) (format itemformat keyword)) + (t keyword)) + (list 'funcall function keyword) + :style (cond + ((null selected) t) + ((functionp selected) 'toggle) + (t 'radio)) + :selected (if (functionp selected) + (and (funcall selected keyword) t) + (equal selected keyword)))) keywords)) (defun org-mouse-remove-match-and-spaces () @@ -424,11 +424,11 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:" (org-mouse-keyword-menu (sort (mapcar #'car (org-get-buffer-tags)) #'string-lessp) (lambda (tag) - (org-mouse-set-tags - (sort (if (member tag tags) - (delete tag tags) - (cons tag tags)) - #'string-lessp))) + (org-mouse-set-tags + (sort (if (member tag tags) + (delete tag tags) + (cons tag tags)) + #'string-lessp))) (lambda (tag) (member tag tags)) )) '("--" @@ -517,7 +517,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:" ,@(org-mouse-keyword-menu (mapcar #'car org-agenda-custom-commands) (lambda (key) - (org-agenda nil (string-to-char key))) + (org-agenda nil (string-to-char key))) nil (lambda (key) (let ((entry (assoc key org-agenda-custom-commands))) diff --git a/lisp/org-plot.el b/lisp/org-plot.el index be599b02d..63176fce1 100644 --- a/lisp/org-plot.el +++ b/lisp/org-plot.el @@ -204,17 +204,17 @@ of the NUMS." (nice-max (if (= range 0) (car nums) (/ (float (ceiling (* maximum range-factor))) range-factor)))) `(:min ,minimum :max ,maximum :range ,range - :range-factor ,range-factor - :nice-min ,nice-min :nice-max ,nice-max :nice-range ,(- nice-max nice-min)))) + :range-factor ,range-factor + :nice-min ,nice-min :nice-max ,nice-max :nice-range ,(- nice-max nice-min)))) (defun org--plot/sensible-tick-num (table &optional hard-min hard-max) "From a the values in a TABLE of data, guess an appropriate number of ticks. If HARD-MIN and HARD-MAX can be used to fix the ends of the axis." (let* ((row-data (mapcar (lambda (row) (org--plot/values-stats - (mapcar #'string-to-number (cdr row)) - hard-min - hard-max)) table)) + (mapcar #'string-to-number (cdr row)) + hard-min + hard-max)) table)) (row-normalised-ranges (mapcar (lambda (r-data) (let ((val (round (* (plist-get r-data :range-factor) diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 703d0d7a0..ca3249dda 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -590,7 +590,7 @@ consider the following expression: (f1 (substring f 0 (string-match "\\([\\?#].*\\)?$" f))) (start-pos (+ (string-match wsearch f1) (length base-url))) (end-pos (if strip-suffix - (string-match (regexp-quote strip-suffix) f1) + (string-match (regexp-quote strip-suffix) f1) (length f1))) ;; We have to compare redirects without suffix below: (f2 (concat wdir (substring f1 start-pos end-pos))) diff --git a/lisp/org-src.el b/lisp/org-src.el index 3b25fad60..91a3d415d 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -1222,10 +1222,10 @@ Throw an error if there is no such buffer." (if (version< emacs-version "27.1") (progn (delete-region beg end) (insert (with-current-buffer write-back-buf (buffer-string)))) - (save-restriction - (narrow-to-region beg end) - (replace-buffer-contents write-back-buf 0.1 nil) - (goto-char (point-max)))) + (save-restriction + (narrow-to-region beg end) + (replace-buffer-contents write-back-buf 0.1 nil) + (goto-char (point-max)))) (when (and expecting-bol (not (bolp))) (insert "\n"))) (kill-buffer write-back-buf) (save-buffer) @@ -1270,10 +1270,10 @@ Throw an error if there is no such buffer." (progn (delete-region beg end) (insert (with-current-buffer write-back-buf (buffer-string)))) - (save-restriction - (narrow-to-region beg end) - (replace-buffer-contents write-back-buf 0.1 nil) - (goto-char (point-max)))) + (save-restriction + (narrow-to-region beg end) + (replace-buffer-contents write-back-buf 0.1 nil) + (goto-char (point-max)))) (when (and expecting-bol (not (bolp))) (insert "\n"))))) (when write-back-buf (kill-buffer write-back-buf)) ;; If we are to return to source buffer, put point at an diff --git a/lisp/org-table.el b/lisp/org-table.el index 0712e6105..89c57fb06 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -4667,18 +4667,18 @@ blank, and the content is appended to the field above." (save-excursion (goto-char start) (move-beginning-of-line 1)) (save-excursion (org-forward-paragraph) (point))) (org-table-cut-region (region-beginning) (region-end)) - (when (> (length (car org-table-clip)) 1) - (user-error "Region must be limited to single column")) - (let ((nlines (cond ((not arg) (length org-table-clip)) - ((< arg 1) (+ (length org-table-clip) arg)) - (t arg)))) - (setq org-table-clip - (mapcar #'list - (org-wrap (mapconcat #'car org-table-clip " ") - nil - nlines)))) - (goto-char start) - (org-table-paste-rectangle)) + (when (> (length (car org-table-clip)) 1) + (user-error "Region must be limited to single column")) + (let ((nlines (cond ((not arg) (length org-table-clip)) + ((< arg 1) (+ (length org-table-clip) arg)) + (t arg)))) + (setq org-table-clip + (mapcar #'list + (org-wrap (mapconcat #'car org-table-clip " ") + nil + nlines)))) + (goto-char start) + (org-table-paste-rectangle)) (org-table-align)) ;; No region, split the current field at point. (unless (org-get-alist-option org-M-RET-may-split-line 'table) diff --git a/lisp/org.el b/lisp/org.el index 74b12a39f..6d87d953f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19214,7 +19214,7 @@ Also align node properties according to `org-property-format'." (when (and (looking-at-p "^[[:space:]]*$") (not org-src-preserve-indentation)) (let ((element (org-element-at-point)) - block-content-ind some-ind) + block-content-ind some-ind) (org-with-point-at (org-element-property :begin element) (setq block-content-ind (+ (current-indentation) org-edit-src-content-indentation)) diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index 176542661..78e6fb498 100644 --- a/lisp/ox-ascii.el +++ b/lisp/ox-ascii.el @@ -1380,7 +1380,7 @@ contextual information." ;;;; Inlinetask (defun org-ascii-format-inlinetask-default - (_todo _type _priority _name _tags contents width inlinetask info) + (_todo _type _priority _name _tags contents width inlinetask info) "Format an inline task element for ASCII export. See `org-ascii-format-inlinetask-function' for a description of the parameters." @@ -2091,7 +2091,7 @@ a communication channel." ;;;###autoload (defun org-ascii-export-as-ascii - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to a text buffer. If narrowing is active in the current buffer, only export its @@ -2126,7 +2126,7 @@ is non-nil." ;;;###autoload (defun org-ascii-export-to-ascii - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to a text file. If narrowing is active in the current buffer, only export its diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 4b24e8ed3..ca0f1c71a 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -150,7 +150,7 @@ which is replaced with the subtitle." (defconst org-beamer-column-widths "0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 0.0 :ETC" -"The column widths that should be installed as allowed property values.") + "The column widths that should be installed as allowed property values.") (defconst org-beamer-environments-special '(("againframe" "A") @@ -426,16 +426,16 @@ used as a communication channel." ;; Collect nonempty options from default value and ;; headline's properties. (cl-remove-if-not #'org-string-nw-p - (append - (org-split-string - (plist-get info :beamer-frame-default-options) ",") - (and beamer-opt - (org-split-string - ;; Remove square brackets if user provided - ;; them. - (and (string-match "^\\[?\\(.*\\)\\]?$" beamer-opt) - (match-string 1 beamer-opt)) - ","))))) + (append + (org-split-string + (plist-get info :beamer-frame-default-options) ",") + (and beamer-opt + (org-split-string + ;; Remove square brackets if user provided + ;; them. + (and (string-match "^\\[?\\(.*\\)\\]?$" beamer-opt) + (match-string 1 beamer-opt)) + ","))))) (fragile ;; Add "fragile" option if necessary. (and fragilep @@ -959,7 +959,7 @@ value." ;;;###autoload (defun org-beamer-export-as-latex - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer as a Beamer buffer. If narrowing is active in the current buffer, only export its @@ -994,7 +994,7 @@ is non-nil." ;;;###autoload (defun org-beamer-export-to-latex - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer as a Beamer presentation (tex). If narrowing is active in the current buffer, only export its @@ -1028,7 +1028,7 @@ Return output file's name." ;;;###autoload (defun org-beamer-export-to-pdf - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer as a Beamer presentation (PDF). If narrowing is active in the current buffer, only export its @@ -1079,7 +1079,7 @@ aid, but the tag does not have any semantic meaning." (org-current-tag-alist (append '((:startgroup)) (mapcar (lambda (e) (cons (concat "B_" (car e)) - (string-to-char (nth 1 e)))) + (string-to-char (nth 1 e)))) envs) '((:endgroup)) '(("BMCOL" . ?|)))) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 54905a78d..60bb77d81 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -1114,15 +1114,15 @@ org-info.js for your website." (defconst org-html-checkbox-types '((unicode . - ((on . "☑") (off . "☐") (trans . "☐"))) + ((on . "☑") (off . "☐") (trans . "☐"))) (ascii . - ((on . "[X]") - (off . "[ ]") - (trans . "[-]"))) + ((on . "[X]") + (off . "[ ]") + (trans . "[-]"))) (html . ((on . "") - (off . "") - (trans . "")))) + (off . "") + (trans . "")))) "Alist of checkbox types. The cdr of each entry is an alist list three checkbox types for HTML export: `on', `off' and `trans'. @@ -1605,7 +1605,7 @@ CSS classes, then this prefix can be very useful." (defun org-html-html5-p (info) (let ((dt (downcase (plist-get info :html-doctype)))) - (member dt '("html5" "xhtml5" "")))) + (member dt '("html5" "xhtml5" "")))) (defun org-html--html5-fancy-p (info) "Non-nil when exporting to HTML5 with fancy elements. @@ -2244,7 +2244,7 @@ is the language used for CODE, as a string, or nil." (if (and beg end) (substring code beg end) code))))))))) (defun org-html-do-format-code - (code &optional lang refs retain-labels num-start wrap-lines) + (code &optional lang refs retain-labels num-start wrap-lines) "Format CODE string as source code. Optional arguments LANG, REFS, RETAIN-LABELS, NUM-START, WRAP-LINES are, respectively, the language of the source code, as a string, an @@ -2732,7 +2732,7 @@ holding contextual information." todo todo-type priority text tags contents info))) (defun org-html-format-inlinetask-default-function - (todo todo-type priority text tags contents info) + (todo todo-type priority text tags contents info) "Default format function for inlinetasks. See `org-html-format-inlinetask-function' for details." (format "
\n%s%s\n%s
" @@ -3477,12 +3477,12 @@ contextual information." (if (org-export-read-attribute :attr_html src-block :textarea) (org-html--textarea-block src-block) (let* ((lang (org-element-property :language src-block)) - (code (org-html-format-code src-block info)) - (label (let ((lbl (org-html--reference src-block info t))) - (if lbl (format " id=\"%s\"" lbl) ""))) - (klipsify (and (plist-get info :html-klipsify-src) - (member lang '("javascript" "js" - "ruby" "scheme" "clojure" "php" "html"))))) + (code (org-html-format-code src-block info)) + (label (let ((lbl (org-html--reference src-block info t))) + (if lbl (format " id=\"%s\"" lbl) ""))) + (klipsify (and (plist-get info :html-klipsify-src) + (member lang '("javascript" "js" + "ruby" "scheme" "clojure" "php" "html"))))) (if (not lang) (format "
\n%s
" label code) (format "
\n%s%s\n
" ;; Build caption. @@ -3786,7 +3786,7 @@ contextual information." ;;;###autoload (defun org-html-export-as-html - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to an HTML buffer. If narrowing is active in the current buffer, only export its @@ -3831,7 +3831,7 @@ to convert it." ;;;###autoload (defun org-html-export-to-html - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to a HTML file. If narrowing is active in the current buffer, only export its diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index 54004045c..917005915 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -722,7 +722,7 @@ Return VEVENT component as a string." "END:VEVENT")))) (defun org-icalendar--vtodo - (entry uid summary location description categories timezone class) + (entry uid summary location description categories timezone class) "Create a VTODO component. ENTRY is either a headline or an inlinetask element. UID is the @@ -849,7 +849,7 @@ CALSCALE:GREGORIAN\n" ;;;###autoload (defun org-icalendar-export-to-ics - (&optional async subtreep visible-only body-only) + (&optional async subtreep visible-only body-only) "Export current buffer to an iCalendar file. If narrowing is active in the current buffer, only export its diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 3b03c6685..993c2c643 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -308,14 +308,14 @@ (format "\\`[ \t]*\\\\begin{%s\\*?}" (regexp-opt - '("equation" "eqnarray" "math" "displaymath" - "align" "gather" "multline" "flalign" "alignat" - "xalignat" "xxalignat" - "subequations" - ;; breqn - "dmath" "dseries" "dgroup" "darray" - ;; empheq - "empheq"))) + '("equation" "eqnarray" "math" "displaymath" + "align" "gather" "multline" "flalign" "alignat" + "xalignat" "xxalignat" + "subequations" + ;; breqn + "dmath" "dseries" "dgroup" "darray" + ;; empheq + "empheq"))) "Regexp of LaTeX math environments.") @@ -346,7 +346,7 @@ symbols are: `image', `table', `src-block' and `special-block'." (const :tag "Special blocks" special-block)))) (defcustom org-latex-prefer-user-labels nil - "Use user-provided labels instead of internal ones when non-nil. + "Use user-provided labels instead of internal ones when non-nil. When this variable is non-nil, Org will use the value of CUSTOM_ID property, NAME keyword or Org target as the key for the @@ -1633,9 +1633,9 @@ INFO is a plist used as a communication channel." "Insert LaTeX_compiler info into the document. INFO is a plist used as a communication channel." (let ((compiler (plist-get info :latex-compiler))) - (and (org-string-nw-p org-latex-compiler-file-string) - (member (or compiler "") org-latex-compilers) - (format org-latex-compiler-file-string compiler)))) + (and (org-string-nw-p org-latex-compiler-file-string) + (member (or compiler "") org-latex-compilers) + (format org-latex-compiler-file-string compiler)))) ;;; Filters @@ -2924,18 +2924,18 @@ channel." CONTENTS holds the contents of the block. INFO is a plist holding contextual information." (let ((environment - (or (org-export-read-attribute :attr_latex quote-block :environment) - (plist-get info :latex-default-quote-environment))) - (options - (or (org-export-read-attribute :attr_latex quote-block :options) - ""))) - (org-latex--wrap-label - quote-block (format "\\begin{%s}%s\n%s\\end{%s}" - environment - options - contents - environment) - info))) + (or (org-export-read-attribute :attr_latex quote-block :environment) + (plist-get info :latex-default-quote-environment))) + (options + (or (org-export-read-attribute :attr_latex quote-block :options) + ""))) + (org-latex--wrap-label + quote-block (format "\\begin{%s}%s\n%s\\end{%s}" + environment + options + contents + environment) + info))) ;;;; Radio Target @@ -3599,7 +3599,7 @@ contextual information." ;;;###autoload (defun org-latex-export-as-latex - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer as a LaTeX buffer. If narrowing is active in the current buffer, only export its @@ -3643,7 +3643,7 @@ command to convert it." ;;;###autoload (defun org-latex-export-to-latex - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to a LaTeX file. If narrowing is active in the current buffer, only export its @@ -3675,7 +3675,7 @@ file-local settings." ;;;###autoload (defun org-latex-export-to-pdf - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to LaTeX then process through to PDF. If narrowing is active in the current buffer, only export its diff --git a/lisp/ox-man.el b/lisp/ox-man.el index f9fc0ffa5..6d3476cda 100644 --- a/lisp/ox-man.el +++ b/lisp/ox-man.el @@ -301,12 +301,12 @@ CONTENTS is the transcoded contents string. INFO is a plist holding export options." (let* ((title (when (plist-get info :with-title) (org-export-data (plist-get info :title) info))) - (attr (read (format "(%s)" - (mapconcat - #'identity - (list (plist-get info :man-class-options)) - " ")))) - (section-item (plist-get attr :section-id))) + (attr (read (format "(%s)" + (mapconcat + #'identity + (list (plist-get info :man-class-options)) + " ")))) + (section-item (plist-get attr :section-id))) (concat @@ -825,10 +825,10 @@ contextual information." ;; Case 1: verbatim table. ((or (plist-get info :man-tables-verbatim) (let ((attr (read (format "(%s)" - (mapconcat - #'identity - (org-element-property :attr_man table) - " "))))) + (mapconcat + #'identity + (org-element-property :attr_man table) + " "))))) (and attr (plist-get attr :verbatim)))) @@ -1053,7 +1053,7 @@ contextual information." ;;; Interactive functions (defun org-man-export-to-man - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to a Man file. If narrowing is active in the current buffer, only export its @@ -1086,7 +1086,7 @@ Return output file's name." async subtreep visible-only body-only ext-plist))) (defun org-man-export-to-pdf - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to Groff then process through to PDF. If narrowing is active in the current buffer, only export its diff --git a/lisp/ox-md.el b/lisp/ox-md.el index d288aba4c..348b6d01d 100644 --- a/lisp/ox-md.el +++ b/lisp/ox-md.el @@ -58,10 +58,10 @@ This variable can be set to either `atx' or `setext'." "Format string for the footnotes section. The first %s placeholder will be replaced with the localized Footnotes section heading, the second with the contents of the Footnotes section." - :group 'org-export-md - :type 'string - :version "26.1" - :package-version '(Org . "9.0")) + :group 'org-export-md + :type 'string + :version "26.1" + :package-version '(Org . "9.0")) (defcustom org-md-footnote-format "%s" "Format string for the footnote reference. @@ -213,9 +213,9 @@ the section." (underline (concat (make-string (length title) underline-char) "\n"))) (concat "\n" anchor-lines title tags "\n" underline "\n")) - ;; Use "Atx" style - (let ((level-mark (make-string level ?#))) - (concat "\n" anchor-lines level-mark " " title tags "\n\n"))))) + ;; Use "Atx" style + (let ((level-mark (make-string level ?#))) + (concat "\n" anchor-lines level-mark " " title tags "\n\n"))))) (defun org-md--build-toc (info &optional n _keyword scope) "Return a table of contents. diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 945bc7d2c..f186ebb16 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -981,7 +981,7 @@ See `org-odt--build-date-styles' for implementation details." ;;;; Frame (defun org-odt--frame (text width height style &optional extra - anchor-type &rest title-and-desc) + anchor-type &rest title-and-desc) (let ((frame-attrs (concat (if width (format " svg:width=\"%0.2fcm\"" width) "") @@ -1043,7 +1043,7 @@ See `org-odt--build-date-styles' for implementation details." ;;;; Textbox (defun org-odt--textbox (text width height style &optional - extra anchor-type) + extra anchor-type) (org-odt--frame (format "\n%s\n" (concat (format " fo:min-height=\"%0.2fcm\"" (or height .2)) @@ -1777,8 +1777,8 @@ INFO is a plist holding contextual information." (if (functionp format-function) format-function (cl-function (lambda (todo todo-type priority text tags - &key _level _section-number _headline-label - &allow-other-keys) + &key _level _section-number _headline-label + &allow-other-keys) (funcall (plist-get info :odt-format-headline-function) todo todo-type priority text tags)))))) (apply format-function @@ -1851,7 +1851,7 @@ holding contextual information." contents)))))) (defun org-odt-format-headline-default-function - (todo todo-type priority text tags) + (todo todo-type priority text tags) "Default format function for a headline. See `org-odt-format-headline-function' for details." (concat @@ -1929,7 +1929,7 @@ holding contextual information." todo todo-type priority text tags contents))) (defun org-odt-format-inlinetask-default-function - (todo todo-type priority name tags contents) + (todo todo-type priority name tags contents) "Default format function for inlinetasks. See `org-odt-format-inlinetask-function' for details." (format "\n%s" @@ -2198,7 +2198,7 @@ SHORT-CAPTION are strings." (declare-function image-size "image.c" (spec &optional pixels frame)) (defun org-odt--image-size - (file info &optional user-width user-height scale dpi embed-as) + (file info &optional user-width user-height scale dpi embed-as) (let* ((--pixels-to-cms (lambda (pixels dpi) (let ((cms-per-inch 2.54) @@ -2399,7 +2399,7 @@ used as a communication channel." ;; Case 2: OpenDocument formula. ((string= ext "odf") (org-odt--zip-extract src-file "content.xml" - (concat org-odt-zip-dir target-dir))) + (concat org-odt-zip-dir target-dir))) (t (error "%s is not a formula file" src-file)))) ;; Enter the formula file in to manifest. (org-odt-create-manifest-file-entry "text/xml" target-file) @@ -2650,7 +2650,7 @@ Return nil, otherwise." (format "%s" label (mapconcat (lambda (n) (if (not n) " " - (concat (number-to-string n) "."))) + (concat (number-to-string n) "."))) item-numbers ""))))) ;; Case 2: Locate a regular and numbered headline in the ;; hierarchy. Display its section number. @@ -3030,7 +3030,7 @@ holding contextual information." (anchor (plist-get attributes :anchor))) (format "\n%s" "Text_20_body" (org-odt--textbox contents width height - style extra anchor)))) + style extra anchor)))) (t contents)))) @@ -3771,13 +3771,13 @@ contextual information." ;; paragraph. (latex-environment (org-element-adopt-elements - (list 'paragraph - (list :style "OrgFormula" - :name - (org-element-property :name latex-*) - :caption - (org-element-property :caption latex-*))) - link)) + (list 'paragraph + (list :style "OrgFormula" + :name + (org-element-property :name latex-*) + :caption + (org-element-property :caption latex-*))) + link)) ;; LaTeX fragment. No special action. (latex-fragment link)))) ;; Note down the object that link replaces. @@ -3840,15 +3840,15 @@ contextual information." (mapcar (lambda (item) (org-element-adopt-elements - (list 'item (list :checkbox (org-element-property - :checkbox item))) - (list 'paragraph (list :style "Text_20_body_20_bold") - (or (org-element-property :tag item) "(no term)")) - (org-element-adopt-elements - (list 'plain-list (list :type 'descriptive-2)) - (apply 'org-element-adopt-elements - (list 'item nil) - (org-element-contents item))))) + (list 'item (list :checkbox (org-element-property + :checkbox item))) + (list 'paragraph (list :style "Text_20_body_20_bold") + (or (org-element-property :tag item) "(no term)")) + (org-element-adopt-elements + (list 'plain-list (list :type 'descriptive-2)) + (apply 'org-element-adopt-elements + (list 'item nil) + (org-element-contents item))))) (org-element-contents el))))) nil) info) diff --git a/lisp/ox-org.el b/lisp/ox-org.el index 0c4290ebf..11d9c09eb 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -239,7 +239,7 @@ a communication channel." ;;;###autoload (defun org-org-export-as-org - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to an Org buffer. If narrowing is active in the current buffer, only export its @@ -274,7 +274,7 @@ non-nil." ;;;###autoload (defun org-org-export-to-org - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to an Org file. If narrowing is active in the current buffer, only export its diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 99b1dca81..bc9b17ab3 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -358,7 +358,7 @@ You can overwrite this default per project in your (concat "X" (if (fboundp 'sha1) (sha1 filename) (md5 filename)))) (defun org-publish-needed-p - (filename &optional pub-dir pub-func _true-pub-dir base-dir) + (filename &optional pub-dir pub-func _true-pub-dir base-dir) "Non-nil if FILENAME should be published in PUB-DIR using PUB-FUNC. TRUE-PUB-DIR is where the file will truly end up. Currently we are not using this - maybe it can eventually be used to check if @@ -375,7 +375,7 @@ still decide about that independently." rtn)) (defun org-publish-update-timestamp - (filename &optional pub-dir pub-func _base-dir) + (filename &optional pub-dir pub-func _base-dir) "Update publishing timestamp for file FILENAME. If there is no timestamp, create one." (let ((key (org-publish-timestamp-filename filename pub-dir pub-func)) @@ -1065,7 +1065,7 @@ publishing directory." (setq full-index (sort (nreverse full-index) (lambda (a b) (string< (downcase (car a)) - (downcase (car b))))))) + (downcase (car b))))))) (let ((index (org-publish-cache-get-file-property file :index))) (dolist (term index) (unless (member term full-index) (push term full-index))))) @@ -1320,7 +1320,7 @@ the file including them will be republished as well." included-files-ctime)))))) (defun org-publish-cache-set-file-property - (filename property value &optional project-name) + (filename property value &optional project-name) "Set the VALUE for a PROPERTY of file FILENAME in publishing cache to VALUE. Use cache file of PROJECT-NAME. If the entry does not exist, it will be created. Return VALUE." diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index 3851f4271..8b949b361 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/ox-texinfo.el @@ -928,7 +928,7 @@ holding contextual information." contents)))))) (defun org-texinfo-format-headline-default-function - (todo _todo-type priority text tags) + (todo _todo-type priority text tags) "Default format function for a headline. See `org-texinfo-format-headline-function' for details." (concat (and todo (format "@strong{%s} " todo)) @@ -965,7 +965,7 @@ holding contextual information." todo todo-type priority title tags contents))) (defun org-texinfo-format-inlinetask-default-function - (todo _todo-type priority title tags contents) + (todo _todo-type priority title tags contents) "Default format function for inlinetasks. See `org-texinfo-format-inlinetask-function' for details." (let ((full-title @@ -1615,7 +1615,7 @@ contextual information." ;;;###autoload (defun org-texinfo-export-to-texinfo - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to a Texinfo file. If narrowing is active in the current buffer, only export its @@ -1666,7 +1666,7 @@ Usage: emacs -batch -f org-texinfo-export-to-texinfo-batch INFILE OUTFILE" ;;;###autoload (defun org-texinfo-export-to-info - (&optional async subtreep visible-only body-only ext-plist) + (&optional async subtreep visible-only body-only ext-plist) "Export current buffer to Texinfo then process through to INFO. If narrowing is active in the current buffer, only export its diff --git a/lisp/ox.el b/lisp/ox.el index 89a3ff5f1..9ab813a1b 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -2726,8 +2726,8 @@ a list of footnote definitions or in the widened buffer." ) ;; seen (dolist (l (funcall list-labels tree)) (cond ;; ((member l seen)) - ((member l known-definitions) (push l defined)) - (t (push l undefined))))) + ((member l known-definitions) (push l defined)) + (t (push l undefined))))) ;; Complete MISSING-DEFINITIONS by finding the definition of every ;; undefined label, first by looking into DEFINITIONS, then by ;; searching the widened buffer. This is a recursive process @@ -2739,7 +2739,7 @@ a list of footnote definitions or in the widened buffer." (cond ((cl-some (lambda (d) (and (equal (org-element-property :label d) label) - d)) + d)) definitions)) ((pcase (org-footnote-get-definition label) (`(,_ ,beg . ,_) @@ -2802,16 +2802,16 @@ containing their first reference." ;; the definitions at the end of the tree. (org-footnote-section (org-element-adopt-elements - tree - (org-element-create 'headline - (list :footnote-section-p t - :level 1 - :title org-footnote-section - :raw-value org-footnote-section) - (apply #'org-element-create - 'section - nil - (nreverse definitions))))) + tree + (org-element-create 'headline + (list :footnote-section-p t + :level 1 + :title org-footnote-section + :raw-value org-footnote-section) + (apply #'org-element-create + 'section + nil + (nreverse definitions))))) ;; Otherwise add each definition at the end of the section where it ;; is first referenced. (t @@ -2834,8 +2834,8 @@ containing their first reference." d)) definitions))) (org-element-adopt-elements - (org-element-lineage reference '(section)) - definition) + (org-element-lineage reference '(section)) + definition) ;; Also insert definitions for nested ;; references, if any. (funcall insert-definitions definition)))))))))) @@ -4222,10 +4222,10 @@ Return modified DATA." (or rules org-export-default-inline-image-rule)) ;; Replace contents with image link. (org-element-adopt-elements - (org-element-set-contents l nil) - (with-temp-buffer - (save-excursion (insert contents)) - (org-element-link-parser)))))))) + (org-element-set-contents l nil) + (with-temp-buffer + (save-excursion (insert contents)) + (org-element-link-parser)))))))) info nil nil t)) data) @@ -5121,8 +5121,8 @@ INFO is a plist used as a communication channel." ;; A cell ends a column group either when it is at the end of a row ;; or when it has a right border. (or (eq (car (last (org-element-contents - (org-export-get-parent table-cell)))) - table-cell) + (org-export-get-parent table-cell)))) + table-cell) (memq 'right (org-export-table-cell-borders table-cell info)))) (defun org-export-table-row-starts-rowgroup-p (table-row info) @@ -6339,9 +6339,9 @@ and `org-export-to-file' for more specialized functions." ;;;###autoload (defun org-export-to-buffer - (backend buffer - &optional async subtreep visible-only body-only ext-plist - post-process) + (backend buffer + &optional async subtreep visible-only body-only ext-plist + post-process) "Call `org-export-as' with output to a specified buffer. BACKEND is either an export back-end, as returned by, e.g., @@ -6405,8 +6405,8 @@ This function returns BUFFER." ;;;###autoload (defun org-export-to-file - (backend file &optional async subtreep visible-only body-only ext-plist - post-process) + (backend file &optional async subtreep visible-only body-only ext-plist + post-process) "Call `org-export-as' with output to a specified file. BACKEND is either an export back-end, as returned by, e.g., @@ -6563,7 +6563,7 @@ If optional argument SOURCE is non-nil, remove it instead." (let ((source (or source (org-export--stack-source-at-point)))) (setq org-export-stack-contents (cl-remove-if (lambda (el) (equal (car el) source)) - org-export-stack-contents)))) + org-export-stack-contents)))) (defun org-export-stack-view (&optional in-emacs) "View export results at point in stack.