X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/9ca3e5932be2ce3261a911be112df35b4af7e49a..599498c31f0ce7a3ffd6094a12a986766b5a694d:/lisp/info-xref.el

diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 1a9b196a76..f9e795a14e 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -1,16 +1,17 @@
 ;;; info-xref.el --- check external references in an Info document
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Kevin Ryde <user42@zip.com.au>
 ;; Keywords: docs
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -138,27 +137,25 @@ should open up the purported top file and see what subfiles it says."
 ;; Some dynamic variables are used to share information with sub-functions
 ;; below.
 ;;
-(eval-when-compile
-  ;;
-  ;; info-xref-filename-header - a heading message for the current top-level
-  ;;     filename, or "" when it's been printed.
-  ;;
-  (defvar info-xref-xfile-alist)
-  ;;
-  ;; info-xref-good - count of good cross references.
-  ;;
-  (defvar info-xref-good)
-  ;;
-  ;; info-xref-bad - count of bad cross references.
-  ;;
-  (defvar info-xref-bad)
-  ;;
-  ;; info-xref-xfile-alist - indexed by "(foo)" with value nil or t according
-  ;;     to whether "(foo)" exists or not.  This is used to suppress duplicate
-  ;;     messages about foo not being available.  (Duplicates within one
-  ;;     top-level file that is.)
-  ;;
-  (defvar info-xref-filename-heading))
+;; info-xref-filename-header - a heading message for the current top-level
+;;     filename, or "" when it's been printed.
+;;
+(defvar info-xref-xfile-alist)
+;;
+;; info-xref-good - count of good cross references.
+;;
+(defvar info-xref-good)
+;;
+;; info-xref-bad - count of bad cross references.
+;;
+(defvar info-xref-bad)
+;;
+;; info-xref-xfile-alist - indexed by "(foo)" with value nil or t according
+;;     to whether "(foo)" exists or not.  This is used to suppress duplicate
+;;     messages about foo not being available.  (Duplicates within one
+;;     top-level file that is.)
+;;
+(defvar info-xref-filename-heading)
 
 (defun info-xref-check-list (filename-list)
   "Check external references in info documents in FILENAME-LIST."
@@ -303,7 +300,10 @@ quite a while."
        (lambda (symbol)
          (dolist (link (get symbol 'custom-links))
            (when (memq (car link) '(custom-manual info-link))
-             (if (info-xref-goto-node-p (cadr link))
+	     ;; skip :tag part of (custom-manual :tag "Foo" "(foo)Node")
+	     (if (eq :tag (cadr link))
+		 (setq link (cddr link)))
+	     (if (info-xref-goto-node-p (cadr link))
                  (setq good (1+ good))
                (setq bad (1+ bad))
                ;; symbol-file gives nil for preloaded variables, would need
@@ -314,5 +314,5 @@ quite a while."
 
 (provide 'info-xref)
 
-;;; arch-tag: 69d4d528-69ed-4cc2-8eb4-c666a0c1d5ac
+;; arch-tag: 69d4d528-69ed-4cc2-8eb4-c666a0c1d5ac
 ;;; info-xref.el ends here