(PC-do-completion): Use regexp-quote.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb8f3cdd4efcf5e3059ceb2870a6ab258e1dd46e..f0dd5ed82f57ca10a7ef6a6bbcdac8caa80dc3b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-26  Johan Bockg\e$(Q)[\e(Brd  <bojohan@gnu.org>
+
+       * complete.el (PC-do-completion): Use regexp-quote.
+
 2008-03-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc-cvs.el (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect

diff --git a/lisp/complete.el b/lisp/complete.el
index cbc678de9771a3b35c9a40a850fd7f9b08041b72..da75ed2dbe138a1d42ba55bf908d65526467094d 100644 (file)
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -621,8 +621,10 @@ GOTO-END is non-nil, however, it instead replaces up to END."
                                                    (match-string 2 str)
                                                    "[A-Za-z0-9]*[^A-Za-z0-9]"))
                           p (1+ (length (match-string 1 str))))))
-                (setq regex (concat "\\`" (mapconcat #'list str "[^-]*-"))
-                      p 1))))
+             (setq regex (concat "\\`" (mapconcat (lambda (c)
+                                                    (regexp-quote (string c)))
+                                                  str "[^-]*-"))
+                   p 1))))
         (when p
        ;; Use all-completions to do an initial cull.  This is a big win,
        ;; since all-completions is written in C!