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

lisp/ob-core.el

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

lisp/org-element.el

@@ -648,7 +648,7 @@ IMPORTANT: The buffer copy may also have variable `buffer-file-name'
 copied.
 
 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
 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

lisp/org-macs.el

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

lisp/org.el

@@ -20749,7 +20749,7 @@ it has a `diary' type."
     (yank-media-handler "image/.*" #'org--image-yank-media-handler)
     ;; Looks like different DEs go for different handler names,
     ;; 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))
   (when (boundp 'x-dnd-direct-save-function)
     (setq-local x-dnd-direct-save-function #'org--dnd-xds-function)))

lisp/ox.el

@@ -185,7 +185,7 @@ All these properties should be backend agnostic.  Backend
 specific properties are set through `org-export-define-backend'.
 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-bold . org-export-filter-bold-functions)
     (:filter-babel-call . org-export-filter-babel-call-functions)