From 980ec083c4ae7b05170514b431b0a07311946114 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 17 Feb 2006 00:25:20 +0000 Subject: [PATCH] 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 * lisp/html2text.el (html2text-remove-tag-list): * lisp/spam-stat.el (spam-stat-buffer-words): Fix typo in docstring. 2006-02-14 Chong Yidong * lisp/gnus-cus.el: Revert 2005-10-17 change. --- lisp/ChangeLog | 9 +++++++++ lisp/gnus-cus.el | 16 ++++------------ lisp/html2text.el | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c6202a56..749894d46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2006-02-16 Juanma Barranquero + + * html2text.el (html2text-remove-tag-list): + * spam-stat.el (spam-stat-buffer-words): Fix typo in docstring. + +2006-02-14 Chong Yidong + + * gnus-cus.el: Revert 2005-10-17 change. + 2006-02-16 Katsumi Yamaoka * gnus-art.el (article-strip-banner): Use diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el index 8aac9d151..f88f5332d 100644 --- 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 352911a16..de9cf6474 100644 --- 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'. -- 2.25.1