aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKaroly Lorentey2004-05-24 23:42:52 +0000
committerKaroly Lorentey2004-05-24 23:42:52 +0000
commitab485478568fb7841ab3e21a33dda44a97257bfb (patch)
treea80469bfad74f25f8a7bfb04bfc8daeebc773dbb /src
parent2d2884b5c5f2e1ce27e30123111536f9db8ddfc7 (diff)
parent9f438d80644943fa78ee767eeb7cd391dfc1c2bc (diff)
downloademacs-ab485478568fb7841ab3e21a33dda44a97257bfb.tar.gz
emacs-ab485478568fb7841ab3e21a33dda44a97257bfb.zip
Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-339 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-340 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-341 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-174
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 68f74e457e9..cbbf4ab09a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-05-23 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> (tiny change)
2
3 * coding.c (Fset_safe_terminal_coding_system_internal): Set
4 suppress_error in safe_terminal_coding, not terminal_coding.
5
12004-05-22 Richard M. Stallman <rms@gnu.org> 62004-05-22 Richard M. Stallman <rms@gnu.org>
2 7
3 * alloc.c (Fmake_string): Doc fix. 8 * alloc.c (Fmake_string): Doc fix.