aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-07 17:59:00 +0200
committerLars Magne Ingebrigtsen2011-07-07 17:59:00 +0200
commitaf0905c84a232b034b4f792847aa05531f8cdefc (patch)
treeb174896e92c5151f40c9ab2a2cf9a8a3cd4c0fe3
parenta8815b00dc3ce6878008e5e711d5094461cb69a4 (diff)
downloademacs-af0905c84a232b034b4f792847aa05531f8cdefc.tar.gz
emacs-af0905c84a232b034b4f792847aa05531f8cdefc.zip
Note that :custom-show is obsolete.
Fixes: debbugs:75
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/cus-edit.el2
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d80cd12ff7..9ca85524b8b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * cus-edit.el (custom-show): Marked as obsolete.
4
3 * net/network-stream.el (network-stream-open-starttls): If gnutls 5 * net/network-stream.el (network-stream-open-starttls): If gnutls
4 negotiation fails, then possibly try again with a non-encrypted 6 negotiation fails, then possibly try again with a non-encrypted
5 connection (bug#9017). 7 connection (bug#9017).
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 693b36040ea..820bcfeacba 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1829,6 +1829,7 @@ item in another window.\n\n"))
1829;; We want simple widgets to be displayed by default, but complex 1829;; We want simple widgets to be displayed by default, but complex
1830;; widgets to be hidden. 1830;; widgets to be hidden.
1831 1831
1832;; This widget type is obsolete as of Emacs 24.1.
1832(widget-put (get 'item 'widget-type) :custom-show t) 1833(widget-put (get 'item 'widget-type) :custom-show t)
1833(widget-put (get 'editable-field 'widget-type) 1834(widget-put (get 'editable-field 'widget-type)
1834 :custom-show (lambda (_widget value) 1835 :custom-show (lambda (_widget value)
@@ -2257,6 +2258,7 @@ and `face'."
2257 (setq widget nil))))) 2258 (setq widget nil)))))
2258 (widget-setup)) 2259 (widget-setup))
2259 2260
2261(make-obsolete 'custom-show "this widget type is no longer supported." "24.1")
2260(defun custom-show (widget value) 2262(defun custom-show (widget value)
2261 "Non-nil if WIDGET should be shown with VALUE by default." 2263 "Non-nil if WIDGET should be shown with VALUE by default."
2262 (let ((show (widget-get widget :custom-show))) 2264 (let ((show (widget-get widget :custom-show)))