mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-23 branch

Browse source
This commit is contained in:
Chong Yidong 2011-08-09 18:13:11 -04:00
commit 7be1c708c5
6 changed files with 78 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/hi-lock.el
View file

@ -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