Update to Org 9.7.7-2-gf308d3

This commit is contained in:
Kyle Meyer 2024-07-14 12:30:50 -04:00
parent 33ba72f52f
commit 5ec73eca57
7 changed files with 30 additions and 17 deletions

View file

@ -271,6 +271,10 @@ Image filename chosen can be customized by setting
~org-yank-image-file-name-function~ which by default autogenerates a ~org-yank-image-file-name-function~ which by default autogenerates a
filename based on the current time. filename based on the current time.
Note that ~yank-media~, as of Emacs 30, does not yet support Windows
(Emacs bug#71909) and may not be always reliable on Mac (Emacs
bug#71731).
*** Files and images can be attached by dropping onto Emacs *** Files and images can be attached by dropping onto Emacs
By default, Org asks the user what to do with the dropped file like By default, Org asks the user what to do with the dropped file like

View file

@ -1,5 +1,5 @@
% Reference Card for Org Mode % Reference Card for Org Mode
\def\orgversionnumber{9.7.5} \def\orgversionnumber{9.7.7}
\def\versionyear{2024} % latest update \def\versionyear{2024} % latest update
\input emacsver.tex \input emacsver.tex

View file

@ -2455,8 +2455,8 @@ the inline source block. The macro is stripped upon export.
Multiline and non-scalar RESULTS from inline source blocks are Multiline and non-scalar RESULTS from inline source blocks are
not allowed. When EXEC-TIME is provided it may be included in a not allowed. When EXEC-TIME is provided it may be included in a
generated message. With optional argument RESULT-PARAMS controls generated message. With optional argument RESULT-PARAMS controls
insertion of results in the Org mode file. RESULT-PARAMS can insertion of results in the Org mode file. RESULT-PARAMS is a list
take the following values: that can contain the following values:
replace - (default option) insert results after the source block replace - (default option) insert results after the source block
or inline source block replacing any previously or inline source block replacing any previously
@ -2515,15 +2515,17 @@ list ---- the results are rendered as a list. This option not
table --- the results are rendered as a table. This option not table --- the results are rendered as a table. This option not
allowed for inline source blocks. allowed for inline source blocks.
INFO may provide the values of these header arguments (in the INFO is the src block info, as returned by
`header-arguments-alist' see the docstring for `org-babel-get-src-block-info' (which see). Some values from its
`org-babel-get-src-block-info'): PARAMETERS part (header argument alist) can affect the inserted
result:
:file --- the name of the file to which output should be written. :file-desc - when RESULT-PARAMS contains \"file\", use it as
description of the inserted link.
:wrap --- the effect is similar to `latex' in RESULT-PARAMS but :wrap the effect is similar to `latex' in RESULT-PARAMS but
using the argument supplied to specify the export block using the argument supplied to specify the export block
or snippet type." or snippet type."
(cond ((stringp result) (cond ((stringp result)
(setq result (substring-no-properties result)) (setq result (substring-no-properties result))
(when (member "file" result-params) (when (member "file" result-params)

View file

@ -2048,6 +2048,9 @@ the normal rules apply."
(defcustom org-agenda-category-icon-alist nil (defcustom org-agenda-category-icon-alist nil
"Alist of category icon to be displayed in agenda views. "Alist of category icon to be displayed in agenda views.
The icons are displayed in place of the %i placeholders in
`org-agenda-prefix-format', which see.
Each entry should have the following format: Each entry should have the following format:
(CATEGORY-REGEXP FILE-OR-DATA TYPE DATA-P PROPS) (CATEGORY-REGEXP FILE-OR-DATA TYPE DATA-P PROPS)

View file

@ -670,8 +670,8 @@ When INNER is non-nil, do not try to match as list of containers."
;; `secure-hash' may trigger interactive dialog when it ;; `secure-hash' may trigger interactive dialog when it
;; cannot determine the coding system automatically. ;; cannot determine the coding system automatically.
;; Force coding system that works reliably for any text ;; Force coding system that works reliably for any text
;; to avoid it. The has will be consistent anyway, as ;; to avoid it. The hash will be consistent, as long
;; long as we use the same coding system. ;; as we use the same coding system.
(let ((coding-system-for-write 'emacs-internal)) (let ((coding-system-for-write 'emacs-internal))
(secure-hash 'md5 associated))) (secure-hash 'md5 associated)))
(puthash associated (puthash associated

View file

@ -5,13 +5,13 @@
(defun org-release () (defun org-release ()
"The release version of Org. "The release version of Org.
Inserted by installing Org mode or when a release is made." Inserted by installing Org mode or when a release is made."
(let ((org-release "9.7.5")) (let ((org-release "9.7.7"))
org-release)) org-release))
;;;###autoload ;;;###autoload
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." Inserted by installing Org or when a release is made."
(let ((org-git-version "release_9.7.5-9-ga091ca")) (let ((org-git-version "release_9.7.7-2-gf308d3"))
org-git-version)) org-git-version))
(provide 'org-version) (provide 'org-version)

View file

@ -9,7 +9,7 @@
;; URL: https://orgmode.org ;; URL: https://orgmode.org
;; Package-Requires: ((emacs "26.1")) ;; Package-Requires: ((emacs "26.1"))
;; Version: 9.7.5 ;; Version: 9.7.7
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
;; ;;
@ -6698,7 +6698,7 @@ The prefix argument ARG is passed to `org-insert-heading'.
Unlike `org-insert-heading', when point is at the beginning of a Unlike `org-insert-heading', when point is at the beginning of a
heading, still insert the new sub-heading below." heading, still insert the new sub-heading below."
(interactive "P") (interactive "P")
(when (bolp) (forward-char)) (when (and (bolp) (not (eobp)) (not (eolp))) (forward-char))
(org-insert-heading arg) (org-insert-heading arg)
(cond (cond
((org-at-heading-p) (org-do-demote)) ((org-at-heading-p) (org-do-demote))
@ -19809,7 +19809,11 @@ Also align node properties according to `org-property-format'."
(+ (org-current-text-indentation) (+ (org-current-text-indentation)
org-edit-src-content-indentation))))) org-edit-src-content-indentation)))))
(ignore-errors ; do not err when there is no proper major mode (ignore-errors ; do not err when there is no proper major mode
(org-babel-do-in-edit-buffer (funcall indent-line-function))) ;; It is important to call `indent-according-to-mode'
;; rather than `indent-line-function' here or we may
;; sometimes break `electric-indent-mode'
;; https://orgmode.org/list/5O9VMGb6WRaqeHR5_NXTb832Z2Lek_5L40YPDA52-S3kPwGYJspI8kLWaGtuq3DXyhtHpj1J7jTIXb39RX9BtCa2ecrWHjijZqI8QAD742U=@proton.me
(org-babel-do-in-edit-buffer (indent-according-to-mode)))
(when (and block-content-ind (looking-at-p "^$")) (when (and block-content-ind (looking-at-p "^$"))
(indent-line-to block-content-ind)))) (indent-line-to block-content-ind))))
(t (t