# HG changeset patch
# User Deepak Goel <deego@gnufans.org>
# Date 1196961903 0
# Node ID b63e2a5b45dd9cdfdac38ef6362416985dc848f3
# Parent  1d87492bc6e0a9140aca7019cb24dced43a63a4f
Resolve cvs commit conflict. (Fix buggy calls to error.)

diff -r 1d87492bc6e0 -r b63e2a5b45dd lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 06 17:24:35 2007 +0000
+++ b/lisp/ChangeLog	Thu Dec 06 17:25:03 2007 +0000
@@ -1,3 +1,15 @@
+
+2007-12-06  D. Goel  <deego3@gmail.com>
+
+
+	* textmodes/org-publish.el (org-publish-file): Fix buggy call(s) to `error'.
+	(org-publish-current-project): Ditto.
+	* textmodes/reftex-parse.el (reftex-short-context): Ditto.
+	(reftex-short-context): Ditto.
+	* textmodes/texinfmt.el: Ditto.
+
+
+
 2007-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* doc-view.el (doc-view-dvi->pdf-sentinel)
@@ -58,6 +70,7 @@
 	event of a verification failure.
 
 2007-12-05  Reiner Steib  <Reiner.Steib@gmx.de>
+>>>>>>> 1.12380
 
 	* net/tls.el (tls-program): Provide more custom choices from
 	`tls-checktrust'.  Refer to `tls-checktrust' in doc string.