* cedet/semantic/edit.el

(semantic-edits-incremental-reparse-failed-hook): Rename from
semantic-edits-incremental-reparse-failed-hooks.
(semantic-edits-incremental-fail): Use new var name.

* cedet/semantic/util-modes.el
(semantic-show-parser-state-mode-setup): Use new hook names.

3 files changed, 12 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa30f23dad1..1e17ee07ae0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,6 +13,9 @@
         (semantic-edits-move-change-hook)
         (semantic-edits-reparse-change-hooks)
         (semantic-edits-incremental-reparse-failed-hooks): Doc fixes.
+        (semantic-edits-incremental-reparse-failed-hook): Rename from
+        semantic-edits-incremental-reparse-failed-hooks.
+        (semantic-edits-incremental-fail): Use new var name.
 
         * cedet/semantic/debug.el (semantic-debug-mode): Rename hook
         symbols.
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 59a57005c7e..ab9b887f3c5 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -111,10 +111,13 @@ Functions must take one argument representing an overlay being moved.")
 Functions are called before the overlay is deleted, and after the
 incremental reparse.")
 
-(defvar semantic-edits-incremental-reparse-failed-hooks nil
-  "Abnormal hook run after the incremental parser fails.
+(defvar semantic-edits-incremental-reparse-failed-hook nil
+  "Hook run after the incremental parser fails.
 When this happens, the buffer is marked as needing a full reprase.")
 
+(semantic-varalias-obsolete 'semantic-edits-incremental-reparse-failed-hooks
+                            'semantic-edits-incremental-reparse-failed-hook)
+
 (defcustom semantic-edits-verbose-flag nil
   "Non-nil means the incremental perser is verbose.
 If nil, errors are still displayed, but informative messages are not."
@@ -467,7 +470,7 @@ a 'semantic-parse-changes-failed exception with value t."
   (when semantic-edits-verbose-flag
     (message "Force full reparse (%s)"
              (buffer-name (current-buffer))))
-  (run-hooks 'semantic-edits-incremental-reparse-failed-hooks))
+  (run-hooks 'semantic-edits-incremental-reparse-failed-hook))
 
 (defun semantic-edits-incremental-parser ()
   "Incrementally reparse the current buffer.
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index 1fbdfc8a934..b6db19a7485 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -594,8 +594,8 @@ minor mode is enabled."
         (semantic-make-local-hook 'semantic-edits-new-change-hooks)
         (add-hook 'semantic-edits-new-change-hooks
                   'semantic-show-parser-state-marker nil t)
-        (semantic-make-local-hook 'semantic-edits-incremental-reparse-failed-hooks)
-        (add-hook 'semantic-edits-incremental-reparse-failed-hooks
+        (semantic-make-local-hook 'semantic-edits-incremental-reparse-failed-hook)
+        (add-hook 'semantic-edits-incremental-reparse-failed-hook
                   'semantic-show-parser-state-marker nil t)
         (semantic-make-local-hook 'semantic-after-partial-cache-change-hook)
         (add-hook 'semantic-after-partial-cache-change-hook
@@ -625,7 +625,7 @@ minor mode is enabled."
     ;; Remove hooks
     (remove-hook 'semantic-edits-new-change-hooks
                  'semantic-show-parser-state-marker t)
-    (remove-hook 'semantic-edits-incremental-reparse-failed-hooks
+    (remove-hook 'semantic-edits-incremental-reparse-failed-hook
                  'semantic-show-parser-state-marker t)
     (remove-hook 'semantic-after-partial-cache-change-hook
                  'semantic-show-parser-state-marker t)