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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/07 04:33:43

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12392
retrieving revision 1.12393
diff -u -b -r1.12392 -r1.12393
--- ChangeLog   7 Dec 2007 04:28:30 -0000       1.12392
+++ ChangeLog   7 Dec 2007 04:33:41 -0000       1.12393
@@ -6,7 +6,7 @@
        * textmodes/ispell.el (ispell-process-line):
        * progmodes/vhdl-mode.el (vhdl-template-modify):
        * progmodes/idlw-shell.el (idlwave-shell-send-command)
-       (idlwave-shell-display-line)
+       (idlwave-shell-display-line):
        * progmodes/ada-xref.el (ada-find-file, ada-get-all-references)
        (ada-xref-find-in-modified-ali, ada-find-in-src-path):
        * net/trampver.el (x):
@@ -87,7 +87,6 @@
        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.