diff options
| author | Stefan Monnier | 2014-05-31 08:32:36 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-05-31 08:32:36 -0400 |
| commit | 3a73c34c472b121f3fb4b5cdf2961a412e3eef2d (patch) | |
| tree | 1a75c9afc00bd9fd2849247c4e1ebbc0587a818c | |
| parent | 5d335d4bd6ffae58f465a09dcb23a88d7f490e86 (diff) | |
| download | emacs-3a73c34c472b121f3fb4b5cdf2961a412e3eef2d.tar.gz emacs-3a73c34c472b121f3fb4b5cdf2961a412e3eef2d.zip | |
* lisp/mouse.el (mouse-posn-property): Ignore posn-point for mode-line
clicks.
Fixes: debbugs:17633
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mouse.el | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8504fb3018a..3f803d47a76 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-05-31 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2014-05-31 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * mouse.el (mouse-posn-property): Ignore posn-point for mode-line | ||
| 4 | clicks (bug#17633). | ||
| 5 | |||
| 3 | * leim/quail/latin-pre.el ("latin-2-prefix"): Use ",," rather than ", " | 6 | * leim/quail/latin-pre.el ("latin-2-prefix"): Use ",," rather than ", " |
| 4 | for the single comma, since ", " is *very* common in normal French text | 7 | for the single comma, since ", " is *very* common in normal French text |
| 5 | (bug#17643). | 8 | (bug#17643). |
diff --git a/lisp/mouse.el b/lisp/mouse.el index 19aae2b62ad..48d25b87713 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el | |||
| @@ -658,7 +658,10 @@ its value is returned." | |||
| 658 | (str (posn-string pos))) | 658 | (str (posn-string pos))) |
| 659 | (or (and str | 659 | (or (and str |
| 660 | (get-text-property (cdr str) property (car str))) | 660 | (get-text-property (cdr str) property (car str))) |
| 661 | (and pt | 661 | ;; FIXME: mouse clicks on the mode-line come with a position in |
| 662 | ;; (nth 5). Maybe we should change the C code instead so that | ||
| 663 | ;; mouse-clicks don't include a position there! | ||
| 664 | (and pt (not (memq (posn-area pos) '(mode-line header-line))) | ||
| 662 | (get-char-property pt property w)))) | 665 | (get-char-property pt property w)))) |
| 663 | (get-char-property pos property))) | 666 | (get-char-property pos property))) |
| 664 | 667 | ||