Merge from upstream; add version to defvar.

Added line as part of commit 20f57d6a7d4543dabaadd26b94e1c0405d3f802a
  Author:     Stefan Monnier <monnier@iro.umontreal.ca>
  AuthorDate: Mon Sep 29 14:14:08 2014 -0400

      Rename 24.5 to 25.1

      Except where we expect to backport the corresponding change.
When verilog-indent-begin-after-if is nil, fix indenting initial/final.

	* verilog-mode.el (verilog-no-indent-begin-re): When
	`verilog-indent-begin-after-if' is nil, fix indenting
	initial/final to match always statements, bug825. Reported by Tim
	Clapp.
Add AUTOINSERTLAST, bug826.

	* verilog-mode.el (verilog-auto, verilog-auto-insert-last): Add
	AUTOINSERTLAST to allow post-AUTO user fixups, bug826. Reported by
	Dennis Muhlestein.