[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[D. Goel]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     D. Goel <deego> 07/12/06 17:25:05

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12380
retrieving revision 1.12381
diff -u -b -r1.12380 -r1.12381
--- ChangeLog   6 Dec 2007 15:04:29 -0000       1.12380
+++ ChangeLog   6 Dec 2007 17:25:03 -0000       1.12381
@@ -1,3 +1,15 @@
+
+2007-12-06  D. Goel  <address@hidden>
+
+
+       * 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  <address@hidden>
 
        * doc-view.el (doc-view-dvi->pdf-sentinel)
@@ -58,6 +70,7 @@
        event of a verification failure.
 
 2007-12-05  Reiner Steib  <address@hidden>
+>>>>>>> 1.12380
 
        * net/tls.el (tls-program): Provide more custom choices from
        `tls-checktrust'.  Refer to `tls-checktrust' in doc string.