Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-init.el @ 24:4103f0995bd7 r19-15b95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b95
author cvs
date Mon, 13 Aug 2007 08:51:03 +0200
parents 0293115a14e9
children 441bb1e64a06
comparison
equal deleted inserted replaced
23:0edd3412f124 24:4103f0995bd7
1154 (ediff-defvar-local ediff-temp-file-C nil 1154 (ediff-defvar-local ediff-temp-file-C nil
1155 "Temporary file used for refining difference regions in buffer C.") 1155 "Temporary file used for refining difference regions in buffer C.")
1156 1156
1157 ;;; In-line functions 1157 ;;; In-line functions
1158 1158
1159 (defsubst ediff-file-remote-p (file-name) 1159 (or (fboundp 'ediff-file-remote-p) ; user supplied his own function
1160 (require 'ange-ftp) 1160 (defun ediff-file-remote-p (file-name)
1161 (car (if ediff-xemacs-p 1161 (car (cond ((featurep 'efs) (efs-ftp-path file-name))
1162 (ange-ftp-ftp-path file-name) 1162 ((fboundp 'file-remote-p) (efs-ftp-path file-name))
1163 (ange-ftp-ftp-name file-name)))) 1163 (t (require 'ange-ftp)
1164 ;; Can happen only in Emacs, since XEmacs has file-remote-p
1165 (ange-ftp-ftp-name file-name))))))
1164 1166
1165 1167
1166 (defsubst ediff-frame-unsplittable-p (frame) 1168 (defsubst ediff-frame-unsplittable-p (frame)
1167 (cdr (assq 'unsplittable (frame-parameters frame)))) 1169 (cdr (assq 'unsplittable (frame-parameters frame))))
1168 1170
1599 (defsubst ediff-message-if-verbose (string &rest args) 1601 (defsubst ediff-message-if-verbose (string &rest args)
1600 (if ediff-verbose-p 1602 (if ediff-verbose-p
1601 (apply 'message string args))) 1603 (apply 'message string args)))
1602 1604
1603 (defun ediff-file-attributes (filename attr-number) 1605 (defun ediff-file-attributes (filename attr-number)
1604 (let ((handler (find-file-name-handler filename 'find-file-noselect))) 1606 (if (ediff-file-remote-p filename)
1605 (if (and handler (string-match "ange-ftp" (format "%S" handler))) 1607 -1
1606 -1 1608 (nth attr-number (file-attributes filename))))
1607 (nth attr-number (file-attributes filename))))) 1609
1608 (defsubst ediff-file-size (filename) 1610 (defsubst ediff-file-size (filename)
1609 (ediff-file-attributes filename 7)) 1611 (ediff-file-attributes filename 7))
1610 (defsubst ediff-file-modtime (filename) 1612 (defsubst ediff-file-modtime (filename)
1611 (ediff-file-attributes filename 5)) 1613 (ediff-file-attributes filename 5))
1612 1614