Update to Org 9.6.4-9-g8eb209

diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 4ee091118e4d7b763cbea24cfb69f1326bb57e18..f2cc069aa5e3d86bc5f3b5292620df409db57b63 100644 (file)
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -36,7 +36,7 @@
 (require 'ob)
 
 (declare-function orgtbl-to-tsv "org-table" (table params))
-(declare-function R "ext:essd-r" (&optional start-args))
+(declare-function run-ess-r "ext:ess-r-mode" (&optional start-args))
 (declare-function inferior-ess-send-input "ext:ess-inf" ())
 (declare-function ess-make-buffer-current "ext:ess-inf" ())
 (declare-function ess-eval-buffer "ext:ess-inf" (vis))
@@ -276,7 +276,8 @@ This function is called by `org-babel-execute-src-block'."
          (when (get-buffer session)
            ;; Session buffer exists, but with dead process
            (set-buffer session))
-         (require 'ess) (R)
+          (require 'ess-r-mode)
+          (set-buffer (run-ess-r))
          (let ((R-proc (get-process (or ess-local-process-name
                                         ess-current-process-name))))
            (while (process-get R-proc 'callbacks)

diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index 910c116866724712c64942cda2f7a3726dca9a53..de7ea91317f63d01ab98de414e883ce3ea85f552 100644 (file)
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -69,7 +69,10 @@
   :safe #'stringp)
 
 (defvar org-babel-js-function-wrapper
-  "require('process').stdout.write(require('util').inspect(function(){%s}()));"
+  ;; Note that newline after %s - it makes sure that closing
+  ;; parenthesis are not shadowed if the last line of the body is a
+  ;; line comment.
+  "require('process').stdout.write(require('util').inspect(function(){%s\n}()));"
   "Javascript code to print value of body.")
 
 (defun org-babel-execute:js (body params)

diff --git a/lisp/org/oc.el b/lisp/org/oc.el
index 260a4d3e1a799b359d0e7d039f619ca5d708fec4..8a7b662098a0be9ed6da6196a9126fcc916727aa 100644 (file)
--- a/lisp/org/oc.el
+++ b/lisp/org/oc.el
@@ -1232,7 +1232,9 @@ from the processor set in `org-cite-activate-processor'."
       (let ((cite (org-with-point-at (match-beginning 0)
                     (org-element-citation-parser))))
         (when cite
-          (funcall activate cite)
+          ;; Do not alter match data as font-lock expects us to set it
+          ;; appropriately.
+          (save-match-data (funcall activate cite))
           ;; Move after cite object and make sure to return
           ;; a non-nil value.
           (goto-char (org-element-property :end cite)))))))

diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index aef05bc6ee6bc1fed0fea350e3b73cac1d8bbd42..b8e026553b3cdb83bcb993534110e022a09e63ed 100644 (file)
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -36,7 +36,7 @@
 
 ;;; Org version verification.
 
-(defconst org--built-in-p nil
+(defvar org--inhibit-version-check nil
   "When non-nil, assume that Org is a part of Emacs source.
 For internal use only.  See Emacs bug #62762.
 This variable is only supposed to be changed by Emacs build scripts.")
@@ -49,7 +49,7 @@ This variable is only supposed to be changed by Emacs build scripts.")
   ;; `org-assert-version' calls would fail using strict
   ;; `org-git-version' check because the generated Org version strings
   ;; will not match.
-  `(unless (or org--built-in-p (equal (org-release) ,(org-release)))
+  `(unless (or org--inhibit-version-check (equal (org-release) ,(org-release)))
      (warn "Org version mismatch.  Org loading aborted.
 This warning usually appears when a built-in Org version is loaded
 prior to the more recent Org version.

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 15e4a50877a204760b0ab997ec27a8bb557a626e..b82e915ecd1fbb3be43c6929ff8a837cb6efa984 100644 (file)
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
 (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.4-2-g0f6ae7"))
+   (let ((org-git-version "release_9.6.4-9-g8eb209"))
      org-git-version))
 \f
 (provide 'org-version)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index f7c2b6d16d18a150cc83987d2bd7f7b01a8cac63..61862b3d63b3a9170b49d8af4335ed440d224a4b 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -3483,13 +3483,17 @@ Make sure that you only list packages here which:
   :group 'org-export-latex
   :set 'org-set-packages-alist
   :get 'org-get-packages-alist
-  :type '(repeat
-         (choice
-          (list :tag "options/package pair"
-                (string :tag "options")
-                (string :tag "package")
-                (boolean :tag "Snippet"))
-          (string :tag "A line of LaTeX"))))
+  :type
+  '(repeat
+    (choice
+     (list :tag "options/package pair"
+           (string :tag "options")
+           (string :tag "package")
+           (boolean :tag "snippet")
+           (choice
+            (const :tag "All compilers include this package" nil)
+            (repeat :tag "Only include from these compilers" string)))
+     (string :tag "A line of LaTeX"))))
 
 (defgroup org-appearance nil
   "Settings for Org mode appearance."
@@ -8440,7 +8444,10 @@ a link."
               (dolist (link (if (stringp links) (list links) links))
                 (search-forward link nil links-end)
                 (goto-char (match-beginning 0))
-                (org-open-at-point arg)))))))
+                 ;; When opening file link, current buffer may be
+                 ;; altered.
+                 (save-current-buffer
+                  (org-open-at-point arg))))))))
        ;; On a footnote reference or at definition's label.
        ((or (eq type 'footnote-reference)
            (and (eq type 'footnote-definition)

diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 26f8742bec89103cf7df1770726414c3b5b12e58..768bf402b70dfd33f47621120523a8ce8a3abe7d 100644 (file)
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -1820,9 +1820,11 @@ INFO is a plist used as a communication channel.  See
   "Protect special chars, then wrap TEXT in \"\\texttt{}\"."
   (format "\\texttt{%s}"
           (replace-regexp-in-string
-           "--\\|[\\{}$%&_#~^]"
+           "--\\|<<\\|>>\\|[\\{}$%&_#~^]"
            (lambda (m)
              (cond ((equal m "--") "-{}-{}")
+                   ((equal m "<<") "<{}<{}")
+                   ((equal m ">>") ">{}>{}")
                    ((equal m "\\") "\\textbackslash{}")
                    ((equal m "~") "\\textasciitilde{}")
                    ((equal m "^") "\\textasciicircum{}")