[Emacs-diffs] Changes to emacs/lisp/textmodes/conf-mode.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/09/18 17:19:16

Index: conf-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/conf-mode.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- conf-mode.el        16 Sep 2006 18:43:57 -0000      1.17
+++ conf-mode.el        18 Sep 2006 17:19:16 -0000      1.18
@@ -446,10 +446,11 @@
 (define-derived-mode conf-space-mode conf-unix-mode "Conf[Space]"
   "Conf Mode starter for space separated conf files.
 \"Assignments\" are with ` '.  Keywords before the parameters are
-recognized according to the variable `conf-space-keywords'.  Interactively
-with a prefix ARG of `0' no keywords will be recognized.  With
-any other prefix arg you will be prompted for a regexp to match
-the keywords.
+recognized according to the variable `conf-space-keywords-alist'.
+Alternatively, you can specify a value for the file local variable
+`conf-space-keywords'.
+Use the function `conf-space-keywords' if you want to specify keywords
+in an interactive fashion instead.
 
 For details see `conf-mode'.  Example:
 
@@ -469,9 +470,9 @@
   (setq conf-assignment-sign nil)
   (make-local-variable 'conf-space-keywords)
   (cond (buffer-file-name
-        ;; By setting conf-space-keywords directly, 
-        ;; we let a value in the local variables list take precedence.
-        (make-local-variable 'conf-space-keywords)
+        ;; We set conf-space-keywords directly, but a value which is
+        ;; in the local variables list or interactively specified
+        ;; (see the function conf-space-keywords) takes precedence.
          (setq conf-space-keywords
               (assoc-default buffer-file-name conf-space-keywords-alist
                              'string-match))))
@@ -480,13 +481,14 @@
   ;; recompute other things from that afterward.
   (add-hook 'hack-local-variables-hook 'conf-space-mode-internal nil t))
 
+;;;###autoload
 (defun conf-space-keywords (keywords)
   "Enter Conf Space mode using regexp KEYWORDS to match the keywords.
 See `conf-space-mode'."
   (interactive "sConf Space keyword regexp: ")
   (delay-mode-hooks
     (conf-space-mode))
-  (if (string-equal keyword "")
+  (if (string-equal keywords "")
       (setq keywords nil))
   (setq conf-space-keywords keywords)
   (conf-space-mode-internal)