diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/hi-lock.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7600943c445..2c2eb84ba64 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-08-31 Eli Zaretskii <eliz@is.elta.co.il> + + * hi-lock.el (hi-lock-unface-buffer): Don't call x-popup-menu if + display-popup-menus-p returns nil. + 2001-08-31 Gerd Moellmann <gerd@gnu.org> * isearch.el (isearch-mouse-2): Renamed from isearch-mouse-yank. diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 86e62eea052..6c7fb5d0c58 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -392,7 +392,7 @@ 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 (vectorp (this-command-keys)) + (if (and (display-popup-menus-p) (vectorp (this-command-keys))) (catch 'snafu (or (x-popup-menu |