Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 43-44)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 229)

   - Merge from emacs--devo--0, emacs--rel--22

2007-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/font-lock.el (font-lock-add-keywords): In case font-lock was only
   half-activated, forcefully activate it completely.

2007-06-11  Richard M. Stallman  <rms@gnu.org>

   * lisp/cus-edit.el (custom-variable-type): Doc fix.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-797

1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 4dae3bab018..0984fc73e43 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2500,7 +2500,8 @@ However, setting it through Custom sets the default value.")
 (defun custom-variable-type (symbol)
   "Return a widget suitable for editing the value of SYMBOL.
 If SYMBOL has a `custom-type' property, use that.
-Otherwise, look up symbol in `custom-guess-type-alist'."
+Otherwise, try matching SYMBOL against `custom-guess-name-alist' and
+try matching its doc string against `custom-guess-doc-alist'."
   (let* ((type (or (get symbol 'custom-type)
                    (and (not (get symbol 'standard-value))
                         (custom-guess-type symbol))