diff options
| author | Glenn Morris | 2017-12-20 21:15:43 -0500 |
|---|---|---|
| committer | Glenn Morris | 2017-12-20 21:15:43 -0500 |
| commit | b1cf262a79463f28164ea1c2ffee3c657ce02ea4 (patch) | |
| tree | 4a428c5e0c026c1bb30e5972e78b145335b4b747 /test/lisp | |
| parent | a415a97461cb10d2c6710871f90f57bd1ca34ec2 (diff) | |
| parent | b3f4a3a5aee93fa2f7ad2597383befbf7b242209 (diff) | |
| download | emacs-b1cf262a79463f28164ea1c2ffee3c657ce02ea4.tar.gz emacs-b1cf262a79463f28164ea1c2ffee3c657ce02ea4.zip | |
Merge from origin/emacs-26
b3f4a3a (origin/emacs-26) Special-case %DUMBFW for GnuTLS between 3.2...
c2ae057 Work around GnuTLS version issues with %DUMBFW (tiny change)
2f9d9ef ; Remove the mention of "plain C code" in the docstring as well
aca827b Merge branch 'widen-less' into emacs-26
87548f5 ; Rephrase NEWS entry a bit
da0d773 (emacs-26) ; * lisp/erc/erc.el: Update URL.
3a60515 * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler...
471b6c1 ; Replace non-ascii quote characters in doc strings etc
7af7f5e Fix some more aliases to user options
79fb4b5 Fix some flymake aliases
b9fbc03 (origin/widen-less) Widen in indent-for-tab-command in the no...
446faf3 Replace the mention of c-indent-defun with js-indent-line
7e9eef0 Consolidate 'widen' calls
# Conflicts:
# etc/NEWS
# lisp/progmodes/flymake-proc.el
Diffstat (limited to 'test/lisp')
| -rw-r--r-- | test/lisp/mouse-tests.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/lisp/mouse-tests.el b/test/lisp/mouse-tests.el index f8c91004ecc..170df4a9b98 100644 --- a/test/lisp/mouse-tests.el +++ b/test/lisp/mouse-tests.el | |||
| @@ -26,8 +26,7 @@ | |||
| 26 | ;;; Code: | 26 | ;;; Code: |
| 27 | 27 | ||
| 28 | (ert-deftest bug23288-use-return-value () | 28 | (ert-deftest bug23288-use-return-value () |
| 29 | "If ‘mouse-on-link-p’ returns a string, its first character is | 29 | "If `mouse-on-link-p' returns a string, its first character is used." |
| 30 | used." | ||
| 31 | (cl-letf ((last-input-event '(down-mouse-1 nil 1)) | 30 | (cl-letf ((last-input-event '(down-mouse-1 nil 1)) |
| 32 | (unread-command-events '((mouse-1 nil 1))) | 31 | (unread-command-events '((mouse-1 nil 1))) |
| 33 | (mouse-1-click-follows-link t) | 32 | (mouse-1-click-follows-link t) |
| @@ -37,8 +36,8 @@ used." | |||
| 37 | (should (equal unread-command-events '(?a))))) | 36 | (should (equal unread-command-events '(?a))))) |
| 38 | 37 | ||
| 39 | (ert-deftest bug23288-translate-to-mouse-2 () | 38 | (ert-deftest bug23288-translate-to-mouse-2 () |
| 40 | "If ‘mouse-on-link-p’ doesn’t return a string or vector, | 39 | "If `mouse-on-link-p' doesn't return a string or vector, |
| 41 | translate ‘mouse-1’ events into ‘mouse-2’ events." | 40 | translate `mouse-1' events into `mouse-2' events." |
| 42 | (cl-letf ((last-input-event '(down-mouse-1 nil 1)) | 41 | (cl-letf ((last-input-event '(down-mouse-1 nil 1)) |
| 43 | (unread-command-events '((mouse-1 nil 1))) | 42 | (unread-command-events '((mouse-1 nil 1))) |
| 44 | (mouse-1-click-follows-link t) | 43 | (mouse-1-click-follows-link t) |