[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 e77fc8262a: Update to Org 9.5.2-22-g33543d
From: |
Kyle Meyer |
Subject: |
emacs-28 e77fc8262a: Update to Org 9.5.2-22-g33543d |
Date: |
Mon, 28 Feb 2022 00:17:48 -0500 (EST) |
branch: emacs-28
commit e77fc8262ad73f30b1983f403262dce6f0e4cb09
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Update to Org 9.5.2-22-g33543d
---
lisp/org/oc-basic.el | 20 ++++++++++++++------
lisp/org/ol.el | 2 +-
lisp/org/org-version.el | 2 +-
lisp/org/org.el | 10 +++++-----
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el
index d82406affb..81b7e4471f 100644
--- a/lisp/org/oc-basic.el
+++ b/lisp/org/oc-basic.el
@@ -178,21 +178,29 @@ Return a hash table with citation references as keys and
fields alist as values.
" and ")))
('issued
;; Date are expressed as an array
- ;; (`date-parts') or a "string (`raw').
- ;; In both cases, extract the year and
- ;; associate it to `year' field, for
- ;; compatibility with BibTeX format.
+ ;; (`date-parts') or a "string (`raw'
+ ;; or `literal'). In both cases,
+ ;; extract the year and associate it
+ ;; to `year' field, for compatibility
+ ;; with BibTeX format.
(let ((date (or (alist-get 'date-parts value)
+ (alist-get 'literal value)
(alist-get 'raw value))))
(cons 'year
(cond
((consp date)
(caar date))
((stringp date)
- (car (split-string date "-")))
+ (replace-regexp-in-string
+ (rx
+ (minimal-match (zero-or-more
anything))
+ (group-n 1 (repeat 4 digit))
+ (zero-or-more anything))
+ (rx (backref 1))
+ date))
(t
(error "Unknown CSL-JSON date format:
%S"
- date))))))
+ value))))))
(_
(cons field value))))
item)
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index 2cba33ed95..a03d85f618 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -183,7 +183,7 @@ link.
(defcustom org-link-descriptive t
"Non-nil means Org displays descriptive links.
-E.g. [[https://orgmode.org][Org website]] is be displayed as
+E.g. [[https://orgmode.org][Org website]] is displayed as
\"Org Website\", hiding the link itself and just displaying its
description. When set to nil, Org displays the full links
literally.
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 6a2aa8ca5b..badf0e4769 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-17-gea6b74"))
+ (let ((org-git-version "release_9.5.2-22-g33543d"))
org-git-version))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 7ea8d65f3b..d656a51591 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -17522,11 +17522,11 @@ this numeric value."
(interactive "r")
(let ((result ""))
(while (/= beg end)
- (when (get-char-property beg 'invisible)
- (setq beg (next-single-char-property-change beg 'invisible nil end)))
- (let ((next (next-single-char-property-change beg 'invisible nil end)))
- (setq result (concat result (buffer-substring beg next)))
- (setq beg next)))
+ (if (invisible-p beg)
+ (setq beg (next-single-char-property-change beg 'invisible nil end))
+ (let ((next (next-single-char-property-change beg 'invisible nil end)))
+ (setq result (concat result (buffer-substring beg next)))
+ (setq beg next))))
(setq deactivate-mark t)
(kill-new result)
(message "Visible strings have been copied to the kill ring.")))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 e77fc8262a: Update to Org 9.5.2-22-g33543d,
Kyle Meyer <=