emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/last-cedet-merge fa84466 07/37: semantic: Fix curr


From: David Engster
Subject: [Emacs-diffs] scratch/last-cedet-merge fa84466 07/37: semantic: Fix current symbol info
Date: Sun, 22 Jan 2017 21:26:31 +0000 (UTC)

branch: scratch/last-cedet-merge
commit fa84466d79788b0604ca66be7188d94d4b3d5a2c
Author: Eric Ludlam <address@hidden>
Commit: David Engster <address@hidden>

    semantic: Fix current symbol info
    
    * lisp/cedet/semantic/bovine/c.el
      (semantic-idle-summary-current-symbol-info): The macro symbol value
      might be a string, so support that.
---
 lisp/cedet/semantic/bovine/c.el |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 47a5457..7ec8010 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -2041,10 +2041,12 @@ have to be wrapped in that namespace."
            (setq sv (cdr sv)))
 
          ;; This is optional, and potentially fraught w/ errors.
-         (condition-case nil
-             (dolist (lt sv)
-               (setq txt (concat txt " " (semantic-lex-token-text lt))))
-           (error (setq txt (concat txt "  #error in summary fcn"))))
+         (if (stringp sv)
+             (setq txt (concat txt " " sv))
+           (condition-case nil
+               (dolist (lt sv)
+                 (setq txt (concat txt " " (semantic-lex-token-text lt))))
+             (error (setq txt (concat txt "  #error in summary fcn")))))
 
          txt)
       (semantic-idle-summary-current-symbol-info-default))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]