6 files changed, 29 insertions, 16 deletions
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 6f41ba3064f..93796bd96d3 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -149,8 +149,10 @@ compound strings."
 	 (nth 1 form))
 	(t nil)))
 
-(defvar semantic-elisp-store-documentation-in-tag nil
-  "*When non-nil, store documentation strings in the created tags.")
+(defcustom semantic-elisp-store-documentation-in-tag nil
+  "When non-nil, store documentation strings in the created tags."
+  :type 'boolean
+  :group 'semantic)
 
 (defun semantic-elisp-do-doc (str)
   "Return STR as a documentation string IF they are enabled."
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index fe90a047f86..b960e7a4d99 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1306,8 +1306,10 @@ where a valid symbol is 'system, or nil."
 ;;
 ;; These routines are for saving macro lists into an EIEIO persistent
 ;; file.
-(defvar semantic-lex-spp-macro-max-length-to-save 200
-  "*Maximum length of an SPP macro before we opt to not save it.")
+(defcustom semantic-lex-spp-macro-max-length-to-save 200
+  "Maximum length of an SPP macro before we opt to not save it."
+  :type 'integer
+  :group 'semantic)
 
 ;;;###autoload
 (defun semantic-lex-spp-table-write-slot-value (value)
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index c827fabb343..f8372e68781 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -739,8 +739,10 @@ a LOCAL option.")
 
 ;; Stack of nested blocks.
 (defvar semantic-lex-block-stack nil)
-;;(defvar semantic-lex-timeout 5
-;;  "*Number of sections of lexing before giving up.")
+;;(defcustom semantic-lex-timeout 5
+;;  "Number of sections of lexing before giving up."
+;;  :type 'integer
+;;  :group 'semantic)
 
 (defsubst semantic-lex-debug-break (token)
   "Break during lexical analysis at TOKEN."
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 0c1fe7e449b..854b72fcfdd 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -76,10 +76,12 @@
 (declare-function ede-up-directory "ede/files")
 
 ;;; Code:
-(defvar semantic-symref-tool 'detect
-  "*The active symbol reference tool name.
+(defcustom semantic-symref-tool 'detect
+  "The active symbol reference tool name.
 The tool symbol can be 'detect, or a symbol that is the name of
-a tool that can be used for symbol referencing.")
+a tool that can be used for symbol referencing."
+  :type 'symbol
+  :group 'semantic)
 (make-variable-buffer-local 'semantic-symref-tool)
 
 ;;; TOOL SETUP
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index 86058cf6986..3e46f351e12 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -187,8 +187,10 @@ If optional LEFT is non-nil insert spaces on left."
 (defvar wisent-new-log-flag nil
   "Non-nil means to start a new report.")
 
-(defvar wisent-verbose-flag nil
-  "*Non-nil means to report verbose information on generated parser.")
+(defcustom wisent-verbose-flag nil
+  "Non-nil means to report verbose information on generated parser."
+  :group 'wisent
+  :type 'boolean)
 
 (defun wisent-toggle-verbose-flag ()
   "Toggle whether to report verbose information on generated parser."
@@ -2261,12 +2263,14 @@ tables so that there is no longer a conflict."
         (setq i (1+ i))))
     rrc-count))
 
-(defvar wisent-expected-conflicts nil
-  "*If non-nil suppress the warning about shift/reduce conflicts.
+(defcustom wisent-expected-conflicts nil
+  "If non-nil suppress the warning about shift/reduce conflicts.
 It is a decimal integer N that says there should be no warning if
 there are N shift/reduce conflicts and no reduce/reduce conflicts.  A
 warning is given if there are either more or fewer conflicts, or if
-there are any reduce/reduce conflicts.")
+there are any reduce/reduce conflicts."
+  :group 'wisent
+  :type '(choice (const nil) integer))
 
 (defun wisent-total-conflicts ()
   "Report the total number of conflicts."
diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el
index 9eab8604215..2b225732517 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -127,8 +127,9 @@ POSITIONS are available."
               (apply #'max (mapcar #'cdr pl))))))
 
 ;;; Reporting
-(defvar wisent-parse-verbose-flag nil
-  "*Non-nil means to issue more messages while parsing.")
+(defcustom wisent-parse-verbose-flag nil
+  "Non-nil means to issue more messages while parsing."
+  :type 'boolean)
 
 (defun wisent-parse-toggle-verbose-flag ()
   "Toggle whether to issue more messages while parsing."