Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2020-04-26 10:37:28 +02:00
commit 3c4cb7b296
1 changed files with 10 additions and 4 deletions

View File

@ -1557,10 +1557,16 @@ non-nil."
(org-link-store-props :type "calendar" :date cd)))
((eq major-mode 'help-mode)
(setq link (concat "help:" (save-excursion
(goto-char (point-min))
(looking-at "^[^ ]+")
(match-string 0))))
(let ((symbol (replace-regexp-in-string
;; Help mode escapes backquotes and backslashes
;; before displaying them. E.g., "`" appears
;; as "\'" for reasons. Work around this.
(rx "\\" (group (or "`" "\\"))) "\\1"
(save-excursion
(goto-char (point-min))
(looking-at "^[^ ]+")
(match-string 0)))))
(setq link (concat "help:" symbol)))
(org-link-store-props :type "help"))
((eq major-mode 'w3-mode)