diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-08-09 17:55:34 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-08-09 17:55:34 -0400 |
| commit | 04e7a73457222f2e440e27b99c85901e616663ba (patch) | |
| tree | 65c1cb9481039293510834db67aebcd6023a20d9 | |
| parent | e63f572fb001e7a0cc9eac6ebc3a8a204349503b (diff) | |
| download | emacs-04e7a73457222f2e440e27b99c85901e616663ba.tar.gz | |
* hi-lock.el (hi-lock-unface-buffer): Fix interactive spec (Bug#7554).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/hi-lock.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 061c32d092e..78568046d34 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-08-09 Chong Yidong <cyd@stupidchicken.com> + + * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec + (Bug#7554). + 2011-07-28 Andreas Schwab <schwab@linux-m68k.org> * xt-mouse.el (xterm-mouse-event-read): Try to recover the raw diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 31d62723281..7b2f5f51260 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 |