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

Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 89-90, 93)

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

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

   - Merge from emacs--devo--0

2006-02-16  Juanma Barranquero  <lekktu@gmail.com>

   * lisp/html2text.el (html2text-remove-tag-list):
   * lisp/spam-stat.el (spam-stat-buffer-words): Fix typo in docstring.

2006-02-14  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/gnus-cus.el: Revert 2005-10-17 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c6202a..749894d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-16  Juanma Barranquero  <lekktu@gmail.com>
+
+       * html2text.el (html2text-remove-tag-list):
+       * spam-stat.el (spam-stat-buffer-words): Fix typo in docstring.
+
+2006-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * gnus-cus.el: Revert 2005-10-17 change.
+
 2006-02-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (article-strip-banner): Use

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index 8aac9d1..f88f533 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -36,14 +36,6 @@
 
 ;;; Widgets:
 
-(defvar gnus-custom-map
-  (let ((map (make-keymap)))
-    (set-keymap-parent map widget-keymap)
-    (suppress-keymap map)
-    (define-key map [mouse-1] 'widget-move-and-invoke)
-    map)
-  "Keymap for editing Gnus customization buffers.")
-
 (defun gnus-custom-mode ()
   "Major mode for editing Gnus customization buffers.
 
@@ -59,7 +51,7 @@ if that value is non-nil."
   (kill-all-local-variables)
   (setq major-mode 'gnus-custom-mode
        mode-name "Gnus Customize")
-  (use-local-map gnus-custom-map)
+  (use-local-map widget-keymap)
   ;; Emacs 21 stuff:
   (when (and (facep 'custom-button-face)
             (facep 'custom-button-pressed-face))
@@ -490,7 +482,7 @@ form, but who cares?"
            (widget-create 'sexp
                           :tag "Method"
                           :value (gnus-info-method info))))
-    (use-local-map gnus-custom-map)
+    (use-local-map widget-keymap)
     (widget-setup)
     (buffer-enable-undo)
     (goto-char (point-min))))
@@ -884,7 +876,7 @@ articles in the thread.
                         '(repeat :inline t
                                  :tag "Unknown entries"
                                  sexp)))
-    (use-local-map gnus-custom-map)
+    (use-local-map widget-keymap)
     (widget-setup)))
 
 (defun gnus-score-customize-done (&rest ignore)
@@ -1061,7 +1053,7 @@ articles in the thread.
 
       (gnus-agent-cat-prepare-category-field agent-enable-undownloaded-faces)
 
-      (use-local-map gnus-custom-map)
+      (use-local-map widget-keymap)
       (widget-setup)
       (buffer-enable-undo))))
 

diff --git a/lisp/html2text.el b/lisp/html2text.el
index 352911a..de9cf64 100644 (file)
--- a/lisp/html2text.el
+++ b/lisp/html2text.el
@@ -93,7 +93,7 @@ completely verbatim - without any use of REGEXP.")
 
 This is a list of tags which should be removed, without any
 formatting.  Note that tags in the list are presented *without*
-any \"<\" or \">\".  All occurences of a tag appearing in this
+any \"<\" or \">\".  All occurrences of a tag appearing in this
 list are removed, irrespective of whether it is a closing or
 opening tag, or if the tag has additional attributes.  The
 deletion is done by the function `html2text-remove-tags'.