From 616c29d51d405e5f78c3f91632a3ac51b4613b5d Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 16 May 2007 07:29:38 +0000 Subject: [PATCH] Changes from arch/CVS synchronization --- lisp/ChangeLog.multi-tty | 28 +++++++++++++++++++++++++++- src/ChangeLog.multi-tty | 7 ++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty index 1eb93ca0846..16961b5d50c 100644 --- a/lisp/ChangeLog.multi-tty +++ b/lisp/ChangeLog.multi-tty @@ -10,6 +10,32 @@ * loadup.el: Only load x-dnd and x-win when X is compiled in. Load w32-win and dependencies on windows-nt. +2007-05-16 L$,1 q(Brentey K,Aa(Broly + + * env.el (getenv): Restore David Kastrup's fix. + (environment): Add optional frame parameter. + + * mule-cmds.el (set-locale-environment): Fix getenv call. + * term/rxvt.el (rxvt-set-background-mode): Ditto. + * x-win.el (x-initialize-window-system, terminal-init-xterm): Ditto. + + * server.el (server-with-environment): Restore the original + environment. + +2007-05-14 David Kastrup + + * env.el (getenv): Fix reverted by demand of Dan Nicolaescu + because it exposes further problems. + +2007-05-13 David Kastrup + + * env.el (getenv): Pass frame to getenv-internal. + +2007-05-12 L$,1 q(Brentey K,Aa(Broly + + This placeholder will be replaced by the Arch logs of the + multi-tty branch. + ;; Local Variables: ;; coding: iso-2022-7bit ;; add-log-time-zone-rule: t @@ -34,4 +60,4 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;; arch-tag: 1d1a86d3-db48-43d3-8055-73c08f87dd7a +;;; arch-tag: 58312fd6-033a-11dc-a0fb-00114368b55b diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty index b1ce49a7175..6b0987a980b 100644 --- a/src/ChangeLog.multi-tty +++ b/src/ChangeLog.multi-tty @@ -63,6 +63,11 @@ * s/ms-w32.h (SYSTEM_PURESIZE_EXTRA): Bump to 50k. +2007-05-12 L$,1 q(Brentey K,Aa(Broly + + This placeholder will be replaced by the Arch logs of the + multi-tty branch. + ;; Local Variables: ;; coding: iso-2022-7bit ;; add-log-time-zone-rule: t @@ -87,4 +92,4 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;; arch-tag: bb9cf4dd-ffe4-4cba-ad2e-9ae41830e5cb +;;; arch-tag: 4015a0e0-033e-11dc-807c-00114368b55b -- 2.39.5