Romain Francoise's and Ami Fischman's bugfixes.

[gnu-emacs] / lisp / progmodes / modula2.el

diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index da67a7850a4d2d0a0a59d6f770873a2965abeef5..2501f2d362e056f560fc9885810eba306a50a764 100644 (file)
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -1,10 +1,12 @@
 ;;; modula2.el --- Modula-2 editing support package
 
-;; Author: Michael Schmidt <michael@pbinfo.UUCP> 
+;; Author: Michael Schmidt <michael@pbinfo.UUCP>
 ;;     Tom Perrine <Perrin@LOGICON.ARPA>
 ;; Maintainer: FSF
 ;; Keywords: languages
 
+;; This file is part of GNU Emacs.
+
 ;; The authors distributed this without a copyright notice
 ;; back in 1988, so it is in the public domain.  The original included
 ;; the following credit:
@@ -20,21 +22,34 @@
 
 ;;; Code:
 
+(defgroup modula2 nil
+  "Major mode for editing Modula-2 code."
+  :prefix "m2-"
+  :group 'languages)
+
 ;;; Added by Tom Perrine (TEP)
 (defvar m2-mode-syntax-table nil
   "Syntax table in use in Modula-2 buffers.")
 
-(defvar m2-compile-command "m2c"
-  "Command to compile Modula-2 programs")
+(defcustom m2-compile-command "m2c"
+  "Command to compile Modula-2 programs."
+  :type 'string
+  :group 'modula2)
 
-(defvar m2-link-command "m2l"
-  "Command to link Modula-2 programs")
+(defcustom m2-link-command "m2l"
+  "Command to link Modula-2 programs."
+  :type 'string
+  :group 'modula2)
 
-(defvar m2-link-name nil
-  "Name of the executable.")
+(defcustom m2-link-name nil
+  "Name of the Modula-2 executable."
+  :type '(choice (const nil) string)
+  :group 'modula2)
 
-(defvar m2-end-comment-column nil
-  "*Column for aligning the end of a comment, in Modula-2.")
+(defcustom m2-end-comment-column 75
+  "*Column for aligning the end of a comment, in Modula-2."
+  :type 'integer
+  :group 'modula2)
 
 (if m2-mode-syntax-table
     ()
@@ -89,8 +104,11 @@
     (define-key map "\C-c\C-c" 'm2-compile)
     (setq m2-mode-map map)))
 
-(defvar m2-indent 5 "*This variable gives the indentation in Modula-2-Mode")
-  
+(defcustom m2-indent 5
+  "*This variable gives the indentation in Modula-2-Mode."
+  :type 'integer
+  :group 'modula2)
+
 ;;;###autoload
 (defun modula-2-mode ()
   "This is a mode intended to support program development in Modula-2.
@@ -123,7 +141,6 @@ followed by the first character of the construct.
   (make-local-variable 'comment-column)
   (setq comment-column 41)
   (make-local-variable 'm2-end-comment-column)
-  (setq m2-end-comment-column 75)
   (set-syntax-table m2-mode-syntax-table)
   (make-local-variable 'paragraph-start)
   (setq paragraph-start (concat "$\\|" page-delimiter))
@@ -412,7 +429,7 @@ followed by the first character of the construct.
 (defun m2-stdio ()
   (interactive)
   (insert "
-FROM TextIO IMPORT 
+FROM TextIO IMPORT
    WriteCHAR, ReadCHAR, WriteINTEGER, ReadINTEGER,
    WriteCARDINAL, ReadCARDINAL, WriteBOOLEAN, ReadBOOLEAN,
    WriteREAL, ReadREAL, WriteBITSET, ReadBITSET,
@@ -546,4 +563,5 @@ FROM SysStreams IMPORT sysIn, sysOut, sysErr;
 
 (provide 'modula2)
 
+;;; arch-tag: a21df1cb-5ece-4709-9219-1e7cd2d85d90
 ;;; modula2.el ends here