Merge from trunk; add Bug#.

[gnu-emacs] / lisp / progmodes / m4-mode.el

diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index dd570ffb22881a7d4393059a1cf939d36d87fcb2..20f91ce2d9e1493dca3e86eb61dc33b4d32fb1f3 100644 (file)
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -1,7 +1,6 @@
 ;;; m4-mode.el --- m4 code editing commands for Emacs
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: Andrew Csillag <drew_csillag@geocities.com>
 ;; Maintainer: Andrew Csillag <drew_csillag@geocities.com>
@@ -81,7 +80,7 @@
   "Default font-lock-keywords for `m4 mode'.")
 
 (defcustom m4-mode-hook nil
-  "*Hook called by `m4-mode'."
+  "Hook called by `m4-mode'."
   :type 'hook
   :group 'm4)