diff options
| author | Miles Bader <miles@gnu.org> | 2008-01-30 07:11:04 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-01-30 07:11:04 +0000 |
| commit | 02cbe062bee38a6705bafb1699d77e3c44cfafcf (patch) | |
| tree | 5baf1e4df4c3357ae78bf937e37430c593ed3337 | |
| parent | 6dcf341ad3ba1208b3401169e50c024040d95a96 (diff) | |
| parent | 4bd81fde833444fe510c465706aec4134e1ae403 (diff) | |
| download | emacs-02cbe062bee38a6705bafb1699d77e3c44cfafcf.tar.gz emacs-02cbe062bee38a6705bafb1699d77e3c44cfafcf.tar.bz2 emacs-02cbe062bee38a6705bafb1699d77e3c44cfafcf.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1024
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/files.el | 3 | ||||
| -rw-r--r-- | lisp/progmodes/etags.el | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b2f810910a1..686d54fb3cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2008-01-30 Richard Stallman <rms@gnu.org> + + * progmodes/etags.el (tags-query-replace): Delete unused optional args. + Doc fix. + + * files.el (hack-local-variables): Don't query about fake variables. + 2008-01-30 Markus Triska <markus.triska@gmx.at> * linum.el: New file. @@ -202,7 +209,7 @@ * vc.el (vc-exec-after): For mode-line-process highlighting, if `compile' is not available, fall back to font-lock-warning-face. -2008-01-26 Phil Sung <psung@mit.edu> (tiny change) +2008-01-26 Phil Sung <psung@mit.edu> (tiny change) * wdired.el (wdired-get-filename): Change `(1+ beg)' to `beg' so that the filename end is found even when the filename is empty. diff --git a/lisp/files.el b/lisp/files.el index 61af6df8a69..c790aa58810 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2839,7 +2839,8 @@ is specified, returning t if it is specified." (dolist (elt result) (let ((var (car elt)) (val (cdr elt))) - (or (eq var 'mode) + ;; Don't query about the fake variables. + (or (memq var '(mode unibyte coding)) (and (eq var 'eval) (or (eq enable-local-eval t) (hack-one-local-variable-eval-safep diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 55128933259..32aecdd8295 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1815,7 +1815,7 @@ See documentation of variable `tags-file-name'." (tags-loop-continue (or file-list-form t)))) ;;;###autoload -(defun tags-query-replace (from to &optional delimited file-list-form start end) +(defun tags-query-replace (from to &optional delimited file-list-form) "Do `query-replace-regexp' of FROM with TO on all files listed in tags table. Third arg DELIMITED (prefix arg) means replace only word-delimited matches. If you exit (\\[keyboard-quit], RET or q), you can resume the query replace @@ -1824,7 +1824,10 @@ Fourth arg FILE-LIST-FORM non-nil means initialize the replacement loop. Fifth and sixth arguments START and END are accepted, for compatibility with `query-replace-regexp', and ignored. -See also documentation of the variable `tags-file-name'." +If FILE-LIST-FORM is non-nil, it is a form to evaluate to +produce the list of files to search. + +See also the documentation of the variable `tags-file-name'." (interactive (query-replace-read-args "Tags query replace (regexp)" t t)) (setq tags-loop-scan `(let ,(unless (equal from (downcase from)) '((case-fold-search nil))) |