Fix some uses of 'use-dialog-box'

* lisp/frame.el (display-mouse-p): Fix return value on MS-Windows
in batch invocations.
* lisp/hi-lock.el (hi-lock-unface-buffer): Don't consider
'last-nonmenu-event' being nil as a mouse event, for the purpose
of using dialog boxes.

lisp/frame.el

@@ -2120,8 +2120,9 @@ frame's display)."
 	  ;; a toggle.
 	  (featurep 't-mouse)
 	  ;; No way to check whether a w32 console has a mouse, assume
-	  ;; it always does.
-	  (boundp 'w32-use-full-screen-buffer))))))
+	  ;; it always does, except in batch invocations.
+          (and (not noninteractive)
+	       (boundp 'w32-use-full-screen-buffer)))))))
 
 (defun display-popup-menus-p (&optional display)
   "Return non-nil if popup menus are supported on DISPLAY.

lisp/hi-lock.el

@@ -611,6 +611,7 @@ then remove all hi-lock highlighting."
    (cond
     (current-prefix-arg (list t))
     ((and (display-popup-menus-p)
+          last-nonmenu-event
           (listp last-nonmenu-event)
           use-dialog-box)
      (catch 'snafu