# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1008704257 0
# Node ID 18516f8e5cffb51de5be73c5b9c8579220b9cb6b
# Parent  530136f9f1b94096829ea87b04c08d60bc701fd6
(auto-insert-alist): Redo finding C and C++ headers.
Add a DESCRIPTION for the makefile item.

diff -r 530136f9f1b9 -r 18516f8e5cff lisp/autoinsert.el
--- a/lisp/autoinsert.el	Tue Dec 18 19:36:46 2001 +0000
+++ b/lisp/autoinsert.el	Tue Dec 18 19:37:37 2001 +0000
@@ -103,13 +103,14 @@
     (("\\.\\([Cc]\\|cc\\|cpp\\)\\'" . "C / C++ program")
      nil
      "#include \""
-     ;; nop without latest cc-mode
-     (and (fboundp 'c-companion-file)
-	  ;(file-readable-p (c-companion-file 'name))
-	  (file-name-nondirectory (c-companion-file 'name))) & ?\"
-     | -10)
+     (let ((stem (file-name-sans-extension buffer-file-name)))
+       (cond ((file-exists-p (concat stem ".h"))
+	      (file-name-nondirectory (concat stem ".h")))
+	     ((file-exists-p (concat stem ".hh"))
+	      (file-name-nondirectory (concat stem ".hh")))))
+     & ?\" | -10)
 
-    ("[Mm]akefile\\'" . "makefile.inc")
+    (("[Mm]akefile\\'" . "Makefile") . "makefile.inc")
 
     (html-mode . (lambda () (sgml-tag "html")))