Backport commit 331573e40 from Emacs

* lisp/org-element.el (org-element-copy-buffer):
Repair incorrect escaping.
* lisp/org-macs.el (org--line-empty-p): Fix broken skip-set.
* lisp/org.el (org-setup-yank-dnd-handlers): Fix broken regexp.

Org: fix mistakes in regexp, skip set and doc string
331573e40731d6635acd366694493c26b480c230
Mattias Engdegård
Mon Jun 10 14:07:07 2024 +0200
This commit is contained in:
Mattias Engdegård 2024-06-10 13:59:31 +02:00 committed by Kyle Meyer
parent ce350490ca
commit 6eab01c580
3 changed files with 3 additions and 3 deletions

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

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 ()

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)))