[Emacs-diffs] Changes to emacs/lisp/dframe.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/06/07 06:46:26

Index: dframe.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dframe.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- dframe.el   10 Apr 2007 03:58:24 -0000      1.11
+++ dframe.el   7 Jun 2007 06:46:25 -0000       1.12
@@ -152,13 +152,11 @@
 
 ;;; Compatibility functions
 ;;
-(if (fboundp 'frame-parameter)
-
-    (defalias 'dframe-frame-parameter 'frame-parameter)
-
-  (defun dframe-frame-parameter (frame parameter)
+(defun dframe-frame-parameter (frame parameter)
     "Return FRAME's PARAMETER value."
-    (cdr (assoc parameter (frame-parameters frame)))))
+  (if (fboundp 'frame-parameter)
+      (frame-parameter frame parameter)
+    (cdr (assoc parameter (frame-parameters frame))))) ; XEmacs
 
 
 ;;; Variables
@@ -887,10 +885,10 @@
 
 ;;; Interactive user functions for the mouse
 ;;
-(if dframe-xemacsp
-    (defalias 'dframe-mouse-event-p 'button-press-event-p)
-  (defun dframe-mouse-event-p (event)
+(defun dframe-mouse-event-p (event)
     "Return t if the event is a mouse related event."
+  (if (fboundp 'button-press-event-p)
+      (button-press-event-p event)      ; XEmacs
     (if (and (listp event)
             (member (event-basic-type event)
                     '(mouse-1 mouse-2 mouse-3)))