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

[Stefan Monnier]

Index: emacs/lisp/progmodes/etags.el
diff -c emacs/lisp/progmodes/etags.el:1.157 emacs/lisp/progmodes/etags.el:1.158
*** emacs/lisp/progmodes/etags.el:1.157 Thu Oct 25 11:26:46 2001
--- emacs/lisp/progmodes/etags.el       Sun Dec  2 02:16:37 2001
***************
*** 29,35 ****
  ;;; Code:
  
  (require 'ring)
- (eval-when-compile (require 'cl)) ; for `gensym'
  
  ;;;###autoload
  (defvar tags-file-name nil
--- 29,34 ----
***************
*** 1362,1368 ****
  
  (defmacro tags-with-face (face &rest body)
    "Execute BODY, give output to `standard-output' face FACE."
!   (let ((pp (gensym "twf-")))
      `(let ((,pp (with-current-buffer standard-output (point))))
         ,@body
         (put-text-property ,pp (with-current-buffer standard-output (point))
--- 1361,1367 ----
  
  (defmacro tags-with-face (face &rest body)
    "Execute BODY, give output to `standard-output' face FACE."
!   (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,1729 ****
           (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)
          tags-loop-operate nil)
      (tags-loop-continue (or file-list-form t))))
  
--- 1721,1727 ----
           (null tags-loop-operate))
        ;; Continue last tags-search as if by M-,.
        (tags-loop-continue nil)
!     (setq tags-loop-scan `(re-search-forward ',regexp nil t)
          tags-loop-operate nil)
      (tags-loop-continue (or file-list-form t))))
  
***************
*** 1736,1754 ****
  
  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)))
    (tags-loop-continue (or file-list-form t)))
  
  (defun tags-complete-tags-table-file (string predicate what)
--- 1734,1747 ----
  
  See documentation of variable `tags-file-name'."
    (interactive (query-replace-read-args "Tags query replace (regexp)" t))
!   (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)