diff options
| author | Glenn Morris | 2012-05-14 09:11:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-05-14 09:11:24 -0700 |
| commit | 2f4cadd1da7b681171c60fab8499f23f37ce4cb2 (patch) | |
| tree | 0091b84465c7a70fa75a64b1d5fc9f294581df5a /lisp | |
| parent | d372248073cecc1d8ae1d6bed826692eab16274d (diff) | |
| download | emacs-2f4cadd1da7b681171c60fab8499f23f37ce4cb2.tar.gz emacs-2f4cadd1da7b681171c60fab8499f23f37ce4cb2.zip | |
ChangeLog merge fixes
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b833e61bfa2..0d1c3529a14 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | 2012-05-14 Troels Nielsen <bn.troels@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-internal-error-properties): | ||
| 4 | Calculate start position correctly when end-col is set but | ||
| 5 | end-line is not (Bug#11382). | ||
| 6 | |||
| 7 | 2012-05-14 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2012-05-14 Stefan Monnier <monnier@iro.umontreal.ca> |
| 8 | 2 | ||
| 9 | * net/rlogin.el (rlogin-mode-map): Fix last change. | 3 | * net/rlogin.el (rlogin-mode-map): Fix last change. |