diff options
| author | Joakim Verona | 2013-03-09 00:03:56 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-09 00:03:56 +0100 |
| commit | 4b882bf72aa0ed074cde5c27af51b8cf0b4d8620 (patch) | |
| tree | d32cae5604492ab5734e22a2b10084b0e2fda0ab /lisp/replace.el | |
| parent | 3a9e4f9ae9be6b16a33789a81b314e6efc7821c7 (diff) | |
| parent | 457882c20c301f076ff6a4ef7ffd78ed3d35e699 (diff) | |
| download | emacs-4b882bf72aa0ed074cde5c27af51b8cf0b4d8620.tar.gz emacs-4b882bf72aa0ed074cde5c27af51b8cf0b4d8620.zip | |
auto upstream
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 86b1aa27069..ceb0fe4a63e 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -603,15 +603,7 @@ If HISTORY is nil, `regexp-history' is used." | |||
| 603 | (append | 603 | (append |
| 604 | suggestions | 604 | suggestions |
| 605 | (list | 605 | (list |
| 606 | ;; Regexp for tag at point. | 606 | (find-tag-default-as-regexp) |
| 607 | (let* ((tagf (or find-tag-default-function | ||
| 608 | (get major-mode 'find-tag-default-function) | ||
| 609 | 'find-tag-default)) | ||
| 610 | (tag (funcall tagf))) | ||
| 611 | (cond ((not tag) "") | ||
| 612 | ((eq tagf 'find-tag-default) | ||
| 613 | (format "\\_<%s\\_>" (regexp-quote tag))) | ||
| 614 | (t (regexp-quote tag)))) | ||
| 615 | (car regexp-search-ring) | 607 | (car regexp-search-ring) |
| 616 | (regexp-quote (or (car search-ring) "")) | 608 | (regexp-quote (or (car search-ring) "")) |
| 617 | (car (symbol-value query-replace-from-history-variable))))) | 609 | (car (symbol-value query-replace-from-history-variable))))) |