Update to Org 9.6.1-34-geea8da

diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index 9bf16b9849ce527d3b0e7c696ba0b763675b379e..1de263a52d0812b90af53d3f4a3937d5e7017a6d 100644 (file)
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -243,8 +243,8 @@ value of the last statement in BODY, as elisp."
       (`output
        (setq results
             (if matlabp
-                (cdr (reverse (delq "" (mapcar #'org-strip-quotes
-                                               (mapcar #'org-trim raw)))))
+                (cdr (reverse (delete "" (mapcar #'org-strip-quotes
+                                                 (mapcar #'org-trim raw)))))
               (cdr (member org-babel-octave-eoe-output
                            (reverse (mapcar #'org-strip-quotes
                                             (mapcar #'org-trim raw)))))))

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 3db33c4d63e70831f9c5345720dd36c653e079d4..a33d84f1cd45db579c9a11376a86aa8f47fe521b 100644 (file)
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -7330,7 +7330,7 @@ Any match of REMOVE-RE will be removed from TXT."
                              (let ((s (org-format-outline-path (org-get-outline-path)
                                                                (1- (frame-width))
                                                                nil org-agenda-breadcrumbs-separator)))
-                               (if (eq "" s) "" (concat s org-agenda-breadcrumbs-separator))))))
+                               (if (equal "" s) "" (concat s org-agenda-breadcrumbs-separator))))))
        (setq time (cond (s2 (concat
                              (org-agenda-time-of-day-to-ampm-maybe s1)
                              "-" (org-agenda-time-of-day-to-ampm-maybe s2)

diff --git a/lisp/org/org-cycle.el b/lisp/org/org-cycle.el
index 828c84cd0ac9ac5d7a0833aa256027b1773ebc5c..90fc95f41f72c634cc90f919dd85d4c079146704 100644 (file)
--- a/lisp/org/org-cycle.el
+++ b/lisp/org/org-cycle.el
@@ -648,6 +648,9 @@ With a numeric prefix, show all headlines up to that level."
                 (org-fold-show-hidden-entry)
                 (org-fold-show-children))
                ("content"
+                 ;; Newline before heading will be outside the
+                 ;; narrowing.  Make sure that it is revealed.
+                 (org-fold-heading nil)
                 (save-excursion
                   (save-restriction
                     (org-narrow-to-subtree)

diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 4f4eebfcc2d9b762422cf53533b94d90bbced8cc..8524dd29d835399ae3403aaac7c4d8dd0e77ee47 100644 (file)
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -7562,15 +7562,15 @@ the cache."
                  ;; beginning.
                  (next-element-re (pcase granularity
                                     ((or `headline
-                                         (guard (eq '(headline)
-                                                    restrict-elements)))
+                                         (guard (equal '(headline)
+                                                       restrict-elements)))
                                      (cons
                                       (org-with-limited-levels
                                        org-element-headline-re)
                                       'match-beg))
                                     (`headline+inlinetask
                                      (cons
-                                      (if (eq '(inlinetask) restrict-elements)
+                                      (if (equal '(inlinetask) restrict-elements)
                                           (org-inlinetask-outline-regexp)
                                         org-element-headline-re)
                                       'match-beg))

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 5f587fb3fd85cb8acccf9bd975ec8b9387bbb88f..5f93356709e5c6aa2d8454093b3165563611a628 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.1-31-gaf1bb1"))
+   (let ((org-git-version "release_9.6.1-34-geea8da"))
      org-git-version))
 \f
 (provide 'org-version)

diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 8e3a045629947ce0d0a204bd5791aaf14bff99a2..4ff482cc3f54f135162318339d9c9c7fae736ea2 100644 (file)
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -32,6 +32,8 @@
 (require 'cl-lib)
 (require 'ox)
 
+(eval-when-compile (require 'subr-x))
+
 (defvar orgtbl-exp-regexp)
 (defvar org-texinfo-supports-math--cache)
 
@@ -2025,12 +2027,14 @@ Once computed, the results remain cached."
   (unless (boundp 'org-texinfo-supports-math--cache)
     (setq org-texinfo-supports-math--cache
           (let ((math-example "1 + 1 = 2"))
-            (let* ((input-file
-                    (make-temp-file "test" nil ".info"))
-                   (input-content
-                    (concat (format "@setfilename %s" input-file) "\n"
-                            "@node Top" "\n"
-                            (format "@displaymath{%s}" math-example) "\n")))
+            (let* ((input-file (make-temp-file "test" nil ".info"))
+                   (input-content (string-join
+                                   (list (format "@setfilename %s" input-file)
+                                         "@node Top"
+                                         "@displaymath"
+                                         math-example
+                                         "@end displaymath")
+                                   "\n")))
               (with-temp-file input-file
                 (insert input-content))
               (let* ((output-file (org-texinfo-compile input-file))