Merged from miles@gnu.org--gnu-2005 (patch 17-26, 107-116)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-107
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-108
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-109
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-110
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-112
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-113
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-114
   <no summary provided>

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-115
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-116
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-17
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-18
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-19
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-20
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-21
   More work on moving images to etc/images

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-22
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-23
   Fix errors with image-file installation

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-24
   etc/Makefile.in (install): Put gnus-tut.txt in the right place.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-25
   etc/Makefile.in (install, uninstall): Fix installed image dirs.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-26
   etc/Makefile.in (install): Create $(etcdir)/images/gnus dir.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-296

1 files changed, 8 insertions, 5 deletions

diff --git a/lisp/ediff.el b/lisp/ediff.el
index c98974923f1..2a2b481ec59 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1,13 +1,13 @@
 ;;; ediff.el --- a comprehensive visual interface to diff & patch
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 03 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 03, 05 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.78" "The current version of Ediff")
-(defconst ediff-date "May 18, 2003" "Date of last update")  
+(defconst ediff-version "2.80" "The current version of Ediff")
+(defconst ediff-date "February 19, 2005" "Date of last update")  
 
 
 ;; This file is part of GNU Emacs.
@@ -1080,8 +1080,11 @@ lines.  For small regions, use `ediff-regions-wordwise'."
 
 (defsubst ediff-merge-on-startup ()
   (ediff-do-merge 0)
-  (ediff-with-current-buffer ediff-buffer-C
-    (set-buffer-modified-p nil)))
+  ;; Can't remember why this is here, but it may cause the automatically merged
+  ;; buffer to be lost. So, keep the buffer modified.
+  ;;(ediff-with-current-buffer ediff-buffer-C
+  ;;  (set-buffer-modified-p nil))
+  )
 
 ;;;###autoload
 (defun ediff-merge-files (file-A file-B