Add defgroup; use defcustom for user vars.

1 files changed, 23 insertions, 10 deletions

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index f030ade3f67..6a7b2b4e26e 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
 
 ;; Author: Francesco Potorti` <pot@cnuce.cnr.it>
-;; Version: $Id: cmacexp.el,v 1.25 1996/05/21 15:42:13 kwzh Exp rms $
+;; Version: $Id: cmacexp.el,v 1.26 1996/06/07 22:59:27 rms Exp rms $
 ;; Adapted-By: ESR
 ;; Keywords: c
 
@@ -90,13 +90,22 @@
 
 (provide 'cmacexp)
 
-(defvar c-macro-shrink-window-flag nil
-  "*Non-nil means shrink the *Macroexpansion* window to fit its contents.")
+(defgroup c-macro nil
+  "Expand C macros in a region."
+  :group 'c)
 
-(defvar c-macro-prompt-flag nil
-  "*Non-nil makes `c-macro-expand' prompt for preprocessor arguments.")
 
-(defvar c-macro-preprocessor
+(defcustom c-macro-shrink-window-flag nil
+  "*Non-nil means shrink the *Macroexpansion* window to fit its contents."
+  :type 'boolean
+  :group 'c-macro)
+
+(defcustom c-macro-prompt-flag nil
+  "*Non-nil makes `c-macro-expand' prompt for preprocessor arguments."
+  :type 'boolean
+  :group 'c-macro)
+
+(defcustom c-macro-preprocessor
   ;; Cannot rely on standard directory on MS-DOS to find CPP.
   (cond ((eq system-type 'ms-dos) "cpp -C")
 	;; Solaris has it in an unusual place.
@@ -108,10 +117,14 @@
   "The preprocessor used by the cmacexp package.
 
 If you change this, be sure to preserve the `-C' (don't strip comments)
-option, or to set an equivalent one.")
-
-(defvar c-macro-cppflags ""
-  "*Preprocessor flags used by `c-macro-expand'.")
+option, or to set an equivalent one."
+  :type 'string
+  :group 'c-macro)
+
+(defcustom c-macro-cppflags ""
+  "*Preprocessor flags used by `c-macro-expand'."
+  :type 'string
+  :group 'c-macro)
 
 (defconst c-macro-buffer-name "*Macroexpansion*")