[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.65 emacs/lisp/ediff-init.el:1.66
*** emacs/lisp/ediff-init.el:1.65       Fri Sep 17 21:26:20 2004
--- emacs/lisp/ediff-init.el    Sat Feb 19 04:46:24 2005
***************
*** 895,901 ****
         (sit-for 1)))))
  
  (defun ediff-hide-face (face)
!   (if (and (ediff-has-face-support-p) (boundp 'add-to-list)
           (boundp 'facemenu-unlisted-faces))
        (add-to-list 'facemenu-unlisted-faces face)))
  
--- 895,902 ----
         (sit-for 1)))))
  
  (defun ediff-hide-face (face)
!   (if (and (ediff-has-face-support-p)
!          (boundp 'add-to-list)
           (boundp 'facemenu-unlisted-faces))
        (add-to-list 'facemenu-unlisted-faces face)))
  
***************
*** 1404,1410 ****
  ;;; Misc
  
  ;; if nil, this silences some messages
! (defvar ediff-verbose-p t)
  
  (defcustom ediff-autostore-merges  'group-jobs-only
    "*Save the results of merge jobs automatically.
--- 1405,1411 ----
  ;;; Misc
  
  ;; if nil, this silences some messages
! (defconst ediff-verbose-p t)
  
  (defcustom ediff-autostore-merges  'group-jobs-only
    "*Save the results of merge jobs automatically.
***************
*** 1473,1483 ****
  (ediff-defvar-local ediff-temp-file-C nil "")
  
  
- ;; If file-remote-p is defined (as in XEmacs, use it. Otherwise, check
- ;; if find-file-name-handler is defined for 'file-local-copy
  (defun ediff-file-remote-p (file-name)
!   (or (and (fboundp 'file-remote-p) (file-remote-p file-name))
!       (find-file-name-handler file-name 'file-local-copy)))
  
  ;; File for which we can get attributes, such as size or date
  (defun ediff-listable-file (file-name)
--- 1474,1481 ----
  (ediff-defvar-local ediff-temp-file-C nil "")
  
  
  (defun ediff-file-remote-p (file-name)
!   (file-remote-p file-name))
  
  ;; File for which we can get attributes, such as size or date
  (defun ediff-listable-file (file-name)