[Emacs-diffs] Changes to emacs/lisp/replace.el

[Richard M . Stallman]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.178 emacs/lisp/replace.el:1.179
*** emacs/lisp/replace.el:1.178 Thu Jul  1 09:58:44 2004
--- emacs/lisp/replace.el       Fri Jul  2 23:52:14 2004
***************
*** 118,131 ****
                    ((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))))))
              (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to)))
        (setq to (nreverse (delete "" (cons to list)))))
        (replace-match-string-symbols to)
--- 118,135 ----
                    ((eq char ?\,)
                     (setq pos (read-from-string to))
                     (push `(replace-quote ,(car pos)) list)
!                    (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)
!                                             (= ?\( (aref to 0))))
!                                    (string-match " " to (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)