diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 21 | ||||
| -rw-r--r-- | lisp/gnus/gnus-cus.el | 16 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/nnrss.el | 13 |
4 files changed, 45 insertions, 9 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 23e5564770f..04213b9fa45 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,19 @@ +2005-10-17 Chong Yidong <cyd@stupidchicken.com> + + * gnus-cus.el (gnus-custom-map): New variable. Bind mouse-1 to + widget-move-and-invoke. + (gnus-custom-mode): Use gnus-custom-map. + +2005-10-15 Bill Wohler <wohler@newt.com> + + * message.el (message-tool-bar-map): Renamed image file from + mail_send to mail/send. + +2005-10-16 Masatake YAMATO <jet@gyve.org> + + * message.el (message-expand-group): Pass the common + prefix substring of completion to `display-completion-list'. + 2005-10-09 Daniel Brockman <daniel@brockman.se> * format-spec.el (format-spec): Propagate text properties of % spec. @@ -21,6 +37,11 @@ * pgg-def.el (top-level): Don't require custom, it is autoloaded. (To sync with No Gnus.) +2005-10-04 David Hansen <david.hansen@gmx.net> + + * nnrss.el (nnrss-request-article): Add support for the comments tag. + (nnrss-check-group): Ditto. + 2005-10-04 Reiner Steib <Reiner.Steib@gmx.de> * mm-url.el (mm-url-predefined-programs): Add switches for curl. diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el index f523af22750..df10c769315 100644 --- a/lisp/gnus/gnus-cus.el +++ b/lisp/gnus/gnus-cus.el @@ -36,6 +36,14 @@ ;;; 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. @@ -51,7 +59,7 @@ if that value is non-nil." (kill-all-local-variables) (setq major-mode 'gnus-custom-mode mode-name "Gnus Customize") - (use-local-map widget-keymap) + (use-local-map gnus-custom-map) ;; Emacs 21 stuff: (when (and (facep 'custom-button-face) (facep 'custom-button-pressed-face)) @@ -479,7 +487,7 @@ form, but who cares?" (widget-create 'sexp :tag "Method" :value (gnus-info-method info)))) - (use-local-map widget-keymap) + (use-local-map gnus-custom-map) (widget-setup) (buffer-enable-undo) (goto-char (point-min)))) @@ -873,7 +881,7 @@ articles in the thread. '(repeat :inline t :tag "Unknown entries" sexp))) - (use-local-map widget-keymap) + (use-local-map gnus-custom-map) (widget-setup))) (defun gnus-score-customize-done (&rest ignore) @@ -1050,7 +1058,7 @@ articles in the thread. (gnus-agent-cat-prepare-category-field agent-enable-undownloaded-faces) - (use-local-map widget-keymap) + (use-local-map gnus-custom-map) (widget-setup) (buffer-enable-undo)))) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index d64d8dbd2bf..8ac3bb8cf18 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -6586,7 +6586,7 @@ which specify the range to operate on." write-file dired open-file)) (define-key tool-bar-map (vector key) nil)) (message-tool-bar-local-item-from-menu - 'message-send-and-exit "mail_send" tool-bar-map message-mode-map) + 'message-send-and-exit "mail/send" tool-bar-map message-mode-map) (message-tool-bar-local-item-from-menu 'message-kill-buffer "close" tool-bar-map message-mode-map) (message-tool-bar-local-item-from-menu @@ -6691,7 +6691,7 @@ those headers." (let ((buffer-read-only nil)) (erase-buffer) (let ((standard-output (current-buffer))) - (display-completion-list (sort completions 'string<))) + (display-completion-list (sort completions 'string<) string)) (goto-char (point-min)) (delete-region (point) (progn (forward-line 3) (point)))))))))) diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 5018701ee42..adef035c830 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -197,6 +197,7 @@ for decoding when the cdr that the data specify is not available.") " "))) (link (nth 2 e)) (enclosure (nth 7 e)) + (comments (nth 8 e)) ;; Enable encoding of Newsgroups header in XEmacs. (default-enable-multibyte-characters t) (rfc2047-header-encoding-alist @@ -205,7 +206,7 @@ for decoding when the cdr that the data specify is not available.") rfc2047-header-encoding-alist) rfc2047-header-encoding-alist)) rfc2047-encode-encoded-words body) - (when (or text link enclosure) + (when (or text link enclosure comments) (insert "\n") (insert "<#multipart type=alternative>\n" "<#part type=\"text/plain\">\n") @@ -220,6 +221,8 @@ for decoding when the cdr that the data specify is not available.") (insert (car enclosure) " " (nth 2 enclosure) " " (nth 3 enclosure) "\n")) + (when comments + (insert comments "\n")) (setq body (buffer-substring body (point))) (insert "<#/part>\n" "<#part type=\"text/html\">\n" @@ -232,6 +235,8 @@ for decoding when the cdr that the data specify is not available.") (insert "<p><a href=\"" (car enclosure) "\">" (cadr enclosure) "</a> " (nth 2 enclosure) " " (nth 3 enclosure) "</p>\n")) + (when comments + (insert "<p><a href=\"" comments "\">comments</a></p>\n")) (insert "</body></html>\n" "<#/part>\n" "<#/multipart>\n")) @@ -528,7 +533,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (defun nnrss-check-group (group server) (let (file xml subject url extra changed author date - enclosure rss-ns rdf-ns content-ns dc-ns) + enclosure comments rss-ns rdf-ns content-ns dc-ns) (if (and nnrss-use-local (file-exists-p (setq file (expand-file-name (nnrss-translate-file-chars @@ -576,6 +581,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (setq date (or (nnrss-node-text dc-ns 'date item) (nnrss-node-text rss-ns 'pubDate item) (message-make-date))) + (setq comments (nnrss-node-text rss-ns 'comments item)) (when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure")) item))) (let ((url (cdr (assq 'url enclosure))) (len (cdr (assq 'length enclosure))) @@ -606,7 +612,8 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (and author (nnrss-mime-encode-string author)) date (and extra (nnrss-decode-entities-string extra)) - enclosure) + enclosure + comments) nnrss-group-data) (gnus-sethash (or url extra) t nnrss-group-hashtb) (setq changed t)) |