(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a07511a771dbba2cee9fd54429af932acbf1a698..0b355fec5f24ebffce9e67511649a5d76c2b949d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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-

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index f700ff6041d43bdffdb5e685c45bde0d790c20f5..a13103edb3d701eefb6dac6e4f5fc8607ae72750 100644 (file)
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -178,16 +178,6 @@ This hook will be installed if the variable
        (goto-char (point-min))
        (default-generic-mode)))))
 
-(defun generic-mode-ini-file-find-file-hook ()
-  "Hook function to enter Default-Generic mode automatically for INI files.
-Done if the first few lines of a file in Fundamental mode look like an
-INI file.  This hook is NOT installed by default."
-  (and (eq major-mode 'fundamental-mode)
-       (save-excursion
-        (goto-char (point-min))
-        (and (looking-at "^\\s-*\\[.*\\]")
-             (ini-generic-mode)))))
-
 (and generic-use-find-file-hook
     (add-hook 'find-file-hook 'generic-mode-find-file-hook))
 
@@ -375,8 +365,21 @@ generic-x to enable the specified modes."
       (setq imenu-generic-expression
            '((nil "^\\[\\(.*\\)\\]" 1)
              ("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))))))
-  "Generic mode for MS-Windows INI files."
-  :group 'generic-x))
+  "Generic mode for MS-Windows INI files.
+You can use `ini-generic-mode-find-file-hook' to enter this mode
+automatically for INI files whose names do not end in \".ini\"."
+  :group 'generic-x)
+
+(defun ini-generic-mode-find-file-hook ()
+  "Hook function to enter Ini-Generic mode automatically for INI files.
+Done if the first few lines of a file in Fundamental mode look
+like an INI file.  You can add this hook to `find-file-hook'."
+  (and (eq major-mode 'fundamental-mode)
+       (save-excursion
+        (goto-char (point-min))
+        (and (looking-at "^\\s-*\\[.*\\]")
+             (ini-generic-mode)))))
+(defalias 'generic-mode-ini-file-find-file-hook 'ini-generic-mode-find-file-hook))
 
 ;;; Windows REG files
 ;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax!
@@ -487,6 +490,7 @@ generic-x to enable the specified modes."
     (compile
      (concat (w32-shell-name) " -c " (buffer-file-name)))))
 
+(eval-when-compile (require 'comint))
 (defun bat-generic-mode-run-as-comint ()
   "Run the current BAT file in a comint buffer."
   (interactive)