* hi-lock.el (hi-lock-unface-buffer): Fix interactive spec (Bug#7554).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a42c0127ff5b5a98cb74461130c9801b96ef0139..509978a8127ab585359e7e664cf82c7d18e2bfdc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-09  Chong Yidong  <cyd@stupidchicken.com>
+
+       * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec
+       (Bug#7554).
+
 2011-07-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * xt-mouse.el (xterm-mouse-event-read): Try to recover the raw

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 31d62723281a3519fb4e24c1686896cffc09656b..7b2f5f512608392e56c0ddda512e810e3823269e 100644 (file)
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -461,7 +461,9 @@ interactive functions.  \(See `hi-lock-interactive-patterns'.\)
 \\<minibuffer-local-must-match-map>Use \\[minibuffer-complete] to complete a partially typed regexp.
 \(See info node `Minibuffer History'.\)"
   (interactive
-   (if (and (display-popup-menus-p) (not last-nonmenu-event))
+   (if (and (display-popup-menus-p)
+           (listp last-nonmenu-event)
+           use-dialog-box)
        (catch 'snafu
         (or
          (x-popup-menu