HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update docstrings for last change.
[bpt/emacs.git]
/
lisp
/
vc
/
ediff.el
diff --git
a/lisp/vc/ediff.el
b/lisp/vc/ediff.el
index
9866f10
..
6929bfb
100644
(file)
--- a/
lisp/vc/ediff.el
+++ b/
lisp/vc/ediff.el
@@
-1,7
+1,6
@@
;;; ediff.el --- a comprehensive visual interface to diff & patch
;;; ediff.el --- a comprehensive visual interface to diff & patch
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2012 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Created: February 2, 1994
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Created: February 2, 1994
@@
-102,7
+101,7
@@
;; and on any buffer.
;; and on any buffer.
-;;; Acknowledg
e
ments:
+;;; Acknowledgments:
;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
;; Ediff would not have been possible without the help and encouragement of
;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
;; Ediff would not have been possible without the help and encouragement of
@@
-128,7
+127,7
@@
(require 'ediff-mult) ; required because of the registry stuff
(defgroup ediff nil
(require 'ediff-mult) ; required because of the registry stuff
(defgroup ediff nil
- "
A comprehensive visual interface to diff & patch
."
+ "
Comprehensive visual interface to `diff' and `patch'
."
:tag "Ediff"
:group 'tools)
:tag "Ediff"
:group 'tools)
@@
-153,7
+152,7
@@
;; Used as a startup hook to set `_orig' patch file read-only.
(defun ediff-set-read-only-in-buf-A ()
(ediff-with-current-buffer ediff-buffer-A
;; Used as a startup hook to set `_orig' patch file read-only.
(defun ediff-set-read-only-in-buf-A ()
(ediff-with-current-buffer ediff-buffer-A
- (
toggle-read-only 1
)))
+ (
setq buffer-read-only t
)))
;; Return a plausible default for ediff's first file:
;; In dired, return the file number FILENO (or 0) in the list
;; Return a plausible default for ediff's first file:
;; In dired, return the file number FILENO (or 0) in the list
@@
-492,12
+491,12
@@
If this file is a backup, `ediff' it with its original."
(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
(if (stringp buf-C-file-name)
(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
(if (stringp buf-C-file-name)
(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
-
+
(setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
file-B (ediff-make-temp-file buf-B buf-B-file-name))
(if buf-C-is-alive
(setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
(setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
file-B (ediff-make-temp-file buf-B buf-B-file-name))
(if buf-C-is-alive
(setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
-
+
(ediff-setup (get-buffer buf-A) file-A
(get-buffer buf-B) file-B
(if buf-C-is-alive (get-buffer buf-C))
(ediff-setup (get-buffer buf-A) file-A
(get-buffer buf-B) file-B
(if buf-C-is-alive (get-buffer buf-C))
@@
-543,8
+542,8
@@
expression; only file names that match the regexp are considered."
(default-regexp (eval ediff-default-filtering-regexp))
f)
(list (setq f (read-directory-name
(default-regexp (eval ediff-default-filtering-regexp))
f)
(list (setq f (read-directory-name
- "Directory A to compare:" dir-A nil 'must-match))
- (read-directory-name "Directory B to compare:"
+ "Directory A to compare:
" dir-A nil 'must-match))
+ (read-directory-name "Directory B to compare:
"
(if ediff-use-last-dir
ediff-last-dir-B
(ediff-strip-last-dir f))
(if ediff-use-last-dir
ediff-last-dir-B
(ediff-strip-last-dir f))
@@
-1073,7
+1072,7
@@
lines. For small regions, use `ediff-regions-wordwise'."
(ediff-with-current-buffer buffer-B
(setq beg-B (move-marker (make-marker) beg-B)
end-B (move-marker (make-marker) end-B)))
(ediff-with-current-buffer buffer-B
(setq beg-B (move-marker (make-marker) beg-B)
end-B (move-marker (make-marker) end-B)))
-
+
;; make file-A
(if word-mode
(ediff-wordify beg-A end-A buffer-A tmp-buffer)
;; make file-A
(if word-mode
(ediff-wordify beg-A end-A buffer-A tmp-buffer)
@@
-1085,7
+1084,7
@@
lines. For small regions, use `ediff-regions-wordwise'."
(ediff-wordify beg-B end-B buffer-B tmp-buffer)
(ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
(setq file-B (ediff-make-temp-file tmp-buffer "regB"))
(ediff-wordify beg-B end-B buffer-B tmp-buffer)
(ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
(setq file-B (ediff-make-temp-file tmp-buffer "regB"))
-
+
(setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
(setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
(ediff-setup buffer-A file-A
(setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
(setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
(ediff-setup buffer-A file-A
@@
-1349,7
+1348,7
@@
buffer."
;;;###autoload
(defun ediff-patch-file (&optional arg patch-buf)
;;;###autoload
(defun ediff-patch-file (&optional arg patch-buf)
- "
Run Ediff by patching SOURCE-FILENAME
.
+ "
Query for a file name, and then run Ediff by patching that file
.
If optional PATCH-BUF is given, use the patch in that buffer
and don't ask the user.
If prefix argument, then: if even argument, assume that the patch is in a
If optional PATCH-BUF is given, use the patch in that buffer
and don't ask the user.
If prefix argument, then: if even argument, assume that the patch is in a
@@
-1562,5
+1561,4
@@
With optional NODE, goes to that node."
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
-;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
;;; ediff.el ends here
;;; ediff.el ends here