summaryrefslogtreecommitdiff
path: root/src/ChangeLog.2
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-10-14 16:32:27 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-10-14 16:32:27 +0200
commit220d91b834f7f7252b9953460422151b86b3520c (patch)
tree8f3e16983e83ac0da6beef346cb05cd2591a7f83 /src/ChangeLog.2
parent31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff)
parent9d4f32e88a1b642070f0adb41df04a0846c31970 (diff)
downloademacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/ChangeLog.2')
-rw-r--r--src/ChangeLog.28
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index f087802e27d..0397478f09d 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -1563,10 +1563,10 @@
1987-04-27 Richard Mlynarik (mly@prep)
* fileio.c (APOLLO from lnz):
- Fcopy_file, Fset_file_modes: Don't use un*x modes if
+ (Fcopy_file, Fset_file_modes): Don't use un*x modes if
env var USE_DOMAIN_ACLS is set.
- Fset_file_modes: utimes fix.
- Finsert_file_contents: Must do fstat after open for Apollo.
+ (Fset_file_modes): utimes fix.
+ (Finsert_file_contents): Must do fstat after open for Apollo.
* emacs.c (main): (APOLLO from lnz):
Don't use un*x modes if env var USE_DOMAIN_ACLS set.
@@ -2073,7 +2073,7 @@
* xfns.c (Fx_get_default): Add (unsigned char *) cast.
- * window.c: typo.
+ * window.c: Typo.
1987-02-09 Richard M. Stallman (rms@prep)