diff options
| author | Michaël Cadilhac <michael.cadilhac@lrde.org> | 2007-08-26 19:35:16 +0000 |
|---|---|---|
| committer | Michaël Cadilhac <michael.cadilhac@lrde.org> | 2007-08-26 19:35:16 +0000 |
| commit | a2ab90da9d0739946f9bf65ca9ada0cf6f8889cb (patch) | |
| tree | b264898a5023418d38299de19aaa5df662d11bb2 /lisp | |
| parent | f8a3deedc67daa49179133d682718fe2e7f09c9a (diff) | |
| download | emacs-a2ab90da9d0739946f9bf65ca9ada0cf6f8889cb.tar.gz emacs-a2ab90da9d0739946f9bf65ca9ada0cf6f8889cb.tar.bz2 emacs-a2ab90da9d0739946f9bf65ca9ada0cf6f8889cb.zip | |
(hi-lock-unface-buffer): Show a x-menu only if the mouse was used.
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 fbdd5cd6ca5..d0c4ff7c913 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-08-26 Micha,bk(Bl Cadilhac <michael@cadilhac.name> + + * hi-lock.el (hi-lock-unface-buffer): Show a x-menu only if the mouse + was used. + 2007-08-26 Sean O'Rourke <seano@cs.ucsd.edu> * complete.el (PC-do-completion): Make RET accept a non-unique but diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 522a50b9a7f..b5e62e7a909 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -462,7 +462,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 (and (display-popup-menus-p) (vectorp (this-command-keys))) + (if (and (display-popup-menus-p) (not last-nonmenu-event)) (catch 'snafu (or (x-popup-menu |