[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog cus-edit.el
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog cus-edit.el |
Date: |
Wed, 18 Feb 2009 12:55:38 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Martin Rudalics <m061211> 09/02/18 12:55:37
Modified files:
lisp : ChangeLog cus-edit.el
Log message:
(custom-group-value-create): Don't throw an error
when WIDGET has no doc-string. (Bug#2356)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15350&r2=1.15351
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cus-edit.el?cvsroot=emacs&r1=1.361&r2=1.362
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15350
retrieving revision 1.15351
diff -u -b -r1.15350 -r1.15351
--- ChangeLog 18 Feb 2009 09:23:28 -0000 1.15350
+++ ChangeLog 18 Feb 2009 12:55:35 -0000 1.15351
@@ -1,3 +1,8 @@
+2009-02-18 Martin Rudalics <address@hidden>
+
+ * cus-edit.el (custom-group-value-create): Don't throw an error
+ when WIDGET has no doc-string. (Bug#2356)
+
2009-02-18 Juanma Barranquero <address@hidden>
* progmodes/cc-menus.el (imenu-progress-message):
Index: cus-edit.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cus-edit.el,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -b -r1.361 -r1.362
--- cus-edit.el 5 Jan 2009 03:18:50 -0000 1.361
+++ cus-edit.el 18 Feb 2009 12:55:37 -0000 1.362
@@ -3877,7 +3877,8 @@
(symbol (widget-value widget))
(members (custom-group-members symbol
(and (eq custom-buffer-style 'tree)
- custom-browse-only-groups))))
+ custom-browse-only-groups)))
+ (doc (widget-docstring widget)))
(cond ((and (eq custom-buffer-style 'tree)
(eq state 'hidden)
(or members (custom-unloaded-widget-p widget)))
@@ -4005,8 +4006,8 @@
(let ((start (point)))
(insert tag " group: ")
(widget-specify-sample widget start (point)))
- (if (< (length (widget-docstring widget)) 50)
- (insert (widget-docstring widget)))
+ (when (and doc (< (length doc) 50))
+ (insert doc))
;; Create visibility indicator.
(unless (eq custom-buffer-style 'links)
(insert "--------")
@@ -4033,7 +4034,7 @@
;; Update buttons.
(widget-put widget :buttons buttons)
;; Insert documentation.
- (if (>= (length (widget-docstring widget)) 50)
+ (when (and doc (>= (length doc) 50))
(widget-add-documentation-string-button
widget :visibility-widget 'custom-visibility))
- [Emacs-diffs] emacs/lisp ChangeLog cus-edit.el,
Martin Rudalics <=