diff options
| author | Glenn Morris | 2012-12-30 10:09:01 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-12-30 10:09:01 -0800 |
| commit | d5e5e7b41166815a843148f2081d19bc14b628b2 (patch) | |
| tree | 6afd575b3a741ce26e5ec1e2665d45dfab8cbb52 /src/ChangeLog | |
| parent | 4f752957f174b5ab95ef6b9428669b1b1ecf0bab (diff) | |
| parent | 5c560880659048888420389c02e20d6867ec81df (diff) | |
| download | emacs-d5e5e7b41166815a843148f2081d19bc14b628b2.tar.gz emacs-d5e5e7b41166815a843148f2081d19bc14b628b2.zip | |
Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e95df2b8953..983ff107912 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2012-12-30 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * src/Makefile.in (TEMACS_LDFLAGS2): Remove. | ||
| 4 | (LIBS_GNUSTEP): Define. | ||
| 5 | (LIBES): Add $(LIBS_GNUSTEP). | ||
| 6 | (temacs$(EXEEXT)): Use $(LDFLAGS) instead of $(TEMACS_LDFLAGS2). | ||
| 7 | |||
| 8 | 2012-12-30 Eli Zaretskii <eliz@gnu.org> | ||
| 9 | |||
| 10 | * xdisp.c (set_cursor_from_row): Don't confuse a truncation or | ||
| 11 | continuation glyph on a TTY with an indication of an empty line. | ||
| 12 | (Bug#13277) | ||
| 13 | |||
| 1 | 2012-12-29 Eli Zaretskii <eliz@gnu.org> | 14 | 2012-12-29 Eli Zaretskii <eliz@gnu.org> |
| 2 | 15 | ||
| 3 | * fileio.c (Fset_file_selinux_context, Fset_file_acl): Return t if | 16 | * fileio.c (Fset_file_selinux_context, Fset_file_acl): Return t if |