diff options
| author | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
| commit | 0c747cb143fa227e78f350ac353d703f489209df (patch) | |
| tree | 5b434055c797bd75eaa1e3d9d0773e586d44daee /src/ChangeLog.2 | |
| parent | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (diff) | |
| parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
| download | emacs-0c747cb143fa227e78f350ac353d703f489209df.tar.gz emacs-0c747cb143fa227e78f350ac353d703f489209df.zip | |
Merge from trunk
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 | ||