[Emacs-diffs] Changes to emacs/lisp/help-fns.el,v

[John Paul Wallington]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     John Paul Wallington <jpw>      08/05/31 18:19:05

Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- help-fns.el 6 May 2008 07:57:37 -0000       1.120
+++ help-fns.el 31 May 2008 18:19:05 -0000      1.121
@@ -474,7 +474,9 @@
                      custom-version))
       (when cpv
        (let* ((package (car-safe cpv))
-              (version (car (cdr-safe cpv)))
+              (version (if (listp (cdr-safe cpv))
+                           (car (cdr-safe cpv))
+                         (cdr-safe cpv)))
               (pkg-versions (assq package 
customize-package-emacs-version-alist))
               (emacsv (cdr (assoc version pkg-versions))))
          (if (and package version)