Index: hi-lock.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/hi-lock.el,v
retrieving revision 1.46
diff -B -w -c -r1.46 hi-lock.el
*** hi-lock.el	26 Jul 2007 05:26:25 -0000	1.46
--- hi-lock.el	20 Aug 2007 16:58:03 -0000
***************
*** 462,468 ****
  \\<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) (vectorp (this-command-keys)))
         (catch 'snafu
  	 (or
  	  (x-popup-menu
--- 462,468 ----
  \\<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))
         (catch 'snafu
  	 (or
  	  (x-popup-menu
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11583
diff -C 0 -r1.11583 ChangeLog
*** ChangeLog	20 Aug 2007 15:53:07 -0000	1.11583
--- ChangeLog	20 Aug 2007 16:58:08 -0000
***************
*** 0 ****
--- 1,5 ----
+ 2007-08-20  Michaël Cadilhac  <michael@cadilhac.name>
+ 
+ 	* hi-lock.el (hi-lock-unface-buffer): Show a x-menu only if the
+ 	mouse was used.
+