diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-08-09 18:13:11 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-08-09 18:13:11 -0400 |
| commit | 7be1c708c5abc7dea388d45454bd19bff07b7943 (patch) | |
| tree | 4d86b007b24388f25e83515bd86c42d14de9b77a /lisp/hi-lock.el | |
| parent | ebb552ed380b9f04e0c6b29374b3d32435837951 (diff) | |
| parent | 8d96c9a4e700ad17921f8d2c90f4244bfa4b98b1 (diff) | |
| download | emacs-7be1c708c5abc7dea388d45454bd19bff07b7943.tar.gz | |
Merge from emacs-23 branch
Diffstat (limited to 'lisp/hi-lock.el')
| -rw-r--r-- | lisp/hi-lock.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index a0b5844582b..a254abe33ac 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 |