(outline-heading-end-regexp): Add defvar.

(conf-align-assignments): "?\ " -> "?\s".

1 files changed, 7 insertions, 5 deletions

diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 1a73465467a..8c009921d09 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -33,6 +33,8 @@
 
 (require 'newcomment)
 
+(defvar outline-heading-end-regexp)
+
 ;; Variables:
 
 (defgroup conf nil
@@ -229,15 +231,15 @@ whitespace.")
             (if (>= arg 0)
                 (progn
                   (indent-to-column arg)
-                  (or (not conf-assignment-space) (memq (char-before (point)) '(?  ?\t)) (insert ? ))
-                  (insert conf-assignment-sign (if (and conf-assignment-space (not (eolp))) ?\  "")))
-              (insert (if conf-assignment-space ?\  "") conf-assignment-sign)
+                  (or (not conf-assignment-space) (memq (char-before (point)) '(?\s ?\t)) (insert ?\s))
+                  (insert conf-assignment-sign (if (and conf-assignment-space (not (eolp))) ?\s "")))
+              (insert (if conf-assignment-space ?\s "") conf-assignment-sign)
               (unless (eolp)
                 (indent-to-column (- arg))
-                (or (not conf-assignment-space) (memq (char-before (point)) '(?  ?\t)) (insert ? ))))
+                (or (not conf-assignment-space) (memq (char-before (point)) '(?\s ?\t)) (insert ?\s))))
           (unless (eolp)
             (if (>= (current-column) (abs arg))
-                (insert ? )
+                (insert ?\s)
               (indent-to-column (abs arg))))))
       (forward-line))))