diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-06-09 11:38:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-06-09 11:38:08 +0300 |
| commit | 7e5aab18dd427dee61fd924c16719aea5ce623a7 (patch) | |
| tree | f6e85bf549d1c18fc6ef096a221a1019650c0d1d /lisp | |
| parent | b2eb627c0db2b157fb43e8d2d40b5b2c1dd436f7 (diff) | |
| parent | e7ac2ac4e07d3fd6fee4a74a9cfc5bac9310fc18 (diff) | |
| download | emacs-7e5aab18dd427dee61fd924c16719aea5ce623a7.tar.gz emacs-7e5aab18dd427dee61fd924c16719aea5ce623a7.tar.bz2 emacs-7e5aab18dd427dee61fd924c16719aea5ce623a7.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mouse.el | 3 | ||||
| -rw-r--r-- | lisp/term/haiku-win.el | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index 6a2b1738f71..11014fa1c5f 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -3103,6 +3103,9 @@ is copied instead of being cut." ;; tooltip. (mouse-fine-grained-tracking t) (was-tooltip-mode tooltip-mode) + ;; System tooltips tend to flicker and in general work + ;; incorrectly. + (use-system-tooltips nil) ;; Whether or not some text was ``cut'' from Emacs to another ;; program and the cleaanup code should not try modifying the ;; region. diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el index 58217513902..f99d332bd2b 100644 --- a/lisp/term/haiku-win.el +++ b/lisp/term/haiku-win.el @@ -367,7 +367,7 @@ take effect on menu items until the menu bar is updated again." (setq haiku-drag-track-function #'haiku-dnd-drag-handler) (defun x-begin-drag (targets &optional action frame _return-frame - allow-current-frame _follow-tooltip) + allow-current-frame follow-tooltip) "SKIP: real doc in xfns.c." (unless haiku-dnd-selection-value (error "No local value for XdndSelection")) @@ -409,7 +409,8 @@ take effect on menu items until the menu bar is updated again." action) 'XdndActionCopy) (haiku-drag-message (or frame (selected-frame)) - message allow-current-frame)))) + message allow-current-frame + follow-tooltip)))) (add-variable-watcher 'use-system-tooltips #'haiku-use-system-tooltips-watcher) diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 0d46a895ce8..ac1007f94fe 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -896,7 +896,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (ns-get-selection selection-symbol target-type)) (defun x-begin-drag (targets &optional action frame return-frame - allow-current-frame _follow-tooltip) + allow-current-frame follow-tooltip) "SKIP: real doc in xfns.c." (unless ns-dnd-selection-value (error "No local value for XdndSelection")) @@ -921,7 +921,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (expand-file-name ns-dnd-selection-value)))) pasteboard)))) - (ns-begin-drag frame pasteboard action return-frame allow-current-frame))) + (ns-begin-drag frame pasteboard action return-frame + allow-current-frame follow-tooltip))) (defun ns-handle-drag-motion (frame x y) "Handle mouse movement on FRAME at X and Y during drag-and-drop. |