From 842fc2d01ebf7ff2d41bce2d8a0b25c30d41941b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 19 Nov 2020 17:46:16 +0100 Subject: [PATCH] Remove some compat code from ffap.el * lisp/ffap.el (ffap-mouse-event, ffap-event-buffer): Make obsolete. (ffap-menu-ask, ffap-at-mouse): Adjust callers. --- lisp/ffap.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/ffap.el b/lisp/ffap.el index 9ad421c2777..d4bddd0574f 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -301,15 +301,14 @@ disable ffap most of the time." :version "20.3") -;;; Compatibility: -;; -;; This version of ffap supports only the Emacs it is distributed in. -;; See the ftp site for a more general version. The following -;; functions are necessary "leftovers" from the more general version. +;;; Obsolete: (defun ffap-mouse-event () ; current mouse event, or nil + (declare (obsolete nil "28.1")) (and (listp last-nonmenu-event) last-nonmenu-event)) + (defun ffap-event-buffer (event) + (declare (obsolete nil "28.1")) (window-buffer (car (event-start event)))) @@ -1736,7 +1735,9 @@ Function CONT is applied to the entry chosen by the user." (let (choice) (cond ;; Emacs mouse: - ((and (fboundp 'x-popup-menu) (ffap-mouse-event)) + ((and (fboundp 'x-popup-menu) + (listp last-nonmenu-event) + last-nonmenu-event) (setq choice (x-popup-menu t @@ -1829,7 +1830,7 @@ Return value: (ffap-guesser)))) (cond (guess - (set-buffer (ffap-event-buffer e)) + (set-buffer (window-buffer (car (event-start e)))) (ffap-highlight) (unwind-protect (progn -- 2.39.5