diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-02-18 10:38:47 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-02-18 10:38:49 +0200 |
| commit | 2ed240296c181cc677caeef1ec33befd8428aa98 (patch) | |
| tree | 8a7c5af3b20d468dadb6655b8a9827c6c9fc7813 /lisp/org | |
| parent | b16aed76cb2e94dc5a8cb27ba574346a3931ca92 (diff) | |
| parent | c8442df581feb45d50530b372152beff9d23211d (diff) | |
| download | emacs-2ed240296c181cc677caeef1ec33befd8428aa98.tar.gz emacs-2ed240296c181cc677caeef1ec33befd8428aa98.tar.bz2 emacs-2ed240296c181cc677caeef1ec33befd8428aa98.zip | |
Merge from origin/emacs-28
c8442df ; Separate command and concept index in Transient manual
8aa052c ; Fix Transient manual
5b7752a Fix problem with popd for in remote shell buffers
38f6ea1 Import texi source file for transient manual
df34929 Update to Org 9.5.2-15-gc5ceb6
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ol-bibtex.el | 6 | ||||
| -rw-r--r-- | lisp/org/org-list.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el index 218f8f17ed5..81b99167b8e 100644 --- a/lisp/org/ol-bibtex.el +++ b/lisp/org/ol-bibtex.el @@ -655,7 +655,8 @@ With a prefix arg, query for optional fields." (defun org-bibtex-read () "Read a bibtex entry and save to `org-bibtex-entries'. -This uses `bibtex-parse-entry'." +This uses `bibtex-parse-entry'. +Return the new value of `org-bibtex-entries'." (interactive) (let ((keyword (lambda (str) (intern (concat ":" (downcase str))))) (clean-space (lambda (str) (replace-regexp-in-string @@ -678,7 +679,8 @@ This uses `bibtex-parse-entry'." (funcall clean-space (funcall strip-delim (cdr pair))))) (save-excursion (bibtex-beginning-of-entry) (bibtex-parse-entry))) org-bibtex-entries) - (unless (car org-bibtex-entries) (pop org-bibtex-entries)))) + (unless (car org-bibtex-entries) (pop org-bibtex-entries)) + org-bibtex-entries)) (defun org-bibtex-read-buffer (buffer) "Read all bibtex entries in BUFFER and save to `org-bibtex-entries'. diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 0dd8139a977..da309f8c6da 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -1442,7 +1442,7 @@ This function returns, destructively, the new list structure." (save-excursion (goto-char (org-list-get-last-item item struct prevs)) (point-at-eol))) - ((string-match-p "\\`[0-9]+\\'" dest) + ((and (stringp dest) (string-match-p "\\`[0-9]+\\'" dest)) (let* ((all (org-list-get-all-items item struct prevs)) (len (length all)) (index (mod (string-to-number dest) len))) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 572203711c0..336347b29c2 100644 --- 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.5.2-13-gdd6486")) + (let ((org-git-version "release_9.5.2-15-gc5ceb6")) org-git-version)) (provide 'org-version) |