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

[Juri Linkov]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.176 emacs/lisp/replace.el:1.177
*** emacs/lisp/replace.el:1.176 Sat Jun 26 18:35:18 2004
--- emacs/lisp/replace.el       Mon Jun 28 23:03:06 2004
***************
*** 109,131 ****
                    ((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-string 0))))
!                                    (equal " " (substring to-string (cdr pos)
!                                                          (1+ (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)
!       (setq to (cons 'replace-eval-replacement 
                     (if (> (length to) 1)
                         (cons 'concat to)
                       (car to)))))
--- 109,126 ----
                    ((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)
!       (setq to (cons 'replace-eval-replacement
                     (if (> (length to) 1)
                         (cons 'concat to)
                       (car to)))))
***************
*** 1397,1403 ****
                        ((eq def 'act-and-exit)
                         (or replaced
                             (setq noedit
!                                  (replace-match-maybe-edit 
                                    next-replacement nocasify literal
                                    noedit real-match-data)
                                   replace-count (1+ replace-count)))
--- 1392,1398 ----
                        ((eq def 'act-and-exit)
                         (or replaced
                             (setq noedit
!                                  (replace-match-maybe-edit
                                    next-replacement nocasify literal
                                    noedit real-match-data)
                                   replace-count (1+ replace-count)))