[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100619: * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec (Bug#7554).

[Chong Yidong]

------------------------------------------------------------
revno: 100619
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Tue 2011-08-09 17:55:34 -0400
message:
  * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec (Bug#7554).
modified:
  lisp/ChangeLog
  lisp/hi-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-28 18:40:28 +0000
+++ b/lisp/ChangeLog    2011-08-09 21:55:34 +0000
@@ -1,3 +1,8 @@
+2011-08-09  Chong Yidong  <address@hidden>
+
+       * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec
+       (Bug#7554).
+
 2011-07-28  Andreas Schwab  <address@hidden>
 
        * xt-mouse.el (xterm-mouse-event-read): Try to recover the raw

=== modified file 'lisp/hi-lock.el'
--- a/lisp/hi-lock.el   2011-01-02 23:50:46 +0000
+++ b/lisp/hi-lock.el   2011-08-09 21:55:34 +0000
@@ -461,7 +461,9 @@
 \\<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