# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1219433589 0
# Node ID 1e1435da09fb9d29f840e81880e130e0030bda1d
# Parent  1f7e10e015fde55730f9260ee34ae1c425b62f36
*** empty log message ***

diff -r 1f7e10e015fd -r 1e1435da09fb doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Fri Aug 22 19:32:26 2008 +0000
+++ b/doc/misc/ChangeLog	Fri Aug 22 19:33:09 2008 +0000
@@ -1,3 +1,7 @@
+2008-08-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* trampver.texi: Update release number.
+
 2008-08-18  Brian Cully  <bjc@kublai.com>
 
 	* ns-emacs.texi: Update version.
diff -r 1f7e10e015fd -r 1e1435da09fb lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 22 19:32:26 2008 +0000
+++ b/lisp/ChangeLog	Fri Aug 22 19:33:09 2008 +0000
@@ -1,3 +1,16 @@
+2008-08-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-remote-process-environment): Add "EMACS=t"
+	and "INSIDE_EMACS=...".  Reported by Tassilo Horn
+	<tassilo@member.fsf.org>.
+
+	* net/trampver.el: Update release number.
+
+	* net/xesam.el (xesam-minor-mode): New minor mode.
+	(xesam-highlight-buffer): Remove.  Code moved to
+	`xesam-minor-mode'.
+	(xesam-refresh-entry): Use `xesam-minor-mode'.
+
 2008-08-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* minibuffer.el (completion--try-word-completion): Disable