bug#7554: 24.0.50; hi-lock-unface-buffer: incorrect `interactive' spec - never pops up menu

[Drew Adams]

emacs -Q
 
Load hi-lock.el.
 
Choose from the menu-bar menu: Edit > Regexp Highlighting > Highlight
Regexp...
 
Finish the dialog, so that some pattern is highlighted.
 
Choose from the menu-bar menu: Edit > Regexp Highlighting > Unhighlight
Regexp...
 
You are prompted to enter the pattern in the minibuffer, instead of
being asked to choose it from a popup menu.
 
The problem is this code in the `interactive' spec:
 
 (and (display-popup-menus-p) (not last-nonmenu-event))
 
Assume the first conjunct is true.  The second ends up being this: (not
'(menu-bar)), so it is never true.  The first part of the `if' is never
executed.  `x-popup-menu' is never called.
 
In GNU Emacs 24.0.50.1 (i386-mingw-nt5.1.2600)
 of 2010-11-30 on 3249CTO
Windowing system distributor `Microsoft Corp.', version 5.1.2600
configured using `configure --with-gcc (4.4) --no-opt --cflags
-Ic:/imagesupport/include'