Incorporate Semantic's hideif components into hideif.el (replacing advice)

* progmodes/hideif.el (hif-lookup, hif-defined): Handle
semantic-c-takeover-hideif.

2 files changed, 18 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1527307f00e..ea4affe77c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-02  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/hideif.el (hif-lookup, hif-defined): Handle
+        semantic-c-takeover-hideif.
+
 2012-10-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Change sampling interval units from ms to ns.
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 4b77c6dab1a..7bddbff9596 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -329,16 +329,23 @@ that form should be displayed.")
   "Prepend (var value) pair to hide-ifdef-env."
   (setq hide-ifdef-env (cons (cons var value) hide-ifdef-env)))
 
+(declare-function semantic-c-hideif-lookup  "semantic/bovine/c" (var))
+(declare-function semantic-c-hideif-defined "semantic/bovine/c" (var))
 
 (defun hif-lookup (var)
-  ;; (message "hif-lookup %s" var)
-  (let ((val (assoc var hide-ifdef-env)))
-    (if val
-        (cdr val)
-      hif-undefined-symbol)))
+  (or (when (bound-and-true-p semantic-c-takeover-hideif)
+        (semantic-c-hideif-lookup var))
+      (let ((val (assoc var hide-ifdef-env)))
+        (if val
+            (cdr val)
+          hif-undefined-symbol))))
 
 (defun hif-defined (var)
-   (if (assoc var hide-ifdef-env) 1 0))
+  (cond
+   ((bound-and-true-p semantic-c-takeover-hideif)
+    (semantic-c-hideif-defined var))
+   ((assoc var hide-ifdef-env) 1)
+   (t 0)))
 
 ;;===%%SF%% evaluation (End)  ===