HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* pop.c (pop_stat, pop_last): Check validity of string-to-integer
[bpt/emacs.git]
/
lisp
/
ediff-diff.el
diff --git
a/lisp/ediff-diff.el
b/lisp/ediff-diff.el
index
06d7b60
..
b690bfb
100644
(file)
--- a/
lisp/ediff-diff.el
+++ b/
lisp/ediff-diff.el
@@
-1,7
+1,7
@@
;;; ediff-diff.el --- diff-related utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
;;; ediff-diff.el --- diff-related utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006, 2007
, 2008
Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
@@
-35,9
+35,9
@@
(eval-when-compile
(let ((load-path (cons (expand-file-name ".") load-path)))
(or (featurep 'ediff-init)
(eval-when-compile
(let ((load-path (cons (expand-file-name ".") load-path)))
(or (featurep 'ediff-init)
- (load "ediff-init.el" nil
nil
'nosuffix))
+ (load "ediff-init.el" nil
t
'nosuffix))
(or (featurep 'ediff-util)
(or (featurep 'ediff-util)
- (load "ediff-util.el" nil
nil
'nosuffix))
+ (load "ediff-util.el" nil
t
'nosuffix))
))
;; end pacifier
))
;; end pacifier
@@
-343,6
+343,7
@@
one optional arguments, diff-number to refine.")
(get-buffer-create (ediff-unique-buffer-name
"*ediff-errors" "*"))))
(ediff-with-current-buffer ediff-error-buffer
(get-buffer-create (ediff-unique-buffer-name
"*ediff-errors" "*"))))
(ediff-with-current-buffer ediff-error-buffer
+ (setq buffer-undo-list t)
(erase-buffer)
(insert (ediff-with-current-buffer diff-buff (buffer-string)))
(goto-char (point-min))
(erase-buffer)
(insert (ediff-with-current-buffer diff-buff (buffer-string)))
(goto-char (point-min))
@@
-947,7
+948,7
@@
delimiter regions"))
)))
)))
-(def
subst
ediff-convert-fine-diffs-to-overlays (diff-list region-num)
+(def
un
ediff-convert-fine-diffs-to-overlays (diff-list region-num)
(ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num)
(ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num)
(if ediff-3way-job
(ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num)
(ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num)
(if ediff-3way-job