Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff.el @ 16:0293115a14e9 r19-15b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 9ee227acff29
children 131b0175ea99
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch 1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
2 2
3 ;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. 3 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 ;; Created: February 2, 1994 6 ;; Created: February 2, 1994
7 ;; Keywords: comparing, merging, patching, version control. 7 ;; Keywords: comparing, merging, patching, version control.
8 8
9 (defconst ediff-version "2.64" "The current version of Ediff") 9 (defconst ediff-version "2.64" "The current version of Ediff")
10 (defconst ediff-date "January 3, 1997" "Date of last update") 10 (defconst ediff-date "January 7, 1997" "Date of last update")
11 11
12 12
13 ;; This file is part of GNU Emacs. 13 ;; This file is part of GNU Emacs.
14 14
15 ;; GNU Emacs is free software; you can redistribute it and/or modify 15 ;; GNU Emacs is free software; you can redistribute it and/or modify
107 ;;; Code: 107 ;;; Code:
108 108
109 (provide 'ediff) 109 (provide 'ediff)
110 110
111 ;; Compiler pacifier 111 ;; Compiler pacifier
112 (and noninteractive
113 (eval-when-compile
114 (load-library "dired")
115 (load-library "info")
116 (load "pcl-cvs" 'noerror)))
112 (eval-when-compile 117 (eval-when-compile
113 (let ((load-path (cons "." load-path))) 118 (let ((load-path (cons (expand-file-name ".") load-path)))
114 (load "dired")
115 (or (featurep 'ediff-init) 119 (or (featurep 'ediff-init)
116 (load "ediff-init.el" nil nil 'nosuffix)) 120 (load "ediff-init.el" nil nil 'nosuffix))
117 (or (featurep 'ediff-mult) 121 (or (featurep 'ediff-mult)
118 (load "ediff-mult.el" nil nil 'nosuffix)) 122 (load "ediff-mult.el" nil nil 'nosuffix))
119 (or (featurep 'ediff-ptch) 123 (or (featurep 'ediff-ptch)
120 (load "ediff-ptch.el" nil nil 'nosuffix)) 124 (load "ediff-ptch.el" nil nil 'nosuffix))
121 (or (featurep 'ediff-vers) 125 (or (featurep 'ediff-vers)
122 (load "ediff-vers.el" nil nil 'nosuffix)) 126 (load "ediff-vers.el" nil nil 'nosuffix))
123 (load "pcl-cvs" 'noerror)
124 )) 127 ))
125 ;; end pacifier 128 ;; end pacifier
126 129
127 (require 'ediff-init) 130 (require 'ediff-init)
128 (require 'ediff-mult) ; required because of the registry stuff 131 (require 'ediff-mult) ; required because of the registry stuff
283 ;; Setup the buffer 286 ;; Setup the buffer
284 (set buffer-name (find-file-noselect file)) 287 (set buffer-name (find-file-noselect file))
285 288
286 (ediff-eval-in-buffer (symbol-value buffer-name) 289 (ediff-eval-in-buffer (symbol-value buffer-name)
287 (widen) ; Make sure the entire file is seen 290 (widen) ; Make sure the entire file is seen
288 (cond (file-magic ;; file has handler, such as jka-compr-handler or 291 (cond (file-magic ; file has a handler, such as jka-compr-handler or
289 ;; ange-ftp-hook-function--arrange for temp file 292 ;;; ange-ftp-hook-function--arrange for temp file
290 (ediff-verify-file-buffer 'magic) 293 (ediff-verify-file-buffer 'magic)
291 (setq file 294 (setq file
292 (ediff-make-temp-file 295 (ediff-make-temp-file
293 (current-buffer) temp-file-name-prefix)) 296 (current-buffer) temp-file-name-prefix))
294 (set hooks-var (cons (` (lambda () (delete-file (, file)))) 297 (set hooks-var (cons (` (lambda () (delete-file (, file))))