Merge from emacs--rel--22

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

1 files changed, 8 insertions, 1 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.