[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org fff9239dc1: Merge branch 'bugfix'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org fff9239dc1: Merge branch 'bugfix' |
Date: |
Fri, 17 Feb 2023 05:58:14 -0500 (EST) |
branch: externals/org
commit fff9239dc1a2d0f78c17bbbc5c320e8e16560b1d
Merge: 74eb0f8bc9 eea8da0315
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>
Merge branch 'bugfix'
---
lisp/ob-octave.el | 4 ++--
lisp/org-agenda.el | 2 +-
lisp/org-element.el | 6 +++---
lisp/ox-texinfo.el | 16 ++++++++++------
testing/lisp/test-ox-texinfo.el | 32 ++++++++++++++++++++++++++++++++
5 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index 9bf16b9849..1de263a52d 100644
--- a/lisp/ob-octave.el
+++ b/lisp/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-agenda.el b/lisp/org-agenda.el
index 127503af0f..8fd5ad2439 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7333,7 +7333,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-element.el b/lisp/org-element.el
index 57f168f606..d7847a6780 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -7567,15 +7567,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/ox-texinfo.el b/lisp/ox-texinfo.el
index 8e3a045629..4ff482cc3f 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/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))
diff --git a/testing/lisp/test-ox-texinfo.el b/testing/lisp/test-ox-texinfo.el
index 51fdb3606c..38395500df 100644
--- a/testing/lisp/test-ox-texinfo.el
+++ b/testing/lisp/test-ox-texinfo.el
@@ -24,6 +24,8 @@
(require 'cl-lib)
(require 'ox-texinfo)
+(eval-when-compile (require 'subr-x))
+
(unless (featurep 'ox-texinfo)
(signal 'missing-test-dependency "org-export-texinfo"))
@@ -292,5 +294,35 @@
nil
'(:with-latex t))))))
+
+;;; End-to-end
+
+(ert-deftest test-ox-texinfo/end-to-end-inline ()
+ "Test end-to-end with inline TeX fragment."
+ (should
+ (org-test-with-temp-text
+ "$a^2 = b$"
+ (let ((export-buffer "*Test Texinfo Export*")
+ (org-export-show-temporary-export-buffer nil))
+ (org-export-to-buffer 'texinfo export-buffer
+ nil nil nil nil nil
+ #'texinfo-mode)))))
+
+(ert-deftest test-ox-texinfo/end-to-end-sanity-check-displayed ()
+ "Test end-to-end with LaTeX environment."
+ (should
+ (org-test-with-temp-text
+ (string-join
+ (list "\\begin{equation}"
+ "a ^ 2 = b"
+ "b ^ 2 = c"
+ "\\end{equation}")
+ "\n")
+ (let ((export-buffer "*Test Texinfo Export*")
+ (org-export-show-temporary-export-buffer nil))
+ (org-export-to-buffer 'texinfo export-buffer
+ nil nil nil nil nil
+ #'texinfo-mode)))))
+
(provide 'test-ox-texinfo)
;;; test-ox-texinfo.el end here