diff options
| author | Juanma Barranquero | 2010-10-14 16:32:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-10-14 16:32:27 +0200 |
| commit | 220d91b834f7f7252b9953460422151b86b3520c (patch) | |
| tree | 8f3e16983e83ac0da6beef346cb05cd2591a7f83 /src/ChangeLog.2 | |
| parent | 31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff) | |
| parent | 9d4f32e88a1b642070f0adb41df04a0846c31970 (diff) | |
| download | emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz emacs-220d91b834f7f7252b9953460422151b86b3520c.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/ChangeLog.2')
| -rw-r--r-- | src/ChangeLog.2 | 8 |
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 @@ | |||
| 1563 | 1987-04-27 Richard Mlynarik (mly@prep) | 1563 | 1987-04-27 Richard Mlynarik (mly@prep) |
| 1564 | 1564 | ||
| 1565 | * fileio.c (APOLLO from lnz): | 1565 | * fileio.c (APOLLO from lnz): |
| 1566 | Fcopy_file, Fset_file_modes: Don't use un*x modes if | 1566 | (Fcopy_file, Fset_file_modes): Don't use un*x modes if |
| 1567 | env var USE_DOMAIN_ACLS is set. | 1567 | env var USE_DOMAIN_ACLS is set. |
| 1568 | Fset_file_modes: utimes fix. | 1568 | (Fset_file_modes): utimes fix. |
| 1569 | Finsert_file_contents: Must do fstat after open for Apollo. | 1569 | (Finsert_file_contents): Must do fstat after open for Apollo. |
| 1570 | 1570 | ||
| 1571 | * emacs.c (main): (APOLLO from lnz): | 1571 | * emacs.c (main): (APOLLO from lnz): |
| 1572 | Don't use un*x modes if env var USE_DOMAIN_ACLS set. | 1572 | Don't use un*x modes if env var USE_DOMAIN_ACLS set. |
| @@ -2073,7 +2073,7 @@ | |||
| 2073 | 2073 | ||
| 2074 | * xfns.c (Fx_get_default): Add (unsigned char *) cast. | 2074 | * xfns.c (Fx_get_default): Add (unsigned char *) cast. |
| 2075 | 2075 | ||
| 2076 | * window.c: typo. | 2076 | * window.c: Typo. |
| 2077 | 2077 | ||
| 2078 | 1987-02-09 Richard M. Stallman (rms@prep) | 2078 | 1987-02-09 Richard M. Stallman (rms@prep) |
| 2079 | 2079 | ||