# HG changeset patch # User Glenn Morris # Date 1295143294 28800 # Node ID bcf4b132f3d594714807cd0e476aaad1f65838dc # Parent 697cfa263439955996b28c9915da4d291980dd55 * lisp/info-xref.el (info-xref-docstrings): Replace cl function. diff -r 697cfa263439 -r bcf4b132f3d5 lisp/ChangeLog --- a/lisp/ChangeLog Sat Jan 15 17:59:33 2011 -0800 +++ b/lisp/ChangeLog Sat Jan 15 18:01:34 2011 -0800 @@ -1,3 +1,7 @@ +2011-01-16 Glenn Morris + + * info-xref.el (info-xref-docstrings): Replace cl function. + 2011-01-16 Kevin Ryde * info-xref.el: Version 3. diff -r 697cfa263439 -r bcf4b132f3d5 lisp/info-xref.el --- a/lisp/info-xref.el Sat Jan 15 17:59:33 2011 -0800 +++ b/lisp/info-xref.el Sat Jan 15 18:01:34 2011 -0800 @@ -479,20 +479,21 @@ and links can be in the file commentary or elsewhere too. Even .elc files can usually be checked successfully if you don't have the sources handy." - (interactive - (let* ((default (and buffer-file-name + (let* ((default (and buffer-file-name (file-relative-name buffer-file-name))) - (prompt (if default - (format "Filename with wildcards (%s): " - default) - "Filename with wildcards: ")) - (pattern (read-file-name prompt nil default)) - (filename-list (file-expand-wildcards pattern - t))) ;; absolute filenames - (eval-and-compile - (require 'cl)) ;; for `remove-if' - (setq filename-list (remove-if 'info-xref-lock-file-p filename-list)) + (prompt (if default + (format "Filename with wildcards (%s): " + default) + "Filename with wildcards: ")) + (pattern (read-file-name prompt nil default)) + ;; absolute filenames + (filename-list (file-expand-wildcards pattern t)) + newlist) + (setq filename-list + (dolist (file filename-list (nreverse newlist)) + (or (info-xref-lock-file-p file) + (push file newlist)))) (unless filename-list (error "No files: %S" pattern)) (list filename-list)))