Merge from origin/emacs-25

author John Wiegley <johnw@newartisans.com>

Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)

committer John Wiegley <johnw@newartisans.com>

Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)
author John Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)
committer John Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/progmodes/vhdl-mode.el
Simple merge
author	John Wiegley <johnw@newartisans.com>
	Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)
committer	John Wiegley <johnw@newartisans.com>
	Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/vhdl-mode.el	patch \|	diff1 \|	diff2 \|	blob \| history