procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Org 9.6.1-34-geea8da

Browse source
This commit is contained in:
Kyle Meyer 2023-02-20 00:41:31 -05:00
parent afbce8bb46
commit fc4bfa76db
6 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/org/ob-octave.el
View file

@ -243,8 +243,8 @@ value of the last statement in BODY, as elisp."
(`output (`output
(setq results (setq results
(if matlabp (if matlabp
(cdr (reverse (delq "" (mapcar #'org-strip-quotes (cdr (reverse (delete "" (mapcar #'org-strip-quotes
(mapcar #'org-trim raw))))) (mapcar #'org-trim raw)))))
(cdr (member org-babel-octave-eoe-output (cdr (member org-babel-octave-eoe-output
(reverse (mapcar #'org-strip-quotes (reverse (mapcar #'org-strip-quotes
(mapcar #'org-trim raw))))))) (mapcar #'org-trim raw)))))))

2
lisp/org/org-agenda.el
View file

@ -7330,7 +7330,7 @@ Any match of REMOVE-RE will be removed from TXT."
(let ((s (org-format-outline-path (org-get-outline-path) (let ((s (org-format-outline-path (org-get-outline-path)
(1- (frame-width)) (1- (frame-width))
nil org-agenda-breadcrumbs-separator))) 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 (setq time (cond (s2 (concat
(org-agenda-time-of-day-to-ampm-maybe s1) (org-agenda-time-of-day-to-ampm-maybe s1)
"-" (org-agenda-time-of-day-to-ampm-maybe s2) "-" (org-agenda-time-of-day-to-ampm-maybe s2)

3
lisp/org/org-cycle.el
View file

@ -648,6 +648,9 @@ With a numeric prefix, show all headlines up to that level."
(org-fold-show-hidden-entry) (org-fold-show-hidden-entry)
(org-fold-show-children)) (org-fold-show-children))
("content" ("content"
;; Newline before heading will be outside the
;; narrowing. Make sure that it is revealed.
(org-fold-heading nil)
(save-excursion (save-excursion
(save-restriction (save-restriction
(org-narrow-to-subtree) (org-narrow-to-subtree)

6
lisp/org/org-element.el
View file

@ -7562,15 +7562,15 @@ the cache."
;; beginning. ;; beginning.
(next-element-re (pcase granularity (next-element-re (pcase granularity
((or `headline ((or `headline
(guard (eq '(headline) (guard (equal '(headline)
restrict-elements))) restrict-elements)))
(cons (cons
(org-with-limited-levels (org-with-limited-levels
org-element-headline-re) org-element-headline-re)
'match-beg)) 'match-beg))
(`headline+inlinetask (`headline+inlinetask
(cons (cons
(if (eq '(inlinetask) restrict-elements) (if (equal '(inlinetask) restrict-elements)
(org-inlinetask-outline-regexp) (org-inlinetask-outline-regexp)
org-element-headline-re) org-element-headline-re)
'match-beg)) 'match-beg))

2
lisp/org/org-version.el
View file

@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." 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)) org-git-version))
(provide 'org-version) (provide 'org-version)

16
lisp/org/ox-texinfo.el
View file

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