From: Kyle Meyer Date: Mon, 6 Nov 2023 02:46:42 +0000 (-0500) Subject: Update to Org 9.6.11 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5bdc61bc0efc704c85b78f36f5f7e5f6c42bb877;p=emacs.git Update to Org 9.6.11 --- diff --git a/doc/misc/org.org b/doc/misc/org.org index d8bbcb4d0c5..9f6cda17da0 100644 --- a/doc/misc/org.org +++ b/doc/misc/org.org @@ -20266,12 +20266,12 @@ packages are documented here. #+vindex: org-table-formula-constants Org can use names for constants in formulas in tables. Org can also - use calculation suffixes for units, such as =M= for =Mega=. For - a standard collection of such constants, install the =constants= + use calculation suffixes for units, such as =M= for =Mega=. For a + standard collection of such constants, install the =constants= package. Install version 2.0 of this package, available at - [[http://www.astro.uva.nl/~dominik/Tools]]. Org checks if the function - ~constants-get~ has been autoloaded. Installation instructions are - in the file =constants.el=. + [[https://github.com/cdominik/constants-for-Emacs]]. Org checks if the + function ~constants-get~ has been autoloaded. Installation + instructions are in the file =constants.el=. - =cdlatex.el= by Carsten Dominik :: #+cindex: @file{cdlatex.el} diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 240e3366b0b..4b73a544e80 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{9.6.10} +\def\orgversionnumber{9.6.11} \def\versionyear{2023} % latest update \input emacsver.tex diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el index e69ce4f1d12..2df3396ee72 100644 --- a/lisp/org/ob-core.el +++ b/lisp/org/ob-core.el @@ -1932,12 +1932,12 @@ buffer or nil if no such result exists." (defun org-babel-result-names (&optional file) "Return the names of results in FILE or the current buffer." - (save-excursion - (when file (find-file file)) (goto-char (point-min)) - (let ((case-fold-search t) names) + (with-current-buffer (if file (find-file-noselect file) (current-buffer)) + (org-with-point-at 1 + (let ((case-fold-search t) names) (while (re-search-forward org-babel-result-w-name-regexp nil t) (setq names (cons (match-string-no-properties 9) names))) - names))) + names)))) ;;;###autoload (defun org-babel-next-src-block (&optional arg) @@ -2358,7 +2358,7 @@ INFO may provide the values of these header arguments (in the using the argument supplied to specify the export block or snippet type." (cond ((stringp result) - (setq result (org-no-properties result)) + (setq result (substring-no-properties result)) (when (member "file" result-params) (setq result (org-babel-result-to-file diff --git a/lisp/org/ob-shell.el b/lisp/org/ob-shell.el index 2c30a26056b..87e38e414ce 100644 --- a/lisp/org/ob-shell.el +++ b/lisp/org/ob-shell.el @@ -166,6 +166,11 @@ This function is called by `org-babel-execute-src-block'." "Return a list of statements declaring the values as a generic variable." (format "%s=%s" varname (org-babel-sh-var-to-sh values sep hline))) +(defun org-babel--variable-assignments:fish + (varname values &optional sep hline) + "Return a list of statements declaring the values as a fish variable." + (format "set %s %s" varname (org-babel-sh-var-to-sh values sep hline))) + (defun org-babel--variable-assignments:bash_array (varname values &optional sep hline) "Return a list of statements declaring the values as a bash array." @@ -211,8 +216,11 @@ This function is called by `org-babel-execute-src-block'." (if (string-suffix-p "bash" shell-file-name) (org-babel--variable-assignments:bash (car pair) (cdr pair) sep hline) - (org-babel--variable-assignments:sh-generic - (car pair) (cdr pair) sep hline))) + (if (string-suffix-p "fish" shell-file-name) + (org-babel--variable-assignments:fish + (car pair) (cdr pair) sep hline) + (org-babel--variable-assignments:sh-generic + (car pair) (cdr pair) sep hline)))) (org-babel--get-vars params)))) (defun org-babel-sh-var-to-sh (var &optional sep hline) diff --git a/lisp/org/ol-info.el b/lisp/org/ol-info.el index ad9e4a12bd7..350ccf5cc57 100644 --- a/lisp/org/ol-info.el +++ b/lisp/org/ol-info.el @@ -129,13 +129,13 @@ If LINK is not an info link then DESC is returned." (defconst org-info-emacs-documents '("ada-mode" "auth" "autotype" "bovine" "calc" "ccmode" "cl" "dbus" "dired-x" - "ebrowse" "ede" "ediff" "edt" "efaq-w32" "efaq" "eieio" "eintr" "elisp" - "emacs-gnutls" "emacs-mime" "emacs" "epa" "erc" "ert" "eshell" "eudc" "eww" - "flymake" "forms" "gnus" "htmlfontify" "idlwave" "ido" "info" "mairix-el" - "message" "mh-e" "newsticker" "nxml-mode" "octave-mode" "org" "pcl-cvs" - "pgg" "rcirc" "reftex" "remember" "sasl" "sc" "semantic" "ses" "sieve" - "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" - "widget" "wisent" "woman") + "ebrowse" "ede" "ediff" "edt" "efaq-w32" "efaq" "eglot" "eieio" "eintr" + "elisp" "emacs-gnutls" "emacs-mime" "emacs" "epa" "erc" "ert" "eshell" + "eudc" "eww" "flymake" "forms" "gnus" "htmlfontify" "idlwave" "ido" "info" + "mairix-el" "message" "mh-e" "modus-themes" "newsticker" "nxml-mode" "octave-mode" + "org" "pcl-cvs" "pgg" "rcirc" "reftex" "remember" "sasl" "sc" "semantic" + "ses" "sieve" "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "transient" + "url" "use-package" "vhdl-mode" "vip" "viper" "vtable" "widget" "wisent" "woman") "List of Emacs documents available. Taken from ") diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 38e81d9d713..670116304e6 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -6321,6 +6321,11 @@ specification like [h]h:mm." (org-element-cache-map (lambda (el) (when (and (org-element-property :deadline el) + ;; Only consider active timestamp values. + (memq (org-element-property + :type + (org-element-property :deadline el)) + '(diary active active-range)) (or (not with-hour) (org-element-property :hour-start @@ -6662,6 +6667,11 @@ scheduled items with an hour specification like [h]h:mm." (org-element-cache-map (lambda (el) (when (and (org-element-property :scheduled el) + ;; Only consider active timestamp values. + (memq (org-element-property + :type + (org-element-property :scheduled el)) + '(diary active active-range)) (or (not with-hour) (org-element-property :hour-start diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index cfef38581c6..e5b0fbcf2a9 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of Org. Inserted by installing Org mode or when a release is made." - (let ((org-release "9.6.10")) + (let ((org-release "9.6.11")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.6.10")) + (let ((org-git-version "release_9.6.11")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 0ba0cef4490..863a9e093f5 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; URL: https://orgmode.org ;; Package-Requires: ((emacs "26.1")) -;; Version: 9.6.10 +;; Version: 9.6.11 ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 94cc5a22881..e9cc0ed8fc7 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -264,13 +264,17 @@ See `org-export-inline-image-p' for more information about rules.") (defconst org-export-ignored-local-variables - '( org-font-lock-keywords org-element--cache-change-tic - org-element--cache-change-tic org-element--cache-size - org-element--headline-cache-size - org-element--cache-sync-keys-value - org-element--cache-change-warning org-element--headline-cache - org-element--cache org-element--cache-sync-keys - org-element--cache-sync-requests org-element--cache-sync-timer) + '( org-font-lock-keywords + org-element--cache org-element--cache-size + org-element--headline-cache org-element--headline-cache-size + org-element--cache-hash-left org-element--cache-hash-right + org-element--cache-sync-requests org-element--cache-sync-timer + org-element--cache-sync-keys-value org-element--cache-change-tic + org-element--cache-last-buffer-size + org-element--cache-diagnostics-ring + org-element--cache-diagnostics-ring-size + org-element--cache-gapless + org-element--cache-change-warning) "List of variables not copied through upon buffer duplication. Export process takes place on a copy of the original buffer. When this copy is created, all Org related local variables not in @@ -6691,6 +6695,11 @@ or FILE." ',ext-plist))) (with-temp-buffer (insert output) + ;; Ensure final newline. This is what was done + ;; historically, when we used `write-file'. + ;; Note that adding a newline is only safe for + ;; non-binary data. + (unless (bolp) (insert "\n")) (let ((coding-system-for-write ',encoding)) (write-region (point-min) (point-max) ,file))) (or (ignore-errors (funcall ',post-process ,file)) ,file))) @@ -6698,6 +6707,11 @@ or FILE." backend subtreep visible-only body-only ext-plist))) (with-temp-buffer (insert output) + ;; Ensure final newline. This is what was done + ;; historically, when we used `write-file'. + ;; Note that adding a newline is only safe for + ;; non-binary data. + (unless (bolp) (insert "\n")) (let ((coding-system-for-write encoding)) (write-region (point-min) (point-max) file))) (when (and (org-export--copy-to-kill-ring-p) (org-string-nw-p output))