From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 5 Nov 2006 20:57:32 +0000 (+0000)
Subject: (read-feature): Don't complete features not loaded from a file (which make
X-Git-Tag: emacs-pretest-22.0.91~310
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf0f58baee6a986021f2a1e9a5b30256e53ad6b9;p=emacs.git

(read-feature): Don't complete features not loaded from a file (which make
`unload-feature' to fail).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index adde4eb180f..194ba3f6d88 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-05  Juanma Barranquero  <lekktu@gmail.com>
+
+	* loadhist.el (read-feature): Don't complete features not loaded
+	from a file (which make `unload-feature' to fail).
+
 2006-11-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* add-log.el (add-log-time-zone-rule): Mark as safe-local-variable.
@@ -10,7 +15,7 @@
 2006-11-05  Richard Stallman  <rms@gnu.org>
 
 	* startup.el (init-file-had-error): Add doc string.
-	(fancy-splash-text, fancy-splash-head, fancy-splash-tail): 
+	(fancy-splash-text, fancy-splash-head, fancy-splash-tail):
 	Use fixed-width font for keyboard key descriptions.
 
 	* cus-edit.el (custom-save-all): Error if saving in .emacs
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 61f15c8ef1c..6683f8ae413 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -119,7 +119,9 @@ return the feature \(symbol\)."
 			   (mapcar (lambda (feature)
 				     (list (symbol-name feature)))
 				   features)
-			   nil t)))
+			   ;; Complete only features loaded from a file
+			   #'(lambda (f) (feature-file (intern (car f))))
+			   t)))
 
 (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks)
 (defvar unload-feature-special-hooks