(browse-url-event-buffer):

Function renamed from event-buffer.  Callers changed.
(browse-url-event-point): Likewise.

diff --git a/lisp/browse-url.el b/lisp/browse-url.el
index 2f6012c68dfd3d1048a307393593a864852db10f..8b00ac2603e232db448964d98760d6c8ff87ad36 100644 (file)
--- a/lisp/browse-url.el
+++ b/lisp/browse-url.el
@@ -535,15 +535,11 @@ Doesn't let you edit the URL like browse-url.  Variable
 
 ;; Define these if not already defined (XEmacs compatibility)
 
-(eval-and-compile
-  (or (fboundp 'event-buffer)
-      (defun event-buffer (event)
-       (window-buffer (posn-window (event-start event))))))
+(defun browse-url-event-buffer (event)
+  (window-buffer (posn-window (event-start event))))
 
-(eval-and-compile
-  (or (fboundp 'event-point)
-      (defun event-point (event)
-       (posn-point (event-start event)))))
+(defun browse-url-event-point (event)
+  (posn-point (event-start event)))
 
 ;;;###autoload
 (defun browse-url-at-mouse (event)
@@ -554,8 +550,8 @@ browse-url.  Variable `browse-url-browser-function' says which browser
 to use."
   (interactive "e")
   (save-excursion
-    (set-buffer (event-buffer event))
-    (goto-char (event-point event))
+    (set-buffer (browse-url-event-buffer event))
+    (goto-char (browse-url-event-point event))
     (let ((url (browse-url-url-at-point)))
       (if (string-equal url "")
          (error "No URL found"))