diff options
| author | Stefan Monnier | 2011-06-01 12:34:41 -0300 |
|---|---|---|
| committer | Stefan Monnier | 2011-06-01 12:34:41 -0300 |
| commit | fd6fa53f884d35c7fa412b492eaac4500cca2cd6 (patch) | |
| tree | 6f2226f5de5b7e7bd7c3430cff727e09a81abdb9 /lisp/mouse.el | |
| parent | ec8bd86f04daf51f8a65ed5380975185e16c9e38 (diff) | |
| download | emacs-fd6fa53f884d35c7fa412b492eaac4500cca2cd6.tar.gz emacs-fd6fa53f884d35c7fa412b492eaac4500cca2cd6.zip | |
* lisp/minibuffer.el (minibuffer-inactive-mode-map): New var.
(minibuffer-inactive-mode): New major mode.
* src/minibuf.c (get_minibuffer, read_minibuf_unwind): Call it.
* lisp/mouse.el (mouse-drag-region): Remove the "mouse-1 pops up
the *Messages* buffer" hack.
(mouse-popup-menubar): Don't burp if the event is a normal key.
Diffstat (limited to 'lisp/mouse.el')
| -rw-r--r-- | lisp/mouse.el | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index 124f84d7d73..f35069763bd 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el | |||
| @@ -278,7 +278,7 @@ The contents are the items that would be in the menu bar whether or | |||
| 278 | not it is actually displayed." | 278 | not it is actually displayed." |
| 279 | (interactive "@e \nP") | 279 | (interactive "@e \nP") |
| 280 | (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) | 280 | (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) |
| 281 | (popup-menu (mouse-menu-bar-map) event prefix)) | 281 | (popup-menu (mouse-menu-bar-map) (unless (integerp event) event) prefix)) |
| 282 | (make-obsolete 'mouse-popup-menubar 'mouse-menu-bar-map "23.1") | 282 | (make-obsolete 'mouse-popup-menubar 'mouse-menu-bar-map "23.1") |
| 283 | 283 | ||
| 284 | (defun mouse-popup-menubar-stuff (event prefix) | 284 | (defun mouse-popup-menubar-stuff (event prefix) |
| @@ -790,18 +790,9 @@ remains active. Otherwise, it remains until the next input event. | |||
| 790 | 790 | ||
| 791 | If the click is in the echo area, display the `*Messages*' buffer." | 791 | If the click is in the echo area, display the `*Messages*' buffer." |
| 792 | (interactive "e") | 792 | (interactive "e") |
| 793 | (let ((w (posn-window (event-start start-event)))) | 793 | ;; Give temporary modes such as isearch a chance to turn off. |
| 794 | (if (and (window-minibuffer-p w) | 794 | (run-hooks 'mouse-leave-buffer-hook) |
| 795 | (not (minibuffer-window-active-p w))) | 795 | (mouse-drag-track start-event t)) |
| 796 | (save-excursion | ||
| 797 | ;; Swallow the up-event. | ||
| 798 | (read-event) | ||
| 799 | (set-buffer (get-buffer-create "*Messages*")) | ||
| 800 | (goto-char (point-max)) | ||
| 801 | (display-buffer (current-buffer))) | ||
| 802 | ;; Give temporary modes such as isearch a chance to turn off. | ||
| 803 | (run-hooks 'mouse-leave-buffer-hook) | ||
| 804 | (mouse-drag-track start-event t)))) | ||
| 805 | 796 | ||
| 806 | 797 | ||
| 807 | (defun mouse-posn-property (pos property) | 798 | (defun mouse-posn-property (pos property) |