/[emacs]/emacs/lisp/ediff-init.el
ViewVC logotype

Diff of /emacs/lisp/ediff-init.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.58 by eliz, Mon Apr 15 18:30:38 2002 UTC revision 1.59 by kifer, Wed Sep 18 04:23:27 2002 UTC
# Line 758  to temp files when Ediff needs to find f Line 758  to temp files when Ediff needs to find f
758    
759  (ediff-cond-compile-for-xemacs-or-emacs  (ediff-cond-compile-for-xemacs-or-emacs
760   (progn ; xemacs   (progn ; xemacs
761     (fset 'ediff-read-event (symbol-function 'next-command-event))     (defalias 'ediff-read-event 'next-command-event)
762     (fset 'ediff-overlayp (symbol-function 'extentp))     (defalias 'ediff-overlayp 'extentp)
763     (fset 'ediff-make-overlay (symbol-function 'make-extent))     (defalias 'ediff-make-overlay 'make-extent)
764     (fset 'ediff-delete-overlay (symbol-function 'delete-extent)))     (defalias 'ediff-delete-overlay 'delete-extent))
765   (progn ; emacs   (progn ; emacs
766     (fset 'ediff-read-event (symbol-function 'read-event))     (defalias 'ediff-read-event 'read-event)
767     (fset 'ediff-overlayp (symbol-function 'overlayp))     (defalias 'ediff-overlayp 'overlayp)
768     (fset 'ediff-make-overlay (symbol-function 'make-overlay))     (defalias 'ediff-make-overlay 'make-overlay)
769     (fset 'ediff-delete-overlay (symbol-function 'delete-overlay)))     (defalias 'ediff-delete-overlay 'delete-overlay))
770   )   )
771    
772  ;; Check the current version against the major and minor version numbers  ;; Check the current version against the major and minor version numbers
# Line 831  to temp files when Ediff needs to find f Line 831  to temp files when Ediff needs to find f
831  (if (ediff-window-display-p)  (if (ediff-window-display-p)
832      (ediff-cond-compile-for-xemacs-or-emacs      (ediff-cond-compile-for-xemacs-or-emacs
833       (progn   ; xemacs       (progn   ; xemacs
834         (fset 'ediff-display-pixel-width (symbol-function 'device-pixel-width))         (defalias 'ediff-display-pixel-width 'device-pixel-width)
835         (fset 'ediff-display-pixel-height         (defalias 'ediff-display-pixel-height 'device-pixel-height))
              (symbol-function 'device-pixel-height)))  
836       (progn   ; emacs       (progn   ; emacs
837         (fset 'ediff-display-pixel-width         (defalias 'ediff-display-pixel-width
838               (if (fboundp 'display-pixel-width)               (if (fboundp 'display-pixel-width)
839                   (symbol-function 'display-pixel-width)                   'display-pixel-width
840                 (symbol-function 'x-display-pixel-width)))                 'x-display-pixel-width))
841         (fset 'ediff-display-pixel-height         (defalias 'ediff-display-pixel-height
842               (if (fboundp 'display-pixel-height)               (if (fboundp 'display-pixel-height)
843                   (symbol-function 'display-pixel-height)                   'display-pixel-height
844                 (symbol-function 'x-display-pixel-height))))                 'x-display-pixel-height)))
845       ))       ))
846    
847  ;; A-list of current-diff-overlay symbols associated with buf types  ;; A-list of current-diff-overlay symbols associated with buf types
# Line 1738  Unless optional argument INPLACE is non- Line 1737  Unless optional argument INPLACE is non-
1737    
1738    
1739  (if (fboundp 'with-syntax-table)  (if (fboundp 'with-syntax-table)
1740      (fset 'ediff-with-syntax-table 'with-syntax-table)      (defalias 'ediff-with-syntax-table 'with-syntax-table)
1741    ;; stolen from subr.el in emacs 21    ;; stolen from subr.el in emacs 21
1742    (defmacro ediff-with-syntax-table (table &rest body)    (defmacro ediff-with-syntax-table (table &rest body)
1743      (let ((old-table (make-symbol "table"))      (let ((old-table (make-symbol "table"))

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26