Merge from emacs-24 branch

[bpt/emacs.git] / lisp / progmodes / modula2.el

diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index f0b8f7c..d634efe 100644 (file)
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -65,7 +65,7 @@
   :group 'modula2)
 
 (defcustom m2-end-comment-column 75
-  "*Column for aligning the end of a comment, in Modula-2."
+  "Column for aligning the end of a comment, in Modula-2."
   :type 'integer
   :group 'modula2)
 
@@ -104,7 +104,7 @@
   "Keymap used in Modula-2 mode.")
 
 (defcustom m2-indent 5
-  "*This variable gives the indentation in Modula-2-Mode."
+  "This variable gives the indentation in Modula-2-Mode."
   :type 'integer
   :group 'modula2)
 (put 'm2-indent 'safe-local-variable
@@ -466,7 +466,7 @@ followed by the first character of the construct.
   '(m2-var) \n _ \n \n
   '(m2-begin)
   '(m2-begin-comment)
-  " Module " str " Initialisation Code "
+  " Module " str " Initialization Code "
   '(m2-end-comment)
   \n \n "END " str "." > \n)