(calendar-basic-setup): Set day to 1 in

[gnu-emacs] / lisp / ediff-init.el

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 5bffea1ec4b7dd6b8a0832a6e93e3f6bcdbc5f6d..2fc0ceefe4dfdde1c268127ce9a62f2279d47a65 100644 (file)
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1,7 +1,7 @@
 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;     2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -1867,6 +1867,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
             (set-buffer ,old-buffer)
             (set-syntax-table ,old-table)))))))
 
+
 (provide 'ediff-init)