mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'km/from-emacs-master' into bugfix

This commit is contained in:
Kyle Meyer 2024-06-10 18:34:04 -04:00
parent 4d4d59874c 008e6030ac
commit 9419dad48a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ob-core.el
View File

@ -909,7 +909,7 @@ guess will be made."
;; insert a link to `:file'. ;; insert a link to `:file'.
(when (and result (when (and result
(not (or (member "link" result-params) (not (or (member "link" result-params)
(member "graphics" result-params)))) (member "graphics" result-params))))
(with-temp-file file (with-temp-file file
(insert (org-babel-format-result (insert (org-babel-format-result
result result

2
lisp/org-element.el
View File

@ -648,7 +648,7 @@ IMPORTANT: The buffer copy may also have variable `buffer-file-name'
copied. copied.
To prevent Emacs overwriting the original buffer file, To prevent Emacs overwriting the original buffer file,
`write-contents-functions' is set to \='(always). Do not alter this `write-contents-functions' is set to \\='(always). Do not alter this
variable and do not do anything that might alter it (like calling a variable and do not do anything that might alter it (like calling a
major mode) to prevent data corruption. Also, do note that Emacs may major mode) to prevent data corruption. Also, do note that Emacs may
jump into the created buffer if the original file buffer is closed and jump into the created buffer if the original file buffer is closed and

2
lisp/org-macs.el
View File

@ -815,7 +815,7 @@ Match at beginning of line when WITH-BOL is non-nil."
(and (not (bobp)) (and (not (bobp))
(save-excursion (save-excursion
(forward-line n) (forward-line n)
(skip-chars-forward "[ \t]") (skip-chars-forward " \t")
(eolp)))) (eolp))))
(defun org-previous-line-empty-p () (defun org-previous-line-empty-p ()

2
lisp/org.el
View File

@ -20749,7 +20749,7 @@ it has a `diary' type."
(yank-media-handler "image/.*" #'org--image-yank-media-handler) (yank-media-handler "image/.*" #'org--image-yank-media-handler)
;; Looks like different DEs go for different handler names, ;; Looks like different DEs go for different handler names,
;; https://larsee.com/blog/2019/05/clipboard-files/. ;; https://larsee.com/blog/2019/05/clipboard-files/.
(yank-media-handler "x/special-\\(?:gnome\|KDE\|mate\\)-files" (yank-media-handler "x/special-\\(?:gnome\\|KDE\\|mate\\)-files"
#'org--copied-files-yank-media-handler)) #'org--copied-files-yank-media-handler))
(when (boundp 'x-dnd-direct-save-function) (when (boundp 'x-dnd-direct-save-function)
(setq-local x-dnd-direct-save-function #'org--dnd-xds-function))) (setq-local x-dnd-direct-save-function #'org--dnd-xds-function)))

2
lisp/ox.el
View File

@ -185,7 +185,7 @@ All these properties should be backend agnostic. Backend
specific properties are set through `org-export-define-backend'. specific properties are set through `org-export-define-backend'.
Properties redefined there have precedence over these.") Properties redefined there have precedence over these.")
(defconst org-export-filters-alist (defvar org-export-filters-alist
'((:filter-body . org-export-filter-body-functions) '((:filter-body . org-export-filter-body-functions)
(:filter-bold . org-export-filter-bold-functions) (:filter-bold . org-export-filter-bold-functions)
(:filter-babel-call . org-export-filter-babel-call-functions) (:filter-babel-call . org-export-filter-babel-call-functions)