# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1201677064 0
# Node ID eda73292b25759c2358c0c0d6a6c98fcee318c20
# Parent  3f6a9fe50ccee2466847d7168ab13b6edf46ac0e# Parent  2cbbc427dee183f0104f2ffa71aacbbe0f498393
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1024

diff -r 3f6a9fe50cce -r eda73292b257 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 30 07:07:10 2008 +0000
+++ b/lisp/ChangeLog	Wed Jan 30 07:11:04 2008 +0000
@@ -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 -r 3f6a9fe50cce -r eda73292b257 lisp/files.el
--- a/lisp/files.el	Wed Jan 30 07:07:10 2008 +0000
+++ b/lisp/files.el	Wed Jan 30 07:11:04 2008 +0000
@@ -2839,7 +2839,8 @@
 	    (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 -r 3f6a9fe50cce -r eda73292b257 lisp/progmodes/etags.el
--- a/lisp/progmodes/etags.el	Wed Jan 30 07:07:10 2008 +0000
+++ b/lisp/progmodes/etags.el	Wed Jan 30 07:11:04 2008 +0000
@@ -1815,7 +1815,7 @@
     (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 @@
 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)))