[Emacs-diffs] master 2f12fc5 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Michael Mauger]

branch: master
commit 2f12fc56bf094dbbeb4fde1980627432a82ae23f
Merge: 84a6685 554001d
Author: Michael R. Mauger <address@hidden>
Commit: Michael R. Mauger <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/ChangeLog |    4 ++++
 lisp/widget.el |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0891e1..a9cf1b0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,10 @@
 
 2015-03-14  Daniel Colascione  <address@hidden>
 
+       * 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  <address@hidden>
diff --git a/lisp/widget.el b/lisp/widget.el
index f8faa0f..539f91e 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -83,6 +83,9 @@ create identical widgets:
 * (apply 'widget-create CLASS ARGS)
 
 The third argument DOC is a documentation string for the widget."
+  ;;
+  (unless (or (null doc) (stringp doc))
+    (error "widget documentation must be `nil' or a string."))
   (put name 'widget-type (cons class args))
   (put name 'widget-documentation (purecopy doc))
   name)