Mercurial > emacs
comparison lisp/ediff.el @ 101721:c55394eee0de
Follow commenting conventions.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 31 Jan 2009 22:10:22 +0000 |
parents | a9dc0e7c3f2b |
children | affb617d6101 |
comparison
equal
deleted
inserted
replaced
101720:02a61aa59953 | 101721:c55394eee0de |
---|---|
271 | 271 |
272 ;;;###autoload | 272 ;;;###autoload |
273 (defalias 'ediff3 'ediff-files3) | 273 (defalias 'ediff3 'ediff-files3) |
274 | 274 |
275 | 275 |
276 ;; Visit FILE and arrange its buffer to Ediff's liking. | |
277 ;; FILE is actually a variable symbol that must contain a true file name. | |
278 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into | |
279 ;; which FILE is read. | |
280 ;; LAST-DIR is the directory variable symbol where FILE's | |
281 ;; directory name should be returned. HOOKS-VAR is a variable symbol that will | |
282 ;; be assigned the hook to be executed after `ediff-startup' is finished. | |
283 ;; `ediff-find-file' arranges that the temp files it might create will be | |
284 ;; deleted. | |
285 (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 "Visit FILE and arrange its buffer to Ediff's liking. | |
278 FILE-VAR is actually a variable symbol whose value must contain a true | |
279 file name. | |
280 BUFFER-NAME is a variable symbol, which will get the buffer object into | |
281 which FILE is read. | |
282 LAST-DIR is the directory variable symbol where FILE's | |
283 directory name should be returned. HOOKS-VAR is a variable symbol that will | |
284 be assigned the hook to be executed after `ediff-startup' is finished. | |
285 `ediff-find-file' arranges that the temp files it might create will be | |
286 deleted." | |
286 (let* ((file (symbol-value file-var)) | 287 (let* ((file (symbol-value file-var)) |
287 (file-magic (ediff-filename-magic-p file)) | 288 (file-magic (ediff-filename-magic-p file)) |
288 (temp-file-name-prefix (file-name-nondirectory file))) | 289 (temp-file-name-prefix (file-name-nondirectory file))) |
289 (cond ((not (file-readable-p file)) | 290 (cond ((not (file-readable-p file)) |
290 (error "File `%s' does not exist or is not readable" file)) | 291 (error "File `%s' does not exist or is not readable" file)) |
1502 (require 'ediff-util) | 1503 (require 'ediff-util) |
1503 | 1504 |
1504 (run-hooks 'ediff-load-hook) | 1505 (run-hooks 'ediff-load-hook) |
1505 | 1506 |
1506 | 1507 |
1507 ;;; Local Variables: | 1508 ;; Local Variables: |
1508 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 1509 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
1509 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 1510 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
1510 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 1511 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
1511 ;;; End: | 1512 ;; End: |
1512 | 1513 |
1513 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc | 1514 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc |
1514 ;;; ediff.el ends here | 1515 ;;; ediff.el ends here |