# HG changeset patch
# User Lute Kamstra <lute@gnu.org>
# Date 1113384297 0
# Node ID b338826f6203ea01d0b52b82aae0975713e97f68
# Parent  0428c421c463e0372cf8e3772545ce0dab8f2ba7
*** empty log message ***

diff -r 0428c421c463 -r b338826f6203 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Apr 13 09:21:49 2005 +0000
+++ b/lisp/ChangeLog	Wed Apr 13 09:24:57 2005 +0000
@@ -1,3 +1,18 @@
+2005-04-13  Lute Kamstra  <lute@gnu.org>
+
+	* generic-x.el (generic-mode-ini-file-find-file-hook):
+	Rename to ini-generic-mode-find-file-hook.
+	Keep generic-mode-ini-file-find-file-hook as an alias.
+	(ini-generic-mode-find-file-hook): Rename from
+	generic-mode-ini-file-find-file-hook.  Fix docstring.
+	(ini-generic-mode): Docstring change.
+	(bat-generic-mode-run-as-comint): Silence the byte compiler.
+
+	* help.el (describe-key-briefly): UNTRANSLATED can be nil when
+	called from lisp.
+
+	* generic.el: Move to the emacs-lisp subdir.
+
 2005-04-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* term/xterm.el (function-key-map): Add mappings for A-, C-, S-