(read-file-local-variable-value): Don't filter out

minor modes from mode name completion (bug#4664).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65f06b645a0362ba03bc21c47ed2d454588d9eab..0ddb0a35a0f9335e2d28b88ba71c4969f7f7d8b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-13  Juri Linkov  <juri@jurta.org>
+
+       * files-x.el (read-file-local-variable-value): Don't filter out
+       minor modes from mode name completion (bug#4664).
+
 2009-10-13  Juanma Barranquero  <lekktu@gmail.com>
 
        * international/mule-cmds.el (ucs-names): Remove exclusion of

diff --git a/lisp/files-x.el b/lisp/files-x.el
index 8261df18b5169c81f715a13c7353b0048967e43c..19d77e9823d0ae18330b7a90cb8cf555f2ff1588 100644 (file)
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -69,8 +69,7 @@ Intended to be used in the `interactive' spec of
               (format "Add %s with value: " variable))
             obarray
             (lambda (sym)
-              (and (string-match-p "-mode\\'" (symbol-name sym))
-                   (not (string-match-p "-minor-mode\\'" (symbol-name sym)))))
+              (string-match-p "-mode\\'" (symbol-name sym)))
             nil nil nil default nil))
       (and (stringp value)
           (intern (replace-regexp-in-string "-mode\\'" "" value))))