diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-02-17 18:53:05 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-02-17 18:53:05 +0200 |
| commit | 65ba3274652a4dac37f41f872330e391cd511ae1 (patch) | |
| tree | 6691056b6f68d493d3b4d9f6926a8ba85d4bd3c3 /lisp/org/ol-man.el | |
| parent | 07a392f445eb21c5e4681027eee9d981300a4309 (diff) | |
| download | emacs-65ba3274652a4dac37f41f872330e391cd511ae1.tar.gz emacs-65ba3274652a4dac37f41f872330e391cd511ae1.tar.bz2 emacs-65ba3274652a4dac37f41f872330e391cd511ae1.zip | |
Revert "Update to Org 9.6.19"
This reverts commit 07a392f445eb21c5e4681027eee9d981300a4309.
It was installed by mistake.
Diffstat (limited to 'lisp/org/ol-man.el')
| -rw-r--r-- | lisp/org/ol-man.el | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/lisp/org/ol-man.el b/lisp/org/ol-man.el index d3d7db04700..b6cada1b3c3 100644 --- a/lisp/org/ol-man.el +++ b/lisp/org/ol-man.el @@ -39,27 +39,13 @@ :group 'org-link :type '(choice (const man) (const woman))) -(declare-function Man-translate-references "man" (ref)) (defun org-man-open (path _) "Visit the manpage on PATH. PATH should be a topic that can be thrown at the man command. If PATH contains extra ::STRING which will use `occur' to search matched strings in man buffer." - (require 'man) ; For `Man-translate-references' (string-match "\\(.*?\\)\\(?:::\\(.*\\)\\)?$" path) (let* ((command (match-string 1 path)) - ;; FIXME: Remove after we drop Emacs 29 support. - ;; Working around security bug #66390. - (command (if (not (equal (Man-translate-references ";id") ";id")) - ;; We are on Emacs that escapes man command args - ;; (see Emacs commit 820f0793f0b). - command - ;; Older Emacs without the fix - escape the - ;; arguments ourselves. - (mapconcat 'identity - (mapcar #'shell-quote-argument - (split-string command "\\s-+")) - " "))) (search (match-string 2 path)) (buffer (funcall org-man-command command))) (when search |