2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75765851482..254c21b3a54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-20  Kevin Ryde  <user42@zip.com.au>
+
+        * info-xref.el (info-xref-check-all-custom): Skip :tag part of
+        ``(custom-manual :tag "Foo" "(foo)Node")''.
+
 2006-05-20  Karl Chen  <quarl@cs.berkeley.edu>
 
         * progmodes/cc-vars.el (c-backslash-column): Mark as safe if its
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 75bc72f25b4..a6acfa8021c 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -301,7 +301,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