[Emacs-diffs] /srv/bzr/emacs/trunk r110346: Incorporate Semantic's hideif components into hideif.el (replacing advice)

[Chong Yidong]

------------------------------------------------------------
revno: 110346
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-02 23:21:47 +0800
message:
  Incorporate Semantic's hideif components into hideif.el (replacing advice)
  
  * progmodes/hideif.el (hif-lookup, hif-defined): Handle
  semantic-c-takeover-hideif.
modified:
  lisp/ChangeLog
  lisp/progmodes/hideif.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-02 06:30:40 +0000
+++ b/lisp/ChangeLog    2012-10-02 15:21:47 +0000
@@ -1,3 +1,8 @@
+2012-10-02  Chong Yidong  <address@hidden>
+
+       * progmodes/hideif.el (hif-lookup, hif-defined): Handle
+       semantic-c-takeover-hideif.
+
 2012-10-02  Paul Eggert  <address@hidden>
 
        Change sampling interval units from ms to ns.

=== modified file 'lisp/progmodes/hideif.el'
--- a/lisp/progmodes/hideif.el  2012-08-22 07:17:52 +0000
+++ b/lisp/progmodes/hideif.el  2012-10-02 15:21:47 +0000
@@ -329,16 +329,23 @@
   "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)  ===