diff options
| author | Joakim Verona | 2013-08-16 11:56:56 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-16 11:56:56 +0200 |
| commit | 4f89fdfb1a480d29b60956f93dfadb3c0fcbff46 (patch) | |
| tree | f1c19b2bfdd341e82b2e1ea315e0363e7bf360ba /lisp/ChangeLog | |
| parent | 1ac42cc43738e69ea75933b9801cdb194f6e37c7 (diff) | |
| parent | 3dfc5cd613bccbc6027ab79ca3aa2218cbe0ab63 (diff) | |
| download | emacs-4f89fdfb1a480d29b60956f93dfadb3c0fcbff46.tar.gz emacs-4f89fdfb1a480d29b60956f93dfadb3c0fcbff46.zip | |
merge from 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 5edb462adb5..11b465ba991 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-16 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.el (mouse-autoselect-window-select): Do autoselect when | ||
| 4 | mouse pointer is on margin. | ||
| 5 | |||
| 1 | 2013-08-16 William Parsons <wbparsons@alum.mit.edu> (tiny change) | 6 | 2013-08-16 William Parsons <wbparsons@alum.mit.edu> (tiny change) |
| 2 | 7 | ||
| 3 | * net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV. (Bug#1972) | 8 | * net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV. (Bug#1972) |