2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-diff.el (ediff-diff-options): clarify docstring.
	(ediff-setup-diff-regions): disallow -u in ediff-diff-options.

	* viper-cmd.el (viper-post-command-sentinel): protect against errors in
	hooks.
	(viper-add-newline-at-eob-if-necessary): add newline only if we
	actually modify buffer; ignore errors if occur.

1 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 222a92f21c9..8ab7dbadd22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-23  Michael Kifer  <kifer@cs.stonybrook.edu>
+        
+        * ediff-diff.el (ediff-diff-options): clarify docstring.
+        (ediff-setup-diff-regions): disallow -u in ediff-diff-options.
+        
+        * viper-cmd.el (viper-post-command-sentinel): protect against errors in
+        hooks.
+        (viper-add-newline-at-eob-if-necessary): add newline only if we
+        actually modify buffer; ignore errors if occur.
+        
 2006-12-22  Mark Davies  <mark@mcs.vuw.ac.nz>
 
         * configure.in: Add support for NetBSD on x86-64, hp800 and sh3el.