[elpa] externals/org 1292d89 4/4: Clean up spacing to pass Emacs's pre-commit check
branch: externals/org commit 1292d89c37073d4cde037f703d4cb9227a98931c Author: Kyle Meyer Commit: Kyle Meyer Clean up spacing to pass Emacs's pre-commit check * lisp/org-agenda.el (org-agenda-highlight-todo): (org-agenda-set-mode-name): * lisp/org-table.el (org-table-eval-formula): Avoid space before tab in indent. This is in preparation for syncing with the Emacs repo. --- lisp/org-agenda.el | 8 lisp/org-table.el | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 1a3bfab..f6e2d48 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7182,7 +7182,7 @@ The optional argument TYPE tells the agenda type." ;; Remove `display' property as the icon could leak ;; on the white space. (org-add-props " " (org-plist-delete (text-properties-at 0 x) - 'display)) +'display)) (substring x (match-end 3))) x))) @@ -8807,15 +8807,15 @@ When called with a prefix argument, include all archive files as well." '(:eval (propertize (concat "[" (mapconcat - #'identity +#'identity (append (get 'org-agenda-category-filter :preset-filter) org-agenda-category-filter) "") "]") 'face 'org-agenda-filter-category - 'help-echo "Category used in filtering")) - "") + 'help-echo "Category used in filtering")) +"") (if (or org-agenda-tag-filter (get 'org-agenda-tag-filter :preset-filter)) '(:eval (propertize diff --git a/lisp/org-table.el b/lisp/org-table.el index 20f848c..0712e61 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -2457,7 +2457,7 @@ location of point." (let ((c (string-to-char (match-string 1 fmt (cl-case c (?t (setq duration t numbers t - duration-output-format org-table-duration-custom-format)) +duration-output-format org-table-duration-custom-format)) (?T (setq duration t numbers t duration-output-format nil)) (?U (setq duration t numbers t duration-output-format 'hh:mm)) (?N (setq numbers t))
[elpa] externals/org d3add14 3/4: ORG-NEWS: Drop an incomplete thought
branch: externals/org commit d3add1446120290e81c235e57ac6fe3e71cab65d Author: Kyle Meyer Commit: Kyle Meyer ORG-NEWS: Drop an incomplete thought This is flagged by Emacs's pre-commit hook due to trailing whitespace. But the line looks incomplete, so just deleted the line. --- etc/ORG-NEWS | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index a9c08dd..283e4b1 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -151,8 +151,6 @@ enable Calc units simplification mode. *** Support fontification of inline export snippets -Inline - See [[msg:87im57fh8j@gmail.com][this thread]]. *** New command =org-refile-reverse= bound to =C-c C-M-w=
[elpa] externals/org d410506 2/4: orgcard.tex: Use en-dash for copyright years
branch: externals/org commit d4105060d22ec98446de24305c5a2965e02c924c Author: Kyle Meyer Commit: Kyle Meyer orgcard.tex: Use en-dash for copyright years This matches what's in the Emacs tree (and generated automatically by admin/update-copyright). --- doc/orgcard.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/orgcard.tex b/doc/orgcard.tex index f78cb88..a4400e7 100644 --- a/doc/orgcard.tex +++ b/doc/orgcard.tex @@ -15,7 +15,7 @@ \pdflayout=(0l) % Nothing else needs to be changed below this line. -% Copyright (C) 1987, 1993, 1996-1997, 2001-2021 Free Software +% Copyright (C) 1987, 1993, 1996--1997, 2001--2021 Free Software % Foundation, Inc. % This document is free software: you can redistribute it and/or modify
[elpa] externals/org 5ed40ab 1/4: ORG-NEWS: Clean up leftover conflicts
branch: externals/org commit 5ed40ab2669b5d89e3ea61b5be691e3250bbe5e7 Author: Kyle Meyer Commit: Kyle Meyer ORG-NEWS: Clean up leftover conflicts The merge in e64d5bcc6 (Merge branch 'bugfix', 2021-09-25) left several unresolved conflicts. One was cleaned up later in db67c7e92 (Move some ob-*el files to the new org-contrib repo, 2021-09-26). Take care of the other ones. --- etc/ORG-NEWS | 12 1 file changed, 12 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index b0a8939..a9c08dd 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -912,11 +912,7 @@ In all Babel libraries, the absence of a ~:results~ header should produce the same result than setting ~:results value~, unless there is an option to explicitly create an exception. -<<< HEAD See [[msg:ca+a2izaziafmegpbql6qgrzrwevvlvc0duw++t4gcf3nguw...@mail.gmail.com][this thread]] for more context. -=== -See [[https://list.orgmode.org/ca+a2izaziafmegpbql6qgrzrwevvlvc0duw++t4gcf3nguw...@mail.gmail.com/][this thread]] for more context. ->>> bugfix *** New option in ~org-attach-store-link-p~ @@ -5661,11 +5657,7 @@ that Calc formulas can operate on them. The new system has a technically cleaner implementation and more possibilities for capturing different types of data. See -<<< HEAD [[msg:c46f10dc-de51-43d4-affe-f71e440d1...@gmail.com][Carsten's announcement]] for more details. -=== - [[https://list.orgmode.org/c46f10dc-de51-43d4-affe-f71e440d1...@gmail.com][Carsten's announcement]] for more details. ->>> bugfix To switch over to the new system: @@ -5796,11 +5788,7 @@ that Calc formulas can operate on them. Modified link escaping -<<< HEAD David Maus worked on `org-link-escape'. See [[msg:87k4gysacq.wl%dm...@ictsoc.de][his message]]: -=== - David Maus worked on `org-link-escape'. See [[https://list.orgmode.org/87k4gysacq.wl%dm...@ictsoc.de][his message]]: ->>> bugfix : Percent escaping is used in Org mode to escape certain characters : in links that would either break the parser (e.g. square brackets
[elpa] externals/org updated (b96aae4 -> 1292d89)
elpasync pushed a change to branch externals/org. from b96aae4 oc-csl: Refactor code to help byte-compilation new 5ed40ab ORG-NEWS: Clean up leftover conflicts new d410506 orgcard.tex: Use en-dash for copyright years new d3add14 ORG-NEWS: Drop an incomplete thought new 1292d89 Clean up spacing to pass Emacs's pre-commit check Summary of changes: doc/orgcard.tex| 2 +- etc/ORG-NEWS | 14 -- lisp/org-agenda.el | 8 lisp/org-table.el | 2 +- 4 files changed, 6 insertions(+), 20 deletions(-)
[nongnu] elpa/with-editor updated (eabf9c9 -> 5272a3c)
elpasync pushed a change to branch elpa/with-editor. from eabf9c9 manual: Cleanup local variables new 73e1cdf with-editor-export-editor: For vterm call clear new 5272a3c readme: Add vterm setup instructions Summary of changes: README.md | 13 +++-- with-editor.el | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-)
[nongnu] elpa/with-editor 5272a3c 2/2: readme: Add vterm setup instructions
branch: elpa/with-editor commit 5272a3c7af183eddf59cbcd7cc82203755b61300 Author: Itai Y. Efrat Commit: Jonas Bernoulli readme: Add vterm setup instructions --- README.md | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3f2daea..4d41774 100644 --- a/README.md +++ b/README.md @@ -26,15 +26,16 @@ which always sets `$EDITOR` for all Emacs commands which ultimately use `shell-command` to asynchronously run some shell command. The command `with-editor-export-editor` exports `$EDITOR` or -another such environment variable in `shell-mode`, `term-mode` and -`eshell-mode` buffers. Use this Emacs command before executing a -shell command which needs the editor set, or always arrange for the -current Emacs instance to be used as editor by adding it to the -appropriate mode hooks: +another such environment variable in `shell-mode`, `eshell-mode`, +`term-mode` and `vterm-mode` buffers. Use this Emacs command +before executing a shell command which needs the editor set, or +always arrange for the current Emacs instance to be used as editor +by adding it to the appropriate mode hooks: (add-hook 'shell-mode-hook 'with-editor-export-editor) -(add-hook 'term-exec-hook 'with-editor-export-editor) (add-hook 'eshell-mode-hook 'with-editor-export-editor) +(add-hook 'term-exec-hook 'with-editor-export-editor) +(add-hook 'vterm-mode-hook 'with-editor-export-editor) Some variants of this function exist, these two forms are equivalent:
[nongnu] elpa/with-editor 73e1cdf 1/2: with-editor-export-editor: For vterm call clear
branch: elpa/with-editor commit 73e1cdfc93fc23f3888e40a173c252778d0bb92c Author: Jonas Bernoulli Commit: Jonas Bernoulli with-editor-export-editor: For vterm call clear Re #101. --- with-editor.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/with-editor.el b/with-editor.el index cbe65d5..0df8b6d 100644 --- a/with-editor.el +++ b/with-editor.el @@ -722,7 +722,9 @@ This works in `shell-mode', `term-mode', `eshell-mode' and (vterm-send-return)) (when-let ((v (getenv "EMACS_SERVER_FILE"))) (vterm-send-string (format "export EMACS_SERVER_FILE=%S" v)) -(vterm-send-return))) +(vterm-send-return)) + (vterm-send-string "clear") + (vterm-send-return)) (error "Cannot use sleeping editor in this buffer"))) (t (error "Cannot export environment variables in this buffer")))
[elpa] externals/shell-command+ 35808ca 2/3: Fix checkdoc complaint
branch: externals/shell-command+ commit 35808caba439fd72a6a4188a1698ab7981fda20d Author: Philip Kaludercic Commit: Philip Kaludercic Fix checkdoc complaint --- shell-command+.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell-command+.el b/shell-command+.el index 1959065..02d22fa 100644 --- a/shell-command+.el +++ b/shell-command+.el @@ -74,7 +74,7 @@ (defcustom shell-command+-use-eshell nil "Check for eshell handlers. If t, always invoke eshell handlers. If a list, only invoke -handlers if the symbol (eg. `man') is contained in the list." +handlers if the symbol (e.g. `man') is contained in the list." :type '(choice (boolean :tag "Always active?") (repeat :tag "Selected commands" symbol)))
[elpa] externals/shell-command+ updated (1554f6f -> 36ed006)
elpasync pushed a change to branch externals/shell-command+. from 1554f6f Add rgrep to shell-command+-substitute-alist new dd94676 Update copyright line new 35808ca Fix checkdoc complaint new 36ed006 Fix shell-command+-substitute-alist customization type Summary of changes: shell-command+.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)
[elpa] externals/org 51a60cd 1/4: lisp/ob-R: Async evaluation in R
branch: externals/org commit 51a60cd53f62261c5cfd3835571c27771be6c471 Author: Jeremie Juste Commit: Bastien lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6@gmail.com/ --- lisp/ob-R.el | 90 +++-- testing/lisp/test-ob-R.el | 94 +++ 2 files changed, 181 insertions(+), 3 deletions(-) diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 2d9073c..299ccdf 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -158,6 +158,7 @@ This function is called by `org-babel-execute-src-block'." (save-excursion (let* ((result-params (cdr (assq :result-params params))) (result-type (cdr (assq :result-type params))) + (async (org-babel-comint-use-async params)) (session (org-babel-R-initiate-session (cdr (assq :session params)) params)) (graphics-file (and (member "graphics" (assq :result-params params)) @@ -184,7 +185,8 @@ This function is called by `org-babel-execute-src-block'." (cdr (assq :colname-names params)) colnames-p)) (or (equal "yes" rownames-p) (org-babel-pick-name - (cdr (assq :rowname-names params)) rownames-p) + (cdr (assq :rowname-names params)) rownames-p)) + async))) (if graphics-file nil result (defun org-babel-prep-session:R (session params) @@ -371,11 +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) + (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) + 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))) @@ -468,6 +473,85 @@ Insert hline if column names in output have been requested." (error "Could not parse R result")) result)) + +;;; async evaluation + +(defconst ob-session-async-R-indicator "'ob_comint_async_R_%s_%s'") + +(defun ob-session-async-org-babel-R-evaluate-session +(session body result-type result-params column-names-p row-names-p) + "Asynchronously evaluate BODY in SESSION. +Returns a placeholder string for insertion, to later be replaced +by `org-babel-comint-async-filter'." + (org-babel-comint-async-register + session (current-buffer) + "^\\(?:[>.+] \\)*\\[1\\] \"ob_comint_async_R_\\(.+?\\)_\\(.+\\)\"$" + 'org-babel-chomp + 'ob-session-async-R-value-callback) + (cl-case result-type +(value + (let ((tmp-file (org-babel-temp-file "R-"))) + (with-temp-buffer + (insert + (org-babel-chomp body)) + (let ((ess-local-process-name +(process-name (get-buffer-process session + (ess-eval-buffer nil))) + (with-temp-buffer +(insert + (mapconcat + 'org-babel-chomp + (list (format org-babel-R-write-object-command + (if row-names-p "TRUE" "FALSE") + (if column-names-p + (if row-names-p "NA" "TRUE") + "FALSE") + ".Last.value" + (org-babel-process-file-name tmp-file 'noquote)) + (format ob-session-async-R-indicator + "file" tmp-file)) + "\n")) +(let ((ess-local-process-name + (process-name (get-buffer-process
[elpa] externals/shell-command+ 36ed006 3/3: Fix shell-command+-substitute-alist customization type
branch: externals/shell-command+
commit 36ed0060289b62fd0500f39a39c992daafde576c
Author: Philip Kaludercic
Commit: Philip Kaludercic
Fix shell-command+-substitute-alist customization type
---
shell-command+.el | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/shell-command+.el b/shell-command+.el
index 02d22fa..0d2394e 100644
--- a/shell-command+.el
+++ b/shell-command+.el
@@ -136,8 +136,10 @@ handlers if the symbol (e.g. `man') is contained in the
list."
("cd" . shell-command+-cmd-cd
"Association of command substitutes in Elisp.
Each entry has the form (COMMAND . FUNC), where FUNC is passed
-the command string"
- :type 'boolean)
+the command string. To disable all command substitutions, set
+this option to nil."
+ :type '(alist :key-type (string :tag "Command Name")
+:value-type (function :tag "Substitute")))
[elpa] externals/shell-command+ dd94676 1/3: Update copyright line
branch: externals/shell-command+ commit dd94676e77b6bb2f0f99f24e8e8672f3b6b83fc1 Author: Philip Kaludercic Commit: Philip Kaludercic Update copyright line --- shell-command+.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell-command+.el b/shell-command+.el index 918414f..1959065 100644 --- a/shell-command+.el +++ b/shell-command+.el @@ -1,6 +1,6 @@ ;;; shell-command+.el --- An extended shell-command -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Version: 2.2.1
[elpa] externals/org 72a48c3 3/4: ob-R.el: Patch async evaluation when :results output
branch: externals/org commit 72a48c306f4ad18852d42056cc7b628974b80cdd Author: Jeremie Juste Commit: Bastien ob-R.el: Patch async evaluation when :results output * lisp/ob-R.el (ob-session-async-org-babel-R-evaluate-session): Make sure that `ess-inject-source' is set to the default 'function-and-buffer before running `ess-eval-buffer'. Return `ess-inject-source' to its user-specified state afterwards. --- lisp/ob-R.el | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 188b9ac..6389e12 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -528,9 +528,12 @@ by `org-babel-comint-async-filter'." (insert (format ob-session-async-R-indicator "end" uuid)) (setq tmp ess-eval-visibly) + (setq user-inject-src-param ess-inject-source) (setq ess-eval-visibly nil) + (setq ess-inject-source 'function-and-buffer) (ess-eval-buffer nil)) - (setq ess-eval-visibly tmp) + (setq ess-eval-visibly tmp) + (setq ess-inject-source user-inject-src-param) uuid (defun ob-session-async-R-value-callback (params tmp-file)
[elpa] externals/org b96aae4 4/4: oc-csl: Refactor code to help byte-compilation
branch: externals/org commit b96aae46842a57380bf8d845b5c62f1c1a3099cf Author: András Simonyi Commit: Bastien oc-csl: Refactor code to help byte-compilation * lisp/oc-csl.el (org-cite-csl--create-structure-params): Refactor pcase pattern to avoid slow or in some cases non-terminating byte compilation. --- lisp/oc-csl.el | 82 +++--- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el index 51d3d3d..3c77e03 100644 --- a/lisp/oc-csl.el +++ b/lisp/oc-csl.el @@ -284,50 +284,44 @@ INFO is the export state, as a property list." "Return citeproc structure creation params for CITATION object. STYLE is the citation style, as a string or nil. INFO is the export state, as a property list." - (let* ((style (org-cite-citation-style citation info))) - (pcase style - ;; "author" style. - (`(,(or "author" "a") . ,(or "caps" "c")) - '(:mode author-only :capitalize-first t :suppress-affixes t)) - (`(,(or "author" "a") . ,(or "full" "f")) - '(:mode author-only :ignore-et-al t :suppress-affixes t)) - (`(,(or "author" "a") . ,(or "caps-full" "cf")) - '(:mode author-only :capitalize-first t :ignore-et-al t :suppress-affixes t)) - (`(,(or "author" "a") . ,_) - '(:mode author-only :suppress-affixes t)) - ;; "noauthor" style. - (`(,(or "noauthor" "na") . ,(or "bare" "b")) - '(:mode suppress-author :suppress-affixes t)) - (`(,(or "noauthor" "na") . ,(or "caps" "c")) - '(:mode suppress-author :capitalize-first t)) - (`(,(or "noauthor" "na") . ,(or "bare-caps" "bc")) - '(:mode suppress-author :suppress-affixes t :capitalize-first t)) - (`(,(or "noauthor" "na") . ,_) - '(:mode suppress-author)) - ;; "year" style. - (`(,(or "year" "y") . ,(or "bare" "b")) - '(:mode year-only :suppress-affixes t)) - (`(,(or "year" "y") . ,_) - '(:mode year-only)) - ;; "text" style. - (`(,(or "text" "t") . ,(or "caps" "c")) - '(:mode textual :capitalize-first t)) - (`(,(or "text" "t") . ,(or "full" "f")) - '(:mode textual :ignore-et-al t)) - (`(,(or "text" "t") . ,(or "caps-full" "cf")) - '(:mode textual :ignore-et-al t :capitalize-first t)) - (`(,(or "text" "t") . ,_) - '(:mode textual)) - ;; Default "nil" style. - (`(,_ . ,(or "bare" "b")) - '(:suppress-affixes t)) - (`(,_ . ,(or "caps" "c")) - '(:capitalize-first t)) - (`(,_ . ,(or "bare-caps" "bc")) - '(:suppress-affixes t :capitalize-first t)) - (`(,_ . ,_) nil) - ;; This should not happen. - (_ (error "Invalid style: %S" style) + (let ((style (org-cite-citation-style citation info))) +(pcase style + ;; "author" style. + (`(,(or "author" "a") . ,variant) + (pcase variant +((or "caps" "c") '(:mode author-only :capitalize-first t)) +((or "full" "f") '(:mode author-only :ignore-et-al t)) +((or "caps-full" "cf") '(:mode author-only :capitalize-first t :ignore-et-al t)) +(_ '(:mode author-only + ;; "noauthor" style. + (`(,(or "noauthor" "na") . ,variant) + (pcase variant +((or "bare" "b") '(:mode suppress-author :suppress-affixes t)) +((or "caps" "c") '(:mode suppress-author :capitalize-first t)) +((or "bare-caps" "bc") + '(:mode suppress-author :suppress-affixes t :capitalize-first t)) +(_ '(:mode suppress-author + ;; "year" style. + (`(,(or "year" "y") . ,variant) + (pcase variant +((or "bare" "b") '(:mode year-only :suppress-affixes t)) +(_ '(:mode year-only + ;; "text" style. + (`(,(or "text" "t") . ,variant) + (pcase variant + ((or "caps" "c") '(:mode textual :capitalize-first t)) + ((or "full" "f") '(:mode textual :ignore-et-al t)) + ((or "caps-full" "cf") '(:mode textual :ignore-et-al t :capitalize-first t)) + (_ '(:mode textual + ;; Default "nil" style. + (`(,_ . ,variant) + (pcase variant + ((or "caps" "c") '(:capitalize-first t)) + ((or "bare" "b") '(:suppress-affixes t)) + ((or "bare-caps" "bc") '(:suppress-affixes t :capitalize-first t)) + (_ nil))) + ;; This should not happen. + (_ (error "Invalid style: %S" style) (defun org-cite-csl--no-citelinks-p (info) "Non-nil when export BACKEND should not create cite-reference links."
[elpa] externals/org 01557ee 2/4: ob-R.el: Patch async evaluation when :results output
branch: externals/org commit 01557eef5758d6ce0308b27fabf0cd62e69e17af Author: Jeremie Juste Commit: Bastien ob-R.el: Patch async evaluation when :results output * lisp/ob-R.el (ob-session-async-org-babel-R-evaluate-session): Make sure that `ess-eval-visibly' is nil before evaluating the temporary buffer, but return ess-eval-visibly to it's original state afterwards. --- lisp/ob-R.el | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 299ccdf..188b9ac 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -526,8 +526,11 @@ by `org-babel-comint-async-filter'." (insert body) (insert "\n") (insert (format ob-session-async-R-indicator - "end" uuid)) +"end" uuid)) + (setq tmp ess-eval-visibly) + (setq ess-eval-visibly nil) (ess-eval-buffer nil)) + (setq ess-eval-visibly tmp) uuid (defun ob-session-async-R-value-callback (params tmp-file)
[elpa] externals/org updated (93d7825 -> b96aae4)
elpasync pushed a change to branch externals/org. from 93d7825 lisp/org.el (visual-fill-column-width): Silence compiler warning new 51a60cd lisp/ob-R: Async evaluation in R new 01557ee ob-R.el: Patch async evaluation when :results output new 72a48c3 ob-R.el: Patch async evaluation when :results output new b96aae4 oc-csl: Refactor code to help byte-compilation Summary of changes: lisp/ob-R.el | 96 +-- lisp/oc-csl.el| 82 +++- testing/lisp/test-ob-R.el | 94 ++ 3 files changed, 225 insertions(+), 47 deletions(-)
[elpa] externals/org 8130147 1/2: ox-org: Use lower case keywords
branch: externals/org commit 813014795864e3689cb931d06d9c0db0d6d172a4 Author: TEC Commit: Bastien ox-org: Use lower case keywords * lisp/ox-org.el (org-org-identity, org-org-template): As it has previously been clarified on the mailing list that upper-case keywords are only intended for the manual[1], an Org export of an Org file should use lower-case keywords. [1]: https://list.orgmode.org/87tuuw3n15@nicolasgoaziou.fr/ --- lisp/ox-org.el | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/ox-org.el b/lisp/ox-org.el index c2b8547..0c4290e 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -141,7 +141,7 @@ CONTENTS and INFO are ignored." CONTENTS is its contents, as a string or nil. INFO is ignored." (let ((case-fold-search t)) (replace-regexp-in-string - "^[ \t]*#\\+ATTR_[-_A-Za-z0-9]+:\\(?: .*\\)?\n" "" + "^[ \t]*#\\+attr_[-_a-za-z0-9]+:\\(?: .*\\)?\n" "" (org-export-expand blob contents t (defun org-org-headline (headline contents info) @@ -185,26 +185,26 @@ as a communication channel." (org-element-map (plist-get info :parse-tree) 'keyword (lambda (k) (and (string-equal (org-element-property :key k) "OPTIONS") - (concat "#+OPTIONS: " + (concat "#+options: " (org-element-property :value k) "\n")) (and (plist-get info :with-title) - (format "#+TITLE: %s\n" (org-export-data (plist-get info :title) info))) + (format "#+title: %s\n" (org-export-data (plist-get info :title) info))) (and (plist-get info :with-date) (let ((date (org-export-data (org-export-get-date info) info))) (and (org-string-nw-p date) - (format "#+DATE: %s\n" date + (format "#+date: %s\n" date (and (plist-get info :with-author) (let ((author (org-export-data (plist-get info :author) info))) (and (org-string-nw-p author) - (format "#+AUTHOR: %s\n" author + (format "#+author: %s\n" author (and (plist-get info :with-email) (let ((email (org-export-data (plist-get info :email) info))) (and (org-string-nw-p email) - (format "#+EMAIL: %s\n" email + (format "#+email: %s\n" email (and (plist-get info :with-creator) (org-string-nw-p (plist-get info :creator)) - (format "#+CREATOR: %s\n" (plist-get info :creator))) + (format "#+creator: %s\n" (plist-get info :creator))) contents)) (defun org-org-timestamp (timestamp _contents _info)
[elpa] externals/org 93d7825 2/2: lisp/org.el (visual-fill-column-width): Silence compiler warning
branch: externals/org commit 93d7825d557f4f362a5e8f8d1baff44af796abcd Author: Bastien Commit: Bastien lisp/org.el (visual-fill-column-width): Silence compiler warning * lisp/org.el (visual-fill-column-width): Silence compiler warning. --- lisp/org.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org.el b/lisp/org.el index a02a1fd..b15fcb0 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16634,6 +16634,7 @@ buffer boundaries with possible narrowing." (overlay-put ov 'keymap image-map)) (push ov org-inline-image-overlays +(defvar visual-fill-column-width) ; Silence compiler warning (defun org-display-inline-image--width (link) "Determine the display width of the image LINK, in pixels. - When `org-image-actual-width' is t, the image's pixel width is used.
[elpa] externals/org updated (9e2341b -> 93d7825)
elpasync pushed a change to branch externals/org. from 9e2341b oc-csl: Add support for the text and year citation styles new 8130147 ox-org: Use lower case keywords new 93d7825 lisp/org.el (visual-fill-column-width): Silence compiler warning Summary of changes: lisp/org.el| 1 + lisp/ox-org.el | 14 +++--- 2 files changed, 8 insertions(+), 7 deletions(-)
[elpa] elpa-admin c362980: Don't use `date` to parse date from git; it's unportable.
branch: elpa-admin commit c36298077e35d8d43f149711b92df69775740572 Author: Mattias Engdegård Commit: Mattias Engdegård Don't use `date` to parse date from git; it's unportable. BSD date doesn't work like GNU date. Do it in Lisp instead. * elpa-admin.el (elpaa--git-date-to-timestamp): New function. (elpaa--get-devel-version): Call it. --- elpa-admin.el | 40 +++- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/elpa-admin.el b/elpa-admin.el index ac72f2f..0cdff76 100644 --- a/elpa-admin.el +++ b/elpa-admin.el @@ -624,11 +624,42 @@ Return non-nil if a new tarball was created." dir 'new))) +(defun elpaa--git-date-to-timestamp (gitdate) + "Convert date from git (ISO 6401) to a timestamp." + (unless (string-match (rx bos +(group-n 1 (+ digit)) "-" +(group-n 2 (+ digit)) "-" +(group-n 3 (+ digit)) "T" +(group-n 4 (+ digit)) ":" +(group-n 5 (+ digit)) ":" +(group-n 6 (+ digit)) +(? "+" + (group-n 7 (+ digit)) ":" + (group-n 8 (+ digit +gitdate) +(error "unknown date format: %S" gitdate)) + (let* ((field + (lambda (group) +(and (match-beginning group) + (string-to-number (match-string group gitdate) + (y (funcall field 1)) + (mo (funcall field 2)) + (d (funcall field 3)) + (h (funcall field 4)) + (mi (funcall field 5)) + (s (funcall field 6)) + (zh (funcall field 7)) + (zm (funcall field 8)) + (zs (if zh + (* 60 (+ (* zh 60) zm)) + 0))) +(encode-time (list s mi h d mo y nil nil zs + (defun elpaa--get-devel-version (dir pkg-spec) "Compute the date-based pseudo-version used for devel builds." (let* ((ftn (file-truename ;; Follow symlinks! (expand-file-name (elpaa--main-file pkg-spec) dir))) -(default-directory (file-name-directory ftn)) + (default-directory (file-name-directory ftn)) (gitdate (with-temp-buffer (if (plist-get (cdr pkg-spec) :core) @@ -643,10 +674,9 @@ Return non-nil if a new tarball was created." ;; Convert Git's date into something that looks like a version number. ;; While we're at it, convert Git's date into its UTC equivalent, ;; to try and make sure time-versions are monotone. - (let ((process-environment (cons "TZ=UTC" process-environment))) -(with-temp-buffer - (elpaa--call t "date" "-d" gitdate "+%Y%m%d.%H%M%S") - (buffer-string) + (format-time-string "%Y%m%d.%H%M%S" + (elpaa--git-date-to-timestamp gitdate) + 0))) ;; Get rid of leading zeros since ELPA's version numbers don't allow them. (replace-regexp-in-string "\\(\\`\\|[^0-9]\\)0+\\([0-9]\\)" "\\1\\2" ;; Remove trailing newline or anything untoward.
[elpa] externals/org 9e2341b: oc-csl: Add support for the text and year citation styles
branch: externals/org commit 9e2341bc65e446be37108c84b349f4aef6df78df Author: András Simonyi Commit: Bastien oc-csl: Add support for the text and year citation styles * lisp/oc-csl.el (org-cite-csl--create-structure-params): Introduce this new function to map the extended list of supported citation styles and variants to the corresponding citeproc-el citation structure creation parameters. (org-cite-csl--no-affixes-p, org-cite-csl--capitalize-p, org-cite-csl--no-author-p): Remove them since their functionality is provided now by `org-cite-csl--create-structure-params'. (org-cite-csl--parse-reference): Don't generate `suppress-author' cite information as that is treated now by citeproc-el as a citation style. (org-cite-csl--create-structure): Use `org-cite-csl--create-structure-params' to generate style-dependent citation structure parameters. --- lisp/oc-csl.el | 95 +++--- 1 file changed, 64 insertions(+), 31 deletions(-) diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el index 645b1c0..51d3d3d 100644 --- a/lisp/oc-csl.el +++ b/lisp/oc-csl.el @@ -54,7 +54,10 @@ ;; The library supports the following citation styles: ;; +;; - author (a), including caps (c), full (f), and caps-full (cf) variants, ;; - noauthor (na), including bare (b), caps (c) and bare-caps (bc) variants, +;; - year (y), including a bare (b) variant, +;; - text (t). including caps (c), full (f), and caps-full (cf) variants, ;; - default style, including bare (b), caps (c) and bare-caps (bc) variants. ;; CSL styles recognize "locator" in citation references' suffix. For example, @@ -277,26 +280,54 @@ INFO is the export state, as a property list." (citeproc-proc-style (org-cite-csl--processor info -(defun org-cite-csl--no-affixes-p (citation info) - "Non-nil when CITATION should be exported without affix. -INFO is the export data, as a property list." - (pcase (org-cite-citation-style citation info) -(`(,(or "noauthor" "na" `nil) . ,(or "bare" "b" "bare-caps" "bc")) t) -(_ nil))) - -(defun org-cite-csl--capitalize-p (citation info) - "Non-nil when CITATION should be capitalized. -INFO is the export-data, as a property list." - (pcase (org-cite-citation-style citation info) -(`(,(or "noauthor" "na" `nil) . ,(or "caps" "c" "bare-caps" "bc")) t) -(_ nil))) - -(defun org-cite-csl--no-author-p (reference info) - "Non-nil when citation REFERENCE should be exported without author. -INFO is the export data, as a property list." - (pcase (org-cite-citation-style (org-element-property :parent reference) info) -(`(,(or "noauthor" "na") . ,_) t) -(_ nil))) +(defun org-cite-csl--create-structure-params (citation info) + "Return citeproc structure creation params for CITATION object. +STYLE is the citation style, as a string or nil. INFO is the export state, as +a property list." + (let* ((style (org-cite-citation-style citation info))) + (pcase style + ;; "author" style. + (`(,(or "author" "a") . ,(or "caps" "c")) + '(:mode author-only :capitalize-first t :suppress-affixes t)) + (`(,(or "author" "a") . ,(or "full" "f")) + '(:mode author-only :ignore-et-al t :suppress-affixes t)) + (`(,(or "author" "a") . ,(or "caps-full" "cf")) + '(:mode author-only :capitalize-first t :ignore-et-al t :suppress-affixes t)) + (`(,(or "author" "a") . ,_) + '(:mode author-only :suppress-affixes t)) + ;; "noauthor" style. + (`(,(or "noauthor" "na") . ,(or "bare" "b")) + '(:mode suppress-author :suppress-affixes t)) + (`(,(or "noauthor" "na") . ,(or "caps" "c")) + '(:mode suppress-author :capitalize-first t)) + (`(,(or "noauthor" "na") . ,(or "bare-caps" "bc")) + '(:mode suppress-author :suppress-affixes t :capitalize-first t)) + (`(,(or "noauthor" "na") . ,_) + '(:mode suppress-author)) + ;; "year" style. + (`(,(or "year" "y") . ,(or "bare" "b")) + '(:mode year-only :suppress-affixes t)) + (`(,(or "year" "y") . ,_) + '(:mode year-only)) + ;; "text" style. + (`(,(or "text" "t") . ,(or "caps" "c")) + '(:mode textual :capitalize-first t)) + (`(,(or "text" "t") . ,(or "full" "f")) + '(:mode textual :ignore-et-al t)) + (`(,(or "text" "t") . ,(or "caps-full" "cf")) + '(:mode textual :ignore-et-al t :capitalize-first t)) + (`(,(or "text" "t") . ,_) + '(:mode textual)) + ;; Default "nil" style. + (`(,_ . ,(or "bare" "b")) + '(:suppress-affixes t)) + (`(,_ . ,(or "caps" "c")) + '(:capitalize-first t)) + (`(,_ . ,(or "bare-caps" "bc")) + '(:suppress-affixes t :capitalize-first t)) + (`(,_ . ,_) nil) + ;; This should not happen. + (_ (error "Invalid style: %S" style) (defun org-cite-csl--no-citelinks-p (info) "Non-nil when export BACKEND should not create cite-reference links." @@ -375,8 +406,8 @@ property in INFO." INFO is the
[nongnu] elpa/magit-section updated (9a865f1 -> f53148a)
elpasync pushed a change to branch elpa/magit-section. from 9a865f1 magit-version: Yet another change adds f53148a magit-unstage-all: Don't prompt if there is nothing to unstage No new revisions were added by this update. Summary of changes: lisp/magit-apply.el | 2 ++ 1 file changed, 2 insertions(+)
[nongnu] elpa/magit updated (9a865f1 -> f53148a)
elpasync pushed a change to branch elpa/magit. from 9a865f1 magit-version: Yet another change adds f53148a magit-unstage-all: Don't prompt if there is nothing to unstage No new revisions were added by this update. Summary of changes: lisp/magit-apply.el | 2 ++ 1 file changed, 2 insertions(+)
[nongnu] elpa/git-commit f53148a: magit-unstage-all: Don't prompt if there is nothing to unstage
branch: elpa/git-commit commit f53148a569191bdbfb78d76f28481b91c60cb846 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-unstage-all: Don't prompt if there is nothing to unstage Instead error out. Closes #4513. --- lisp/magit-apply.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el index fcd7792..4e7ee00 100644 --- a/lisp/magit-apply.el +++ b/lisp/magit-apply.el @@ -449,6 +449,8 @@ without requiring confirmation." (defun magit-unstage-all () "Remove all changes from the staging area." (interactive) + (unless (magit-anything-staged-p) +(user-error "Nothing to unstage")) (when (or (magit-anything-unstaged-p) (magit-untracked-files)) (magit-confirm 'unstage-all-changes))
[elpa] externals/counsel 90783f5: Merge branch 'master' into externals/counsel
branch: externals/counsel commit 90783f545705344aae4fdc6e8d207c0ef3564711 Merge: 2b2dd09 5f49149 Author: Basil L. Contovounesios Commit: Basil L. Contovounesios Merge branch 'master' into externals/counsel --- counsel.el | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/counsel.el b/counsel.el index 43bc998..8c1f381 100644 --- a/counsel.el +++ b/counsel.el @@ -3101,7 +3101,9 @@ prompt additionally for EXTRA-AG-ARGS." :exit-codes '(1 "No matches found")) (defun counsel-read-directory-name (prompt default) - "Read a directory name from user, a (partial) replacement of `read-directory-name'." + "Read a directory name. +This is intended as a (partial) replacement for +`read-directory-name'." (let ((counsel--find-file-predicate #'file-directory-p)) (ivy-read prompt #'read-file-name-internal @@ -5639,8 +5641,9 @@ value of a macro, using them for a new macro." (defun counsel--kmacro-candidates () "Create the list of keyboard macros used by `counsel-kmacro'. -This is a combination of `kmacro-ring' and, together in a list, `last-kbd-macro', -`kmacro-counter-format-start', and `kmacro-counter-value-start'." +This is a combination of `kmacro-ring' and, together in a list, +`last-kbd-macro', `kmacro-counter-format-start', and +`kmacro-counter-value-start'." (mapcar (lambda (kmacro) (cons @@ -5701,7 +5704,10 @@ to 0." (kmacro-set-counter number))) (defun counsel-kmacro-action-copy-counter-format-for-new-macro (x) - "Set `kmacro-default-counter-format' to an existing keyboard macro's counter format. + "Set the default keyboard macro counter format. +This sets `kmacro-default-counter-format' to the counter format +of an existing keyboard macro. + This will apply to the next macro a user defines." (let* ((actual-kmacro (cdr x)) (format (nth 2 actual-kmacro)))
[elpa] externals/counsel updated (2b2dd09 -> 90783f5)
blc pushed a change to branch externals/counsel. from 2b2dd09 Merge branch 'master' into externals/counsel adds 4de30b0 Expand result of read-directory-name adds 5f49149 Pacify Emacs 28 wide docstring warnings new 90783f5 Merge branch 'master' into externals/counsel Summary of changes: counsel.el | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-)
[elpa] externals/ivy a79ab91 2/2: Merge branch 'master' into externals/ivy
branch: externals/ivy commit a79ab912737af3124331ceb40f235dee738ed630 Merge: 80473bf 5f49149 Author: Basil L. Contovounesios Commit: Basil L. Contovounesios Merge branch 'master' into externals/ivy --- ivy.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ivy.el b/ivy.el index 851d272..33cf95d 100644 --- a/ivy.el +++ b/ivy.el @@ -784,10 +784,11 @@ key (a string), cmd and doc (a string)." "\n"))) (defun ivy-read-action-format-columns (actions) - "Create a docstring from ACTIONS, using several columns if needed to preserve `ivy-height'. + "Create a potentially multi-column docstring from ACTIONS. +Several columns are used as needed to preserve `ivy-height'. -ACTIONS is a list. Each list item is a list of 3 items: key (a -string), cmd and doc (a string)." +ACTIONS is a list with elements of the form (KEY COMMAND DOC), +where KEY and DOC are strings." (let ((length (length actions)) (i 0) (max-rows (- ivy-height 1))
[elpa] externals/ivy 5f49149 1/2: Pacify Emacs 28 wide docstring warnings
branch: externals/ivy commit 5f49149073be755212b3e32853eeb3f4d0f972e6 Author: Basil L. Contovounesios Commit: Basil L. Contovounesios Pacify Emacs 28 wide docstring warnings * counsel.el (counsel-read-directory-name) (counsel--kmacro-candidates) (counsel-kmacro-action-copy-counter-format-for-new-macro): * ivy.el (ivy-read-action-format-columns): Refill and reword wide docstrings. --- counsel.el | 14 ++ ivy.el | 7 --- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/counsel.el b/counsel.el index 43bc998..8c1f381 100644 --- a/counsel.el +++ b/counsel.el @@ -3101,7 +3101,9 @@ prompt additionally for EXTRA-AG-ARGS." :exit-codes '(1 "No matches found")) (defun counsel-read-directory-name (prompt default) - "Read a directory name from user, a (partial) replacement of `read-directory-name'." + "Read a directory name. +This is intended as a (partial) replacement for +`read-directory-name'." (let ((counsel--find-file-predicate #'file-directory-p)) (ivy-read prompt #'read-file-name-internal @@ -5639,8 +5641,9 @@ value of a macro, using them for a new macro." (defun counsel--kmacro-candidates () "Create the list of keyboard macros used by `counsel-kmacro'. -This is a combination of `kmacro-ring' and, together in a list, `last-kbd-macro', -`kmacro-counter-format-start', and `kmacro-counter-value-start'." +This is a combination of `kmacro-ring' and, together in a list, +`last-kbd-macro', `kmacro-counter-format-start', and +`kmacro-counter-value-start'." (mapcar (lambda (kmacro) (cons @@ -5701,7 +5704,10 @@ to 0." (kmacro-set-counter number))) (defun counsel-kmacro-action-copy-counter-format-for-new-macro (x) - "Set `kmacro-default-counter-format' to an existing keyboard macro's counter format. + "Set the default keyboard macro counter format. +This sets `kmacro-default-counter-format' to the counter format +of an existing keyboard macro. + This will apply to the next macro a user defines." (let* ((actual-kmacro (cdr x)) (format (nth 2 actual-kmacro))) diff --git a/ivy.el b/ivy.el index 851d272..33cf95d 100644 --- a/ivy.el +++ b/ivy.el @@ -784,10 +784,11 @@ key (a string), cmd and doc (a string)." "\n"))) (defun ivy-read-action-format-columns (actions) - "Create a docstring from ACTIONS, using several columns if needed to preserve `ivy-height'. + "Create a potentially multi-column docstring from ACTIONS. +Several columns are used as needed to preserve `ivy-height'. -ACTIONS is a list. Each list item is a list of 3 items: key (a -string), cmd and doc (a string)." +ACTIONS is a list with elements of the form (KEY COMMAND DOC), +where KEY and DOC are strings." (let ((length (length actions)) (i 0) (max-rows (- ivy-height 1))
