;;; loadhist.el --- lisp functions for working with feature groups
-;; Copyright (C) 1995, 1998, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000-2015 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
;; Keywords: internal
;; This file is part of GNU Emacs.
"Read feature name from the minibuffer, prompting with string PROMPT.
If optional second arg LOADED-P is non-nil, the feature must be loaded
from a file."
- (intern
- (completing-read prompt
- (cons nil features)
- (and loaded-p
- #'(lambda (f)
- (and f ; ignore nil
- (feature-file f))))
- loaded-p)))
+ (intern (completing-read prompt
+ features
+ (and loaded-p #'feature-file)
+ loaded-p)))
(defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks)
(defvar unload-feature-special-hooks