[Emacs-diffs] Changes to emacs/lisp/ediff-init.el

[Michael Kifer]

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.58 emacs/lisp/ediff-init.el:1.59
*** emacs/lisp/ediff-init.el:1.58       Mon Apr 15 14:30:38 2002
--- emacs/lisp/ediff-init.el    Wed Sep 18 00:23:27 2002
***************
*** 758,772 ****
  
  (ediff-cond-compile-for-xemacs-or-emacs
   (progn ; xemacs
!    (fset 'ediff-read-event (symbol-function 'next-command-event))
!    (fset 'ediff-overlayp (symbol-function 'extentp))
!    (fset 'ediff-make-overlay (symbol-function 'make-extent))
!    (fset 'ediff-delete-overlay (symbol-function 'delete-extent)))
   (progn ; emacs
!    (fset 'ediff-read-event (symbol-function 'read-event))
!    (fset 'ediff-overlayp (symbol-function 'overlayp))
!    (fset 'ediff-make-overlay (symbol-function 'make-overlay))
!    (fset 'ediff-delete-overlay (symbol-function 'delete-overlay)))
   )
  
  ;; Check the current version against the major and minor version numbers
--- 758,772 ----
  
  (ediff-cond-compile-for-xemacs-or-emacs
   (progn ; xemacs
!    (defalias 'ediff-read-event 'next-command-event)
!    (defalias 'ediff-overlayp 'extentp)
!    (defalias 'ediff-make-overlay 'make-extent)
!    (defalias 'ediff-delete-overlay 'delete-extent))
   (progn ; emacs
!    (defalias 'ediff-read-event 'read-event)
!    (defalias 'ediff-overlayp 'overlayp)
!    (defalias 'ediff-make-overlay 'make-overlay)
!    (defalias 'ediff-delete-overlay 'delete-overlay))
   )
  
  ;; Check the current version against the major and minor version numbers
***************
*** 831,848 ****
  (if (ediff-window-display-p)
      (ediff-cond-compile-for-xemacs-or-emacs
       (progn   ; xemacs
!        (fset 'ediff-display-pixel-width (symbol-function 'device-pixel-width))
!        (fset 'ediff-display-pixel-height
!            (symbol-function 'device-pixel-height)))
       (progn   ; emacs
!        (fset 'ediff-display-pixel-width
             (if (fboundp 'display-pixel-width)
!                (symbol-function 'display-pixel-width)
!              (symbol-function 'x-display-pixel-width)))
!        (fset 'ediff-display-pixel-height
             (if (fboundp 'display-pixel-height)
!                (symbol-function 'display-pixel-height)
!              (symbol-function 'x-display-pixel-height))))
       ))
  
  ;; A-list of current-diff-overlay symbols associated with buf types
--- 831,847 ----
  (if (ediff-window-display-p)
      (ediff-cond-compile-for-xemacs-or-emacs
       (progn   ; xemacs
!        (defalias 'ediff-display-pixel-width 'device-pixel-width)
!        (defalias 'ediff-display-pixel-height 'device-pixel-height))
       (progn   ; emacs
!        (defalias 'ediff-display-pixel-width
             (if (fboundp 'display-pixel-width)
!                'display-pixel-width
!              'x-display-pixel-width))
!        (defalias 'ediff-display-pixel-height
             (if (fboundp 'display-pixel-height)
!                'display-pixel-height
!              'x-display-pixel-height)))
       ))
  
  ;; A-list of current-diff-overlay symbols associated with buf types
***************
*** 1738,1744 ****
  
  
  (if (fboundp 'with-syntax-table)
!     (fset 'ediff-with-syntax-table 'with-syntax-table)
    ;; stolen from subr.el in emacs 21
    (defmacro ediff-with-syntax-table (table &rest body)
      (let ((old-table (make-symbol "table"))
--- 1737,1743 ----
  
  
  (if (fboundp 'with-syntax-table)
!     (defalias 'ediff-with-syntax-table 'with-syntax-table)
    ;; stolen from subr.el in emacs 21
    (defmacro ediff-with-syntax-table (table &rest body)
      (let ((old-table (make-symbol "table"))