From: Michael R. Mauger <michael@mauger.com>
Date: Sun, 15 Mar 2015 03:51:44 +0000 (-0400)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2564^2~162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f12fc56bf094dbbeb4fde1980627432a82ae23f;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

2f12fc56bf094dbbeb4fde1980627432a82ae23f
diff --cc lisp/ChangeLog
index e0891e1947c,5004924e9d3..a9cf1b0f88f
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,9 +1,15 @@@
 +2015-03-14  Michael R. Mauger  <michael@mauger.com>
 +
 +	* progmodes/sql.el: Version 3.5
 +	(sql-starts-with-prompt-re, sql-ends-with-prompt-re): Match password prompts.
 +	(sql-interactive-remove-continuation-prompt): Fixed regression. (Bug#6686)
 +
  2015-03-14  Daniel Colascione  <dancol@dancol.org>
  
+ 	* widget.el (define-widget): Check that documentation is a string
+ 	or nil; prevent wailing and gnashing of teeth when users forget to
+ 	pass a docstring and wonder why their properties don't work.
+ 
  	* startup.el (command-line): Process "--no-x-resources".
  
  2015-03-13  Kevin Ryde  <user42_kevin@yahoo.com.au>