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.

diff --git a/lisp/frame.el b/lisp/frame.el
index af95a047c381bf5d5568fc47aac4a3c9b6c190f0..8138334935451fbd18623b158a5bbdcf3d7aaf2c 100644 (file)
--- a/lisp/frame.el
+++ b/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.

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 78fc5e6f716fe233bd74275731551ed6eb7746b6..5c536b190fba4f61d5cbe5169a683799380abb5c 100644 (file)
--- a/lisp/hi-lock.el
+++ b/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