From 38ae6cf3ce1a84f46739a788b8a2a832f8d08b2a Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 22 Jun 2022 12:42:01 +0200 Subject: [PATCH] Prefer Emacs mouse button event names to XEmacs names * lisp/mwheel.el: * lisp/vc/ediff-mult.el (ediff-meta-buffer-verbose-message) (ediff-draw-dir-diffs, ediff-redraw-registry-buffer): Prefer Emacs mouse button event names to XEmacs names. --- lisp/bs.el | 1 + lisp/mwheel.el | 7 ++++--- lisp/vc/ediff-mult.el | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/bs.el b/lisp/bs.el index 3b0c8008661..00d8326115e 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -1,6 +1,7 @@ ;;; bs.el --- menu for selecting and displaying buffers -*- lexical-binding: t -*- ;; Copyright (C) 1998-2022 Free Software Foundation, Inc. + ;; Author: Olaf Sylvester ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 99ba9cb6876..9a92d42cc00 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -1,6 +1,7 @@ ;;; mwheel.el --- Mouse wheel support -*- lexical-binding:t -*- -;; Copyright (C) 1998, 2000-2022 Free Software Foundation, Inc. +;; Copyright (C) 1998-2022 Free Software Foundation, Inc. + ;; Keywords: mouse ;; Package: emacs @@ -22,7 +23,7 @@ ;;; Commentary: ;; This enables the use of the mouse wheel (or scroll wheel) in Emacs. -;; Under X11/X.Org, the wheel events are sent as button4/button5 +;; Under X11/X.Org, the wheel events are sent as mouse-4/mouse-5 ;; events. ;; Mouse wheel support is already enabled by default on most graphical @@ -32,7 +33,7 @@ ;; Implementation note: ;; -;; I for one would prefer some way of converting the button4/button5 +;; I for one would prefer some way of converting the mouse-4/mouse-5 ;; events into different event types, like 'mwheel-up' or ;; 'mwheel-down', but I cannot find a way to do this very easily (or ;; portably), so for now I just live with it. diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 48716901116..b7c349fc1cd 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -128,7 +128,7 @@ (defconst ediff-meta-buffer-verbose-message "Ediff Session Group Panel: %s Useful commands (type ? to hide them and free up screen): - button2, v, or RET over session record: start that Ediff session + mouse-2, v, or RET over session record: start that Ediff session M:\tin sessions invoked from here, brings back this group panel R:\tdisplay the registry of active Ediff sessions h:\tmark session for hiding (toggle) @@ -1236,7 +1236,7 @@ behavior." (insert "\t\t*** Directory Differences ***\n") (insert " Useful commands: - C,button2: over file name -- copy this file to directory that doesn't have it + C,mouse-2: over file name -- copy this file to directory that doesn't have it q: hide this buffer n,SPC: next line p,DEL: previous line\n\n") @@ -1429,7 +1429,7 @@ Useful commands: This is a registry of all active Ediff sessions. Useful commands: - button2, `v', RET over a session record: switch to that session + mouse-2, `v', RET over a session record: switch to that session M over a session record: display the associated session group R in any Ediff session: display session registry n,SPC: next session -- 2.39.2