From 22e20457f23e72d264227a96e6f4888cd967f028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Wed, 28 Dec 2016 09:22:34 +0100 Subject: Imported Upstream version 9.0.3 --- lisp/org-info.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lisp/org-info.el') diff --git a/lisp/org-info.el b/lisp/org-info.el index d82168e..b6e8e09 100644 --- a/lisp/org-info.el +++ b/lisp/org-info.el @@ -97,21 +97,21 @@ Taken from ") (defconst org-info-other-documents '(("libc" . "http://www.gnu.org/software/libc/manual/html_mono/libc.html") ("make" . "http://www.gnu.org/software/make/manual/make.html")) - "Alist of documents generated from texinfo source. - -When converting info links to html, links to any one of these manuals are -converted to use these URL's.") + "Alist of documents generated from Texinfo source. +When converting info links to HTML, links to any one of these manuals are +converted to use these URL.") (defun org-info-map-html-url (filename) - "Given info FILENAME, either return it (plus '.html' suffix added) or convert -it to URL pointing to the official page on internet, e.g., use gnu.org for all -emacs related documents. See `org-info-official-gnu-document' and -`org-info-other-documents' for details." - (if (member filename org-info-emacs-documents) - (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html" - filename) - (let ((url (cdr (assoc filename org-info-other-documents)))) - (or url (concat filename ".html"))))) + "Return URL or HTML file associated to Info FILENAME. +If FILENAME refers to an official GNU document, return a URL pointing to +the official page for that document, e.g., use \"gnu.org\" for all Emacs +related documents. Otherwise, append \".html\" extension to FILENAME. +See `org-info-emacs-documents' and `org-info-other-documents' for details." + (cond ((member filename org-info-emacs-documents) + (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html" + filename)) + ((cdr (assoc filename org-info-other-documents))) + (t (concat filename ".html")))) (defun org-info-export (path desc format) "Export an info link. -- cgit v1.2.3