Commit 842fc2d0 authored by Stefan Kangas's avatar Stefan Kangas

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.
parent 493e19b9
Pipeline #7848 failed with stage
in 9 minutes and 23 seconds
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment