Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-437
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-438
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-209

1 files changed, 14 insertions, 9 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index cac4470c9cd..4c381c658e5 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -118,14 +118,19 @@ strings or patterns."
                     ((eq char ?\,)
                      (setq pos (read-from-string to))
                      (push `(replace-quote ,(car pos)) list)
-                     (setq to (substring
-                               to (+ (cdr pos)
-                                     ;; Swallow a space after a symbol
-                                     ;; if there is a space.
-                                     (if (string-match
-                                          "^[^])\"] "
-                                          (substring to (1- (cdr pos))))
-                                         1 0))))))
+                     (let ((end
+                            ;; Swallow a space after a symbol
+                            ;; if there is a space.
+                            (if (and (or (symbolp (car pos))
+                                         ;; Swallow a space after 'foo
+                                         ;; but not after (quote foo).
+                                         (and (eq (car-safe (car pos)) 'quote)
+                                              (not (= ?\( (aref to 0)))))
+                                     (eq (string-match " " to (cdr pos))
+                                         (cdr pos)))
+                                (1+ (cdr pos))
+                              (cdr pos))))
+                       (setq to (substring to end)))))
               (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to)))
         (setq to (nreverse (delete "" (cons to list)))))
       (replace-match-string-symbols to)
@@ -208,7 +213,7 @@ In interactive calls, the replacement text can contain `\\,'
 followed by a Lisp expression.  Each
 replacement evaluates that expression to compute the replacement
 string.  Inside of that expression, `\\&' is a string denoting the
-whole match as a sting, `\\N' for a partial match, `\\#&' and `\\#N'
+whole match as a string, `\\N' for a partial match, `\\#&' and `\\#N'
 for the whole or a partial match converted to a number with
 `string-to-number', and `\\#' itself for the number of replacements
 done so far (starting with zero).