ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2020-01-09 17:49:56 +01:00
parent 894189fa72 2c598d7499
commit ffb3f9e568
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/lisp/ol-man.el
View File

@ -24,7 +24,6 @@
;;; Commentary: ;;; Commentary:
(require 'ol) (require 'ol)
(require 'org)
(org-link-set-parameters "man" (org-link-set-parameters "man"
:follow #'org-man-open :follow #'org-man-open
@ -48,7 +47,7 @@ PATH should be a topic that can be thrown at the man command."
(let* ((page (org-man-get-page-name)) (let* ((page (org-man-get-page-name))
(link (concat "man:" page)) (link (concat "man:" page))
(description (format "Manpage for %s" page))) (description (format "Manpage for %s" page)))
(org-store-link-props (org-link-store-props
:type "man" :type "man"
:link link :link link
:description description)))) :description description))))

18
doc/org-manual.org
View File

@ -19707,11 +19707,11 @@ process of adding Org links to Unix man pages, which look like this
: [[man:printf][The printf manual]] : [[man:printf][The printf manual]]
#+texinfo: @noindent #+texinfo: @noindent
The following =org-man.el= file implements it The following =ol-man.el= file implements it
#+begin_src emacs-lisp #+begin_src emacs-lisp
;;; org-man.el - Support for links to man pages in Org mode ;;; ol-man.el - Support for links to man pages in Org mode
(require 'org) (require 'ol)
(org-link-set-parameters "man" (org-link-set-parameters "man"
:follow org-man-command :follow org-man-command
@ -19730,7 +19730,7 @@ The following =org-man.el= file implements it
(let* ((page (org-man-get-page-name)) (let* ((page (org-man-get-page-name))
(link (concat "man:" page)) (link (concat "man:" page))
(description (format "Man page for %s" page))) (description (format "Man page for %s" page)))
(org-store-link-props (org-link-store-props
:type "man" :type "man"
:link link :link link
:description description)))) :description description))))
@ -19753,8 +19753,8 @@ The following =org-man.el= file implements it
(`ascii (format "%s (%s)" desc path)) (`ascii (format "%s (%s)" desc path))
(t path)))) (t path))))
(provide 'org-man) (provide ol-man)
;;; org-man.el ends here ;;; ol-man.el ends here
#+end_src #+end_src
#+texinfo: @noindent #+texinfo: @noindent
@ -19762,13 +19762,13 @@ To activate links to man pages in Org, enter this in the Emacs init
file: file:
#+begin_src emacs-lisp #+begin_src emacs-lisp
(require 'org-man) (require 'ol-man)
#+end_src #+end_src
#+texinfo: @noindent #+texinfo: @noindent
A review of =org-man.el=: A review of =ol-man.el=:
1. First, =(require 'org)= ensures =org.el= is loaded. 1. First, =(require 'ol)= ensures that =ol.el= is loaded.
2. 2.