Merge from origin/emacs-25

[gnu-emacs] / lisp / org / org-info.el

diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index d1bfc53e5e3ad4e14df484a937d5138c164169fa..4ee5ee4e2e8310461e4456e3d51ca9a52183f38c 100644 (file)
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -1,12 +1,10 @@
 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -36,8 +34,8 @@
 
 ;; Declare external functions and variables
 
-(declare-function Info-find-node "info" (filename nodename
-                                                 &optional no-going-back))
+(declare-function Info-find-node "info"
+                  (filename nodename &optional no-going-back strict-case))
 (defvar Info-current-file)
 (defvar Info-current-node)
 
@@ -50,9 +48,9 @@
   "Store a link to an Info file and node."
   (when (eq major-mode 'Info-mode)
     (let (link desc)
-      (setq link (org-make-link "info:"
-                               (file-name-nondirectory Info-current-file)
-                               "#" Info-current-node))
+      (setq link (concat "info:"
+                        (file-name-nondirectory Info-current-file)
+                        "#" Info-current-node))
       (setq desc (concat (file-name-nondirectory Info-current-file)
                         "#" Info-current-node))
       (org-store-link-props :type "info" :file Info-current-file
@@ -78,6 +76,4 @@
 
 (provide 'org-info)
 
-;; arch-tag: 1e289f54-7176-487f-b575-dd4854bab15e
-
 ;;; org-info.el ends here