Fix last change to use semantic-varalias-obsolete.

5 files changed, 21 insertions, 29 deletions

diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 1ab342f7676..9848d5d7965 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -269,12 +269,12 @@ This hook is for database functions which intend to swap in a tag table.
 This guarantees that the DB will go before other modes that require
 a parse of the buffer.")
 
-(define-obsolete-variable-alias 'semantic-init-hooks
-  'semantic-init-hook "23.2")
-(define-obsolete-variable-alias 'semantic-init-mode-hooks
-  'semantic-init-mode-hook "23.2")
-(define-obsolete-variable-alias 'semantic-init-db-hooks
-  'semantic-init-db-hook "23.2")
+(semantic-varalias-obsolete 'semantic-init-hooks
+                            'semantic-init-hook)
+(semantic-varalias-obsolete 'semantic-init-mode-hooks
+                            'semantic-init-mode-hook)
+(semantic-varalias-obsolete 'semantic-init-db-hooks
+                            'semantic-init-db-hook)
 
 (defvar semantic-new-buffer-fcn-was-run nil
   "Non nil after `semantic-new-buffer-fcn' has been executed.")
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 3873d0abcab..85f84167c06 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -69,15 +69,14 @@ passes a list of predicates in `semanticdb-project-predicate-functions'."
   :type nil)
 
 (defcustom semanticdb-save-database-hook nil
-  "Normal hook run after a database is saved.
+  "Hook run after a database is saved.
 Each function is called with one argument, the object representing
 the database recently written."
   :group 'semanticdb
   :type 'hook)
 
-(define-obsolete-variable-alias
-  'semanticdb-save-database-hooks
-  'semanticdb-save-database-hook "23.2")
+(semantic-varalias-obsolete 'semanticdb-save-database-hooks
+                            'semanticdb-save-database-hook)
 
 (defvar semanticdb-dir-sep-char (if (boundp 'directory-sep-char)
                                     (symbol-value 'directory-sep-char)
diff --git a/lisp/cedet/semantic/db-mode.el b/lisp/cedet/semantic/db-mode.el
index f33afbb40c7..697a87dac13 100644
--- a/lisp/cedet/semantic/db-mode.el
+++ b/lisp/cedet/semantic/db-mode.el
@@ -48,15 +48,14 @@
          (custom-set-default sym val)))
 
 (defcustom semanticdb-mode-hook nil
-  "Normal hook run whenever `global-semanticdb-minor-mode' is run.
+  "Hook run whenever `global-semanticdb-minor-mode' is run.
 Use `semanticdb-minor-mode-p' to determine if the mode has been turned
 on or off."
   :group 'semanticdb
   :type 'hook)
 
-(define-obsolete-variable-alias
-  'semanticdb-mode-hooks
-  'semanticdb-mode-hook "23.2")
+(semantic-varalias-obsolete 'semanticdb-mode-hooks
+                            'semanticdb-mode-hook)
 
 ;;; Start/Stop database use
 ;;
diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el
index b0a1c12fa79..3ee2664d7bc 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -195,11 +195,10 @@ Also make sure old decorations in the area are completely flushed."
 ;; that the next idle step will do the decoration change, but at the
 ;; time of the state change, minimal work would be done.
 (defvar semantic-decorate-pending-decoration-hook nil
-  "Functions to call with pending decoration changes.")
+  "Normal hook run to perform pending decoration changes.")
 
-(define-obsolete-variable-alias
-  'semantic-decorate-pending-decoration-hooks
-  'semantic-decorate-pending-decoration-hook "23.2")
+(semantic-varalias-obsolete 'semantic-decorate-pending-decoration-hooks
+                            'semantic-decorate-pending-decoration-hook)
 
 (defun semantic-decorate-add-pending-decoration (fcn &optional buffer)
   "Add a pending decoration change represented by FCN.
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index f220fcbb8d9..52d696af4c4 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -501,24 +501,19 @@ datasets."
 ;;   :type 'boolean)
 
 (defvar semantic-before-idle-scheduler-reparse-hook nil
-  "Normal hook run before option `semantic-idle-scheduler' begins parsing.
+  "Hook run before option `semantic-idle-scheduler' begins parsing.
 If any hook function throws an error, this variable is reset to nil.
 This hook is not protected from lexical errors.")
 
-(define-obsolete-variable-alias
-  'semantic-before-idle-scheduler-reparse-hooks
-  'semantic-before-idle-scheduler-reparse-hook
-  "23.2")
-
 (defvar semantic-after-idle-scheduler-reparse-hook nil
-  "Normal hook run after option `semantic-idle-scheduler' has parsed.
+  "Hook run after option `semantic-idle-scheduler' has parsed.
 If any hook function throws an error, this variable is reset to nil.
 This hook is not protected from lexical errors.")
 
-(define-obsolete-variable-alias
-  'semantic-after-idle-scheduler-reparse-hooks
-  'semantic-after-idle-scheduler-reparse-hook
-  "23.2")
+(semantic-varalias-obsolete 'semantic-before-idle-scheduler-reparse-hooks
+                            'semantic-before-idle-scheduler-reparse-hook)
+(semantic-varalias-obsolete 'semantic-after-idle-scheduler-reparse-hooks
+                            'semantic-after-idle-scheduler-reparse-hook)
 
 (defun semantic-idle-scheduler-refresh-tags ()
   "Refreshes the current buffer's tags.