diff options
| author | Joakim Verona | 2013-08-13 09:58:43 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 09:58:43 +0200 |
| commit | b795172d4c222b4fec6f9dbf1be726d27ca56df1 (patch) | |
| tree | 53c35e4f706cc58e155b44ee9801a08f614b042e /lisp/ChangeLog | |
| parent | 7f502f7b6fc418af15408709cad4dc3dda8db583 (diff) | |
| parent | f0024d8c0dbe5dcb2551bf2433af39ffe7cb8f7a (diff) | |
| download | emacs-b795172d4c222b4fec6f9dbf1be726d27ca56df1.tar.gz emacs-b795172d4c222b4fec6f9dbf1be726d27ca56df1.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7951188bbaf..a3b657b23ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2013-08-13 Glenn Morris <rgm@gnu.org> | 1 | 2013-08-13 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * mail/feedmail.el (feedmail-confirm-outgoing) | ||
| 4 | (feedmail-display-full-frame, feedmail-deduce-bcc-where): Fix types. | ||
| 5 | |||
| 6 | * cus-start.el (truncate-partial-width-windows): Fix type. | ||
| 7 | |||
| 8 | * emulation/viper-init.el (viper-search-scroll-threshold): Fix type. | ||
| 9 | |||
| 3 | * net/shr.el (shr-table-horizontal-line): Fix custom type. | 10 | * net/shr.el (shr-table-horizontal-line): Fix custom type. |
| 4 | 11 | ||
| 5 | 2013-08-13 Stefan Monnier <monnier@iro.umontreal.ca> | 12 | 2013-08-13 Stefan Monnier <monnier@iro.umontreal.ca> |