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

Update to Org 9.5.2-22-g33543d

Browse source
This commit is contained in:
Kyle Meyer 2022-02-28 00:11:01 -05:00
parent 9bce4b67f1
commit e77fc8262a
4 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/org/oc-basic.el
View file

@ -178,21 +178,29 @@ Return a hash table with citation references as keys and fields alist as values.
" and "))) " and ")))
('issued ('issued
;; Date are expressed as an array ;; Date are expressed as an array
;; (`date-parts') or a "string (`raw'). ;; (`date-parts') or a "string (`raw'
;; In both cases, extract the year and ;; or `literal'). In both cases,
;; associate it to `year' field, for ;; extract the year and associate it
;; compatibility with BibTeX format. ;; to `year' field, for compatibility
;; with BibTeX format.
(let ((date (or (alist-get 'date-parts value) (let ((date (or (alist-get 'date-parts value)
(alist-get 'literal value)
(alist-get 'raw value)))) (alist-get 'raw value))))
(cons 'year (cons 'year
(cond (cond
((consp date) ((consp date)
(caar date)) (caar date))
((stringp 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 (t
(error "Unknown CSL-JSON date format: %S" (error "Unknown CSL-JSON date format: %S"
date)))))) value))))))
(_ (_
(cons field value)))) (cons field value))))
item) item)

2
lisp/org/ol.el
View file

@ -183,7 +183,7 @@ link.
(defcustom org-link-descriptive t (defcustom org-link-descriptive t
"Non-nil means Org displays descriptive links. "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 \"Org Website\", hiding the link itself and just displaying its
description. When set to nil, Org displays the full links description. When set to nil, Org displays the full links
literally. literally.

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.5.2-17-gea6b74")) (let ((org-git-version "release_9.5.2-22-g33543d"))
org-git-version)) org-git-version))
(provide 'org-version) (provide 'org-version)

6
lisp/org/org.el
View file

@ -17522,11 +17522,11 @@ this numeric value."
(interactive "r") (interactive "r")
(let ((result "")) (let ((result ""))
(while (/= beg end) (while (/= beg end)
(when (get-char-property beg 'invisible) (if (invisible-p beg)
(setq beg (next-single-char-property-change beg 'invisible nil end))) (setq beg (next-single-char-property-change beg 'invisible nil end))
(let ((next (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 result (concat result (buffer-substring beg next)))
(setq beg next))) (setq beg next))))
(setq deactivate-mark t) (setq deactivate-mark t)
(kill-new result) (kill-new result)
(message "Visible strings have been copied to the kill ring."))) (message "Visible strings have been copied to the kill ring.")))