Merge from origin/emacs-27

e92b8e535a (origin/emacs-27) Remove raw carriage return characters fr...
5747a59a88 Recalculate default font when switching font backend
a2dd8c4234 * lisp/tab-line.el: Fix tab-line-format and tab-line-forma...
a7b8291b6c * etc/NEWS: Make the `--eval` example slightly more precise
f8254aad14 * lisp/image/image-converter.el: Support more ImageMagick ...
5beb269505 Support Unicode 13.0
3a671ad7ed Fix regression in wisent-total-conflicts

# Conflicts:
#	etc/NEWS

1 files changed, 9 insertions, 4 deletions

diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index 263dff9dcc6..4e9927f23f1 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)))