From 2bfec7a0126b694b6ebafc064f706a9e4840ee22 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 22 Aug 2008 19:33:09 +0000
Subject: [PATCH] *** empty log message ***

---
 doc/misc/ChangeLog |  4 ++++
 lisp/ChangeLog     | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 03037829e5a..5f079bece9e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 858ac0c8308..5a4ea2f89dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
-- 
2.39.5