From: yamaoka Date: Thu, 14 Sep 2000 06:31:17 +0000 (+0000) Subject: Synch with `t-gnus-6_14' and Gnus. X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~99 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d7d4580836e15380d582df7c5d2b4dc92d19da9;p=elisp%2Fgnus.git- Synch with `t-gnus-6_14' and Gnus. * lisp/gnus-ml.el: Bind some undeclared variables. --- diff --git a/ChangeLog b/ChangeLog index 2b9cd5f..c1faa94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2000-09-14 Katsumi Yamaoka - * lisp/gnus-art.el (mime-button-mother-dispatcher): Bind. + * lisp/gnus-ml.el: Bind some undeclared variables. + + * lisp/gnus-art.el (gnus-article-add-button): Add widget button. + (gnus-article-display-mime-message): Don't set + `mime-button-mother-dispatcher'. * lisp/message.el: Require `reporter' for the function `define-mail-user-agent' when Mule 2.3 is running. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 95aaf54..18177b6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2000-09-13 23:58:40 ShengHuo ZHU + + * webmail.el: Hotmail updated. Add X-Gnus-Webmail. + 2000-09-13 21:41:25 ShengHuo ZHU * gnus-art.el (gnus-article-setup-buffer): Set diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 1f5fe38..94f21b8 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2891,8 +2891,6 @@ commands: ;;; @@ article filters ;;; -(defvar mime-button-mother-dispatcher) - (defun gnus-article-display-mime-message () "Article display method for MIME message." ;; called from `gnus-original-article-buffer'. @@ -2908,12 +2906,7 @@ commands: (mime-display-message mime-message-structure gnus-article-buffer nil gnus-article-mode-map) (when all-headers - (gnus-article-hide-headers nil -1)) - ) - ;; `mime-display-message' changes current buffer to `gnus-article-buffer'. - (make-local-variable 'mime-button-mother-dispatcher) - (setq mime-button-mother-dispatcher - (function gnus-article-push-button)) + (gnus-article-hide-headers nil -1))) (run-hooks 'gnus-mime-article-prepare-hook)) (defun gnus-article-display-traditional-message () @@ -4864,7 +4857,9 @@ specified by `gnus-button-alist'." (nconc (and gnus-article-mouse-face (list gnus-mouse-face-prop gnus-article-mouse-face)) (list 'gnus-callback fun) - (and data (list 'gnus-data data))))) + (and data (list 'gnus-data data)))) + (widget-convert-button 'link from to :action 'gnus-widget-press-button + :button-keymap gnus-widget-button-keymap)) ;;; Internal functions: diff --git a/lisp/gnus-ml.el b/lisp/gnus-ml.el index 645f218..64f587a 100644 --- a/lisp/gnus-ml.el +++ b/lisp/gnus-ml.el @@ -28,6 +28,14 @@ (require 'gnus) (eval-when-compile (require 'cl)) +(defvar group) +(defvar list-help) +(defvar list-subscribe) +(defvar list-unsubscribe) +(defvar list-post) +(defvar list-owner) +(defvar list-archive) + ;;; Mailing list minor mode (defvar gnus-mailing-list-mode nil diff --git a/lisp/webmail.el b/lisp/webmail.el index 1089e2a..38638ef 100644 --- a/lisp/webmail.el +++ b/lisp/webmail.el @@ -77,8 +77,8 @@ (login-url "http://%s/cgi-bin/dologin?login=%s&passwd=%s&enter=Sign+in&sec=no&curmbox=ACTIVE&_lang=&js=yes&id=2&tw=-10000&beta=" webmail-aux user password) - (login-snarf . webmail-hotmail-login) - (list-url "%s" webmail-aux) + ;;(login-snarf . webmail-hotmail-login) + ;;(list-url "%s" webmail-aux) (list-snarf . webmail-hotmail-list) (article-snarf . webmail-hotmail-article) (trash-url @@ -407,7 +407,7 @@ (webmail-error "login@1")) (goto-char (point-min)) (if (re-search-forward - "\\(/cgi-bin/HoTMaiL\\?[^\"]*curmbox=ACTIVE[^\"]*\\)" nil t) + "\\(/cgi-bin/HoTMaiL\\?[^\"]*a=b[^\"]*\\)" nil t) (setq webmail-aux (concat "http://" site (match-string 1))) (webmail-error "login@2")))) @@ -463,7 +463,10 @@ (goto-char (point-min)) (insert "\n\n") (if (not (looking-at "\n*From ")) - (insert "From nobody " (current-time-string) "\n")) + (insert "From nobody " (current-time-string) "\n") + (forward-line)) + (insert "X-Gnus-Webmail: " (symbol-value 'user) + "@" (symbol-name webmail-type) "\n") (mm-append-to-file (point-min) (point-max) file)) (defun webmail-hotmail-article-old (file id) @@ -557,8 +560,10 @@ (goto-char (point-min)) ;; Some blank line to seperate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") + (insert "X-Gnus-Webmail: " (symbol-value 'user) + "@" (symbol-name webmail-type) "\n") (if id - (insert (format "Message-ID: <%s@hotmail.com>\n" id))) + (insert (format "X-Message-ID: <%s@hotmail.com>\n" id))) (unless (looking-at "$") (if (search-forward "\n\n" nil t) (forward-line -1) @@ -686,8 +691,10 @@ (goto-char (point-min)) ;; Some blank line to seperate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") + (insert "X-Gnus-Webmail: " (symbol-value 'user) + "@" (symbol-name webmail-type) "\n") (if id - (insert (format "Message-ID: <%s@yahoo.com>\n" id))) + (insert (format "X-Message-ID: <%s@yahoo.com>\n" id))) (unless (looking-at "$") (if (search-forward "\n\n" nil t) (forward-line -1) @@ -860,8 +867,10 @@ (goto-char (point-min)) ;; Some blank line to seperate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") + (insert "X-Gnus-Webmail: " (symbol-value 'user) + "@" (symbol-name webmail-type) "\n") (if id - (insert (format "Message-ID: <%s@%s>\n" id webmail-address))) + (insert (format "X-Message-ID: <%s@%s>\n" id webmail-address))) (unless (looking-at "$") (if (search-forward "\n\n" nil t) (forward-line -1) @@ -986,8 +995,10 @@ (goto-char (point-min)) ;; Some blank line to seperate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") + (insert "X-Gnus-Webmail: " (symbol-value 'user) + "@" (symbol-name webmail-type) "\n") (if id - (insert (format "Message-ID: <%s@%s>\n" id webmail-address))) + (insert (format "X-Message-ID: <%s@%s>\n" id webmail-address))) (unless (looking-at "$") (if (search-forward "\n\n" nil t) (forward-line -1) @@ -1066,6 +1077,8 @@ (replace-match "\n")) (goto-char (point-min)) (insert "\n\nFrom nobody " (current-time-string) "\n") + (insert "X-Gnus-Webmail: " (symbol-value 'user) + "@" (symbol-name webmail-type) "\n") (mm-append-to-file (point-min) (point-max) file))) (provide 'webmail)