mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

ChangeLog merge fixes

Browse source
This commit is contained in:
Glenn Morris 2012-05-14 09:11:24 -07:00
parent d372248073
commit 2f4cadd1da
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/misc/ChangeLog
View file

@ -1,4 +1,4 @@
2012-05-12 Andreas Schwab <schwab@linux-m68k.org>
2012-05-14 Andreas Schwab <schwab@linux-m68k.org>
* cc-mode.texi: Avoid space before macro in 4th argument of cross
reference commands. (Bug#11461)

6
lisp/ChangeLog
View file

@ -1,9 +1,3 @@
2012-05-14 Troels Nielsen <bn.troels@gmail.com> (tiny change)
* progmodes/compile.el (compilation-internal-error-properties):
Calculate start position correctly when end-col is set but
end-line is not (Bug#11382).
2012-05-14 Stefan Monnier <monnier@iro.umontreal.ca>
* net/rlogin.el (rlogin-mode-map): Fix last change.