emacs-27 3a671ad: Fix regression in wisent-total-conflicts

[Lars Ingebrigtsen]

branch: emacs-27
commit 3a671ad7ede0d1459ae60d7340632d8d210b4308
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Fix regression in wisent-total-conflicts
    
    * lisp/cedet/semantic/wisent/comp.el (wisent-total-conflicts):
    There may not be a current source file.  In that case, don't try
    to keep track of the number of expected conflicts (bug#39911).
---
 lisp/cedet/semantic/wisent/comp.el | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lisp/cedet/semantic/wisent/comp.el 
b/lisp/cedet/semantic/wisent/comp.el
index 263dff9..4e9927f 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -2235,13 +2235,18 @@ there are any reduce/reduce conflicts."
 (defun wisent-total-conflicts ()
   "Report the total number of conflicts."
   (let* ((src (wisent-source))
-         (symbol (intern (format "wisent-%s--expected-conflicts"
-                                 (replace-regexp-in-string "\\.el$" "" src))
-                         obarray)))
+         (symbol
+          ;; Source files may specify how many expected conflicts
+          ;; there are.  If the number is the expected number, don't
+          ;; output warnings.
+          (and src
+               (intern (format "wisent-%s--expected-conflicts"
+                               (replace-regexp-in-string "\\.el$" "" src))))))
     (when (or (not (zerop rrc-total))
               (and (not (zerop src-total))
                    (not (= src-total (or wisent-expected-conflicts 0)))
-                   (or (not (boundp symbol))
+                   (or (null symbol)
+                       (not (boundp symbol))
                        (not (equal (symbol-value symbol) src-total)))))
       (let* ((src (if src (concat " in " src) ""))
              (msg (format "Grammar%s contains" src)))