[Emacs-diffs] Changes to emacs/lisp/autoinsert.el

[Richard M. Stallman]

Index: emacs/lisp/autoinsert.el
diff -c emacs/lisp/autoinsert.el:1.29 emacs/lisp/autoinsert.el:1.30
*** emacs/lisp/autoinsert.el:1.29       Fri Dec  8 12:33:34 2000
--- emacs/lisp/autoinsert.el    Tue Dec 18 14:37:37 2001
***************
*** 103,115 ****
      (("\\.\\([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)
  
!     ("[Mm]akefile\\'" . "makefile.inc")
  
      (html-mode . (lambda () (sgml-tag "html")))
      
--- 103,116 ----
      (("\\.\\([Cc]\\|cc\\|cpp\\)\\'" . "C / C++ program")
       nil
       "#include \""
!      (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") . "makefile.inc")
  
      (html-mode . (lambda () (sgml-tag "html")))