diff options
| author | Eli Zaretskii | 2010-01-16 16:13:12 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-16 16:13:12 -0500 |
| commit | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (patch) | |
| tree | 93d7479d8263fb828f95932a0cb3e3b0678fa996 /src/ChangeLog | |
| parent | b3108ead2d1691d8ad3005a6350c4febf92df2fb (diff) | |
| parent | abd5cfe880473c8da925d5b83e52c8019803d87d (diff) | |
| download | emacs-5a876cd5f810b611f78dd4cf7a1673bffeea19a9.tar.gz emacs-5a876cd5f810b611f78dd4cf7a1673bffeea19a9.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 94a1f9604f5..e1d2ba440ab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2010-01-16 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * xterm.c (event_handler_gdk): Block input (Bug#5037). | ||
| 4 | |||
| 5 | 2010-01-16 Chong Yidong <cyd@stupidchicken.com> | ||
| 6 | |||
| 7 | * emacs.c (standard_args): Adjust arg priorities to reflect how | ||
| 8 | they are processed in startup.el. | ||
| 9 | |||
| 1 | 2010-01-16 Andreas Schwab <schwab@linux-m68k.org> | 10 | 2010-01-16 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 11 | ||
| 3 | * Makefile.in (lisp, shortlisp): Update. | 12 | * Makefile.in (lisp, shortlisp): Update. |