Mercurial > emacs
diff lisp/progmodes/make-mode.el @ 109588:a9df84c12868
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 27 Jul 2010 22:51:00 +0000 |
parents | d7a517f1b312 |
children | 53205019b195 |
line wrap: on
line diff
--- a/lisp/progmodes/make-mode.el Mon Jul 26 22:54:37 2010 +0000 +++ b/lisp/progmodes/make-mode.el Tue Jul 27 22:51:00 2010 +0000 @@ -768,7 +768,7 @@ ;;; ------------------------------------------------------------ ;;;###autoload -(define-derived-mode makefile-mode nil "Makefile" +(define-derived-mode makefile-mode prog-mode "Makefile" "Major mode for editing standard Makefiles. If you are editing a file for a different make, try one of the