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

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a42c0127ff5..509978a8127 100644
--- 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 31d62723281..7b2f5f51260 100644
--- 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