(tags-with-face): Use make-symbol.

(tags-search, tags-query-replace): Use backquotes.

1 files changed, 10 insertions, 17 deletions

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index d1e357aee5d..05fc2cd020f 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -29,7 +29,6 @@
 ;;; Code:
 
 (require 'ring)
-(eval-when-compile (require 'cl)) ; for `gensym'
 
 ;;;###autoload
 (defvar tags-file-name nil
@@ -1362,7 +1361,7 @@ where they were found."
 
 (defmacro tags-with-face (face &rest body)
   "Execute BODY, give output to `standard-output' face FACE."
-  (let ((pp (gensym "twf-")))
+  (let ((pp (make-symbol "start")))
     `(let ((,pp (with-current-buffer standard-output (point))))
        ,@body
        (put-text-property ,pp (with-current-buffer standard-output (point))
@@ -1722,8 +1721,7 @@ See documentation of variable `tags-file-name'."
            (null tags-loop-operate))
       ;; Continue last tags-search as if by M-,.
       (tags-loop-continue nil)
-    (setq tags-loop-scan
-          (list 're-search-forward (list 'quote regexp) nil t)
+    (setq tags-loop-scan `(re-search-forward ',regexp nil t)
           tags-loop-operate nil)
     (tags-loop-continue (or file-list-form t))))
 
@@ -1736,19 +1734,14 @@ with the command \\[tags-loop-continue].
 
 See documentation of variable `tags-file-name'."
   (interactive (query-replace-read-args "Tags query replace (regexp)" t))
-  (setq tags-loop-scan (list 'prog1
-                             (list 'let
-                                   (if (not (equal from (downcase from)))
-                                       '((case-fold-search nil)))
-                                   (list 'if (list 're-search-forward
-                                                   (list 'quote from) nil t)
-                                         ;; When we find a match, move back
-                                         ;; to the beginning of it so
-                                         ;; perform-replace will see it.
-                                         '(goto-char (match-beginning 0)))))
-        tags-loop-operate (list 'perform-replace
-                                (list 'quote from) (list 'quote to)
-                                t t (list 'quote delimited)))
+  (setq tags-loop-scan `(let ,(unless (equal from (downcase from))
+                                '((case-fold-search nil)))
+                          (if (re-search-forward ',from nil t)
+                              ;; When we find a match, move back
+                              ;; to the beginning of it so perform-replace
+                              ;; will see it.
+                              (goto-char (match-beginning 0))))
+        tags-loop-operate `(perform-replace ',from ',to t t ',delimited))
   (tags-loop-continue (or file-list-form t)))
 
 (defun tags-complete-tags-table-file (string predicate what)