diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-08-07 13:51:39 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-08-07 14:50:05 +0200 |
| commit | 1f4f1358e62e2df2b15e557c0008e13d93b9393a (patch) | |
| tree | a43ab4fe5095b5851b9482bf09a8ec0fd88b43e7 /lisp/vc/ediff-init.el | |
| parent | 4439a80407d2912a126e3676c7ba9849c763caae (diff) | |
| download | emacs-1f4f1358e62e2df2b15e557c0008e13d93b9393a.tar.gz | |
Declare unused function ediff-user-grabbed-mouse obsolete
* lisp/vc/ediff-init.el (ediff-user-grabbed-mouse): Declare unused
function obsolete. As far as I can tell, this has been unused
since 1996.
* lisp/vc/ediff-wind.el (ediff-mouse-pixel-position): Make
variable obsolete. It is only used in the above obsolete funct
* lisp/vc/ediff-mult.el (ediff-filegroup-action)
(ediff-registry-action):
* lisp/vc/ediff-util.el (ediff-setup): Don't set above unused
variable.
* lisp/vc/ediff-init.el (ediff-spy-after-mouse): Make obsolete.
* lisp/vc/ediff-util.el (ediff-setup): Don't add above obsolete
function to pre-command-hook.
Diffstat (limited to 'lisp/vc/ediff-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 273bad5d353..e83a172cb84 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -1419,26 +1419,27 @@ This default should work without changes." ))) (defsubst ediff-spy-after-mouse () - (setq ediff-mouse-pixel-position (mouse-pixel-position))) + (declare (obsolete nil "29.1")) + (with-suppressed-warnings ((obsolete ediff-mouse-pixel-position)) + (setq ediff-mouse-pixel-position (mouse-pixel-position)))) -;; It is not easy to find out when the user grabs the mouse, since emacs and -;; xemacs behave differently when mouse is not in any frame. Also, this is -;; sensitive to when the user grabbed mouse. Not used for now. (defun ediff-user-grabbed-mouse () - (if ediff-mouse-pixel-position - (cond ((not (eq (car ediff-mouse-pixel-position) - (car (mouse-pixel-position))))) - ((and (car (cdr ediff-mouse-pixel-position)) - (car (cdr (mouse-pixel-position))) - (cdr (cdr ediff-mouse-pixel-position)) - (cdr (cdr (mouse-pixel-position)))) - (not (and (< (abs (- (car (cdr ediff-mouse-pixel-position)) - (car (cdr (mouse-pixel-position))))) - ediff-mouse-pixel-threshold) - (< (abs (- (cdr (cdr ediff-mouse-pixel-position)) - (cdr (cdr (mouse-pixel-position))))) - ediff-mouse-pixel-threshold)))) - (t nil)))) + (declare (obsolete nil "29.1")) + (with-suppressed-warnings ((obsolete ediff-mouse-pixel-position)) + (if ediff-mouse-pixel-position + (cond ((not (eq (car ediff-mouse-pixel-position) + (car (mouse-pixel-position))))) + ((and (car (cdr ediff-mouse-pixel-position)) + (car (cdr (mouse-pixel-position))) + (cdr (cdr ediff-mouse-pixel-position)) + (cdr (cdr (mouse-pixel-position)))) + (not (and (< (abs (- (car (cdr ediff-mouse-pixel-position)) + (car (cdr (mouse-pixel-position))))) + ediff-mouse-pixel-threshold) + (< (abs (- (cdr (cdr ediff-mouse-pixel-position)) + (cdr (cdr (mouse-pixel-position))))) + ediff-mouse-pixel-threshold)))) + (t nil))))) (define-obsolete-function-alias 'ediff-frame-char-height #'frame-char-height "27.1") |