Fix potential (goto-char nil) in byte-compile-warning-prefix

* lisp/emacs-lisp/bytecomp.el (byte-compile-warning-prefix): Replace a wrong
'or' form involving OFFSET with simply OFFSET.  This prevents OFFSET from
possibly being nil in the first branch of the containing `if' form.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 2ae9aa13bb6ac8c71079b5791d15b80738c5bc8f..198eb4df5c81a5c7e7d7ff939b33911c2db27fa3 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1246,8 +1246,7 @@ Order is by depth-first search."
                                      load-file-name dir)))
                     (t "")))
          (offset (byte-compile--warning-source-offset))
-        (pos (if (and byte-compile-current-file
-                       (or offset (not symbols-with-pos-enabled)))
+        (pos (if (and byte-compile-current-file offset)
                  (with-current-buffer byte-compile-current-buffer
                     (let (new-l new-c)
                       (save-excursion