diff options
| author | Kenichi Handa | 2013-07-08 20:55:58 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-07-08 20:55:58 +0900 |
| commit | 6388fe5e472c9bcfcd89b83c5818e7544502377f (patch) | |
| tree | d640898056029300e43310e82a52b82d029d1ad4 /lisp/ChangeLog | |
| parent | 0f01f02fe70b3ca67a5119acfc5357fe79b290e2 (diff) | |
| parent | 2d756ae0d8fc8c83c3705f07640b61e0583e50b4 (diff) | |
| download | emacs-6388fe5e472c9bcfcd89b83c5818e7544502377f.tar.gz emacs-6388fe5e472c9bcfcd89b83c5818e7544502377f.zip | |
merge trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c5d8b71bb8d..c34cab68426 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-07-08 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * net/shr.el (shr-map): Reinstate the `u' key binding, since it's | ||
| 4 | been used a while. | ||
| 5 | |||
| 1 | 2013-07-07 Juanma Barranquero <lekktu@gmail.com> | 6 | 2013-07-07 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * subr.el (read-quoted-char): Remove unused local variable `char'. | 8 | * subr.el (read-quoted-char): Remove unused local variable `char'. |