mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 02:20:21 -08:00
Code Issues Projects Releases Wiki Activity

Fix regression in wisent-total-conflicts

Browse source 
* 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).
This commit is contained in:
Lars Ingebrigtsen 2020-03-14 13:17:57 +01:00
parent dcc943be0a
commit 3a671ad7ed
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/cedet/semantic/wisent/comp.el
View file

@ -2235,13 +2235,18 @@ there are any reduce/reduce conflicts."
(defun wisent-total-conflicts () (defun wisent-total-conflicts ()
"Report the total number of conflicts." "Report the total number of conflicts."
(let* ((src (wisent-source)) (let* ((src (wisent-source))
(symbol (intern (format "wisent-%s--expected-conflicts" (symbol
(replace-regexp-in-string "\\.el$" "" src)) ;; Source files may specify how many expected conflicts
obarray))) ;; 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)) (when (or (not (zerop rrc-total))
(and (not (zerop src-total)) (and (not (zerop src-total))
(not (= src-total (or wisent-expected-conflicts 0))) (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))))) (not (equal (symbol-value symbol) src-total)))))
(let* ((src (if src (concat " in " src) "")) (let* ((src (if src (concat " in " src) ""))
(msg (format "Grammar%s contains" src))) (msg (format "Grammar%s contains" src)))