Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff.el @ 187:b405438285a2 r20-3b20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b20
author cvs
date Mon, 13 Aug 2007 09:56:28 +0200
parents 3d6bfa290dbd
children acd284d43ca1
comparison
equal deleted inserted replaced
186:24ac94803b48 187:b405438285a2
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.67" "The current version of Ediff") 9 (defconst ediff-version "2.67" "The current version of Ediff")
10 (defconst ediff-date "August 7, 1997" "Date of last update") 10 (defconst ediff-date "September 3, 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
273 ;; be assigned the hook to be executed after `ediff-startup' is finished. 273 ;; be assigned the hook to be executed after `ediff-startup' is finished.
274 ;; `ediff-find-file' arranges that the temp files it might create will be 274 ;; `ediff-find-file' arranges that the temp files it might create will be
275 ;; deleted. 275 ;; deleted.
276 (defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var) 276 (defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var)
277 (let* ((file (symbol-value file-var)) 277 (let* ((file (symbol-value file-var))
278 (file-magic (find-file-name-handler file 'find-file-noselect)) 278 (file-magic (ediff-filename-magic-p file))
279 (temp-file-name-prefix (file-name-nondirectory file))) 279 (temp-file-name-prefix (file-name-nondirectory file)))
280 (cond ((not (file-readable-p file)) 280 (cond ((not (file-readable-p file))
281 (error "File `%s' does not exist or is not readable" file)) 281 (error "File `%s' does not exist or is not readable" file))
282 ((file-directory-p file) 282 ((file-directory-p file)
283 (error "File `%s' is a directory" file))) 283 (error "File `%s' is a directory" file)))
1180 (expand-file-name 1180 (expand-file-name
1181 (buffer-file-name patch-buf)))) 1181 (buffer-file-name patch-buf))))
1182 (t default-directory))) 1182 (t default-directory)))
1183 (setq source-file 1183 (setq source-file
1184 ;; the default is the directory, not the visited file name 1184 ;; the default is the directory, not the visited file name
1185 (ediff-read-file-name "Which file to patch? " source-dir source-dir)) 1185 (ediff-read-file-name
1186 "Which file to patch? " source-dir (ediff-get-default-file-name)))
1186 (ediff-dispatch-file-patching-job patch-buf source-file))) 1187 (ediff-dispatch-file-patching-job patch-buf source-file)))
1187 1188
1188 ;;;###autoload 1189 ;;;###autoload
1189 (defun ediff-patch-buffer () 1190 (defun ediff-patch-buffer ()
1190 "Run Ediff by patching BUFFER-NAME." 1191 "Run Ediff by patching BUFFER-NAME."
1194 (setq patch-buf (ediff-get-patch-buffer)) 1195 (setq patch-buf (ediff-get-patch-buffer))
1195 (ediff-patch-buffer-internal 1196 (ediff-patch-buffer-internal
1196 patch-buf 1197 patch-buf
1197 (read-buffer "Which buffer to patch? " 1198 (read-buffer "Which buffer to patch? "
1198 (cond ((eq patch-buf (current-buffer)) 1199 (cond ((eq patch-buf (current-buffer))
1199 (window-buffer (other-window 1))) 1200 (ediff-other-buffer (current-buffer)))
1200 (t (current-buffer))) 1201 (t (current-buffer)))
1201 'must-match)))) 1202 'must-match))))
1202 1203
1203 ;;;###autoload 1204 ;;;###autoload
1204 (defalias 'epatch 'ediff-patch-file) 1205 (defalias 'epatch 'ediff-patch-file)