1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00

(query-replace-read-args): Swallow space after symbols, not after

closeparens.  But avoid error if string ends there.
This commit is contained in:
Richard M. Stallman 2004-07-02 23:52:14 +00:00
parent b830b63b85
commit 9e5d1b634e

View File

@ -118,14 +118,18 @@ 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)
(= ?\( (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)