From: yamaoka Date: Thu, 3 Sep 1998 07:38:22 +0000 (+0000) Subject: Update. X-Git-Tag: pgnus-ichikawa-199811302358~235 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ab0dfa38c8ca9321e9aeb7b2175058f1b24d8fa;p=elisp%2Fgnus.git- Update. --- diff --git a/ChangeLog b/ChangeLog index 225cdf5..8cb1c3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,64 @@ +1998-09-03 Katsumi Yamaoka + + * lisp/nndoc.el (nndoc-transform-mime-parts): Insert + "MIME-Version:" instead of "Mime-Version:". + + * lisp/message.el (message-encode-message-body): Abolished. + + * lisp/message.el: Don't require `rfc2047'. + + * lisp/gnus.el: Delete autoload settings for `qp' and `rfc2047'. + + * lisp/gnus.el (semi-gnus-developers): New constant. + + * lisp/gnus.el (gnus-version-number): Update to 6.9.08. + + * lisp/gnus-xmas.el (gnus-tilde-pad-form): Move to + `gnus-xmas-redefine' from `gnus-xmas-define'. + + * lisp/gnus-sum.el (gnus-set-mode-line): Use `gnus-truncate-string' + instead of `truncate-string'. + + * lisp/gnus-sum.el: Don't define menu for "MIME". + + * lisp/gnus-sum.el: Delete key definitions for + `gnus-article-decode-mime-words' and `gnus-article-decode-charset'. + + * lisp/gnus-spec.el (gnus-tilde-pad-form): New function for the + benefit of avoiding byte-compile warning. + + * lisp/gnus-soup.el (gnus-soup-send-packet): Set + `message-user-agent' instead of `message-newsreader'. + + * lisp/message.el (message-set-work-buffer) (message-mode): Don't + use `mm-enable-multibyte'. + * lisp/gnus-util.el (gnus-set-work-buffer): Ditto. + * lisp/gnus-sum.el (gnus-summary-mode): Ditto. + * lisp/gnus-msg.el (gnus-copy-article-buffer): Ditto. + * lisp/gnus-art.el (gnus-article-mode): Ditto. + + * lisp/gnus-art.el (gnus-article-decode-mime-words) + (gnus-article-decode-charset) (gnus-decode-rfc1522) + (article-decode-rfc1522) (article-de-quoted-unreadable) + (article-mime-decode-quoted-printable-buffer): Abolished. + + * lisp/message.el: Don't require `mm-bodies'. + * lisp/gnus-art.el: Ditto. + + * lisp/gnus-agent.el (gnus-category-line-format-alist): Change + variable name `name' and `groups' to `gnus-tmp-name' and + `gnus-tmp-groups'. + (gnus-category-insert-line): Ditto. + + * lisp/gnus-agent.el (gnus-agent-fetch-articles): Delete useless + binding variables. + +1998-09-01 Tatsuya Ichikawa + + * lisp/gnus.el (gnus-version-number): Update to 6.9.07. + + * Sync up with Pterodactyl Gnus 0.13. + 1998-08-31 Tatsuya Ichikawa * lisp/gnus.el (gnus-version-number): Update to 6.9.04. @@ -5,7 +66,7 @@ * Sync up with Pterodactyl Gnus 0.10. * lisp/gnus-agent.el : back to version Gnus 5.6.32. - + 1998-08-31 Katsumi Yamaoka * lisp/rfc1522.el: Abolished. @@ -19,7 +80,7 @@ `gnus-article-de-quoted-unreadable', `gnus-decode-rfc1522' and `article-decode-rfc1522'. - * lisp/gnus-sum.el: Delete Key definitions for + * lisp/gnus-sum.el: Delete key definitions for `gnus-article-decode-mime-words', `gnus-article-decode-mime-words' and `gnus-article-de-quoted-unreadable'. @@ -156,7 +217,7 @@ (message-make-forward-subject): Failed to sync. (message-setup): Ditto. (message-clone-locals): Modify regexp. - + * lisp/message.el (message-fill-references): Reverted. 1998-08-23 Shuhei KOBAYASHI @@ -194,16 +255,16 @@ *lisp/gnus-offline.el (gnus-offline-setup) : To create spol directory if not exists. Change default value of gnus-offline-drafts-queue-type 'miee to 'agent - + 1998-08-16 Tatsuya Ichikawa * lisp/gnus.el (gnus-version-number): Update to 6.8.12. * Sync up with Gnus 5.6.36. - + * lisp/gnus-offline.el : New file. Merge gnus-offline to ichikawa branch. - + 1998-08-15 Yoshiki Hayashi * texi/gnus-ja.texi: Update. @@ -222,13 +283,13 @@ * lisp/gnus.el (gnus-version-number): Update to 6.8.11. * Sync up with Gnus 5.6.34. - + 1998-08-12 Tatsuya Ichikawa * lisp/gnus.el (gnus-version-number): Update to 6.8.10. * Sync up with Gnus 5.6.33. - + 1998-08-11 Keiichi Suzuki * lisp/message.el (message-frames): New custom group. @@ -240,19 +301,19 @@ (message-kill-buffer): Ditto. (message-delete-frame): New function. (message-pop-to-buffer): Make new frame when edit message. - + 1998-08-11 Tatsuya Ichikawa * lisp/gnus.el (gnus-version-number): Update to 6.8.9. * Sync up with Gnus 5.6.31. - + 1998-08-10 Tatsuya Ichikawa * lisp/gnus.el (gnus-version-number): Update to 6.8.8. * Sync up with Gnus 5.6.30. - + 1998-08-10 Shuhei KOBAYASHI * lisp/gnus.el (gnus-version-number): Update to 6.8.7. @@ -260,13 +321,13 @@ 1998-08-06 Katsumi Yamaoka *lisp/smtp.el: Do not insert empty line at the end of message. - + 1998-08-06 Tatsuya Ichikawa * lisp/gnus.el (gnus-version-number): Update to 6.8.6. * Sync up with Gnus 5.6.29. - + 1998-08-05 Tatsuya Ichikawa * lisp/gnus-start.el (gnus-read-init-file): Fix indent. @@ -378,7 +439,7 @@ * Sync up with Gnus 5.6.22 * lisp/gnus.el (gnus-version-number): Update to 6.7.8. * lisp/pop3-fma.el : Enable to get localhost mail spool. - + 1998-06-29 MORIOKA Tomohiko * lisp/gnus.el (gnus-version-number): Update to 6.7.7. @@ -451,9 +512,9 @@ Gnus 5.6.13. 1998-06-14 Tatsuya Ichikawa - + * Sync up with Gnus 5.6.13. - + 1998-06-24 MORIOKA Tomohiko * lisp/gnus-art.el (gnus-article-display-mime-message): Don't @@ -538,7 +599,7 @@ 1998-06-17 Tatsuya Ichikawa * lisp/pop3-fma.el: Small bug fix. - + * lisp/pop3-fma.el: Delete variable pop3-fma-cypher-key Use base64-encode-string , base64-decode-string instead. Both change by Yasuo OKABE @@ -586,7 +647,7 @@ * lisp/gnus.el (gnus-version-number): Update to 6.3.4. And fix typo 5.6.10 -> 5.6.11. - + 1998-06-03 Shuhei KOBAYASHI * lisp/gnus.el (gnus-version-number): Update to 6.3.3. @@ -790,14 +851,14 @@ `nnheader-insert-file-contents'. (gnus-agent-braid-nov): Ditto. (gnus-agent-expire): Ditto. - + * lisp/gnus-cache.el (gnus-cache-request-article): Ditto. (gnus-cache-retrieve-headers): Ditto. (gnus-cache-change-buffer): Ditto. (gnus-cache-braid-nov): Ditto. - + * lisp/gnus-sum.el (gnus-summary-import-article): Ditto. - + * lisp/nnkiboze.el (nnkiboze-retrieve-headers): Ditto. * lisp/message.el (message-generate-headers): Fix regexp. @@ -863,7 +924,7 @@ * lisp/gnus.el (gnus-bdf-image-file): New variable. (gnus-mule-group-startup-message): Display bitmap image using bitmap.el running with Emacs 20. - + * lisp/gnus-agent.el (gnus-agent-fetch-headers): Fix problem when Xref field is not exist. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 8f124d2..79aee2c 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -655,15 +655,14 @@ the actual number of articles toggled is returned." (gnus-agent-group-path group) "/")) (date (gnus-time-to-day (current-time))) (case-fold-search t) - pos alists crosses id elem) + pos crosses id elem) (gnus-make-directory dir) (gnus-message 7 "Fetching articles for %s..." group) ;; Fetch the articles from the backend. (if (gnus-check-backend-function 'retrieve-articles group) (setq pos (gnus-retrieve-articles articles group)) (with-temp-file nil - (let ((buf (current-buffer)) - article) + (let (article) (while (setq article (pop articles)) (when (gnus-request-article article group) (goto-char (point-max)) @@ -975,8 +974,8 @@ the actual number of articles toggled is returned." (defvar gnus-category-buffer "*Agent Category*") (defvar gnus-category-line-format-alist - `((?c name ?s) - (?g groups ?d))) + `((?c gnus-tmp-name ?s) + (?g gnus-tmp-groups ?d))) (defvar gnus-category-mode-line-format-alist `((?u user-defined ?s))) @@ -1052,15 +1051,15 @@ The following commands are available: (defalias 'gnus-category-position-point 'gnus-goto-colon) (defun gnus-category-insert-line (category) - (let* ((name (car category)) - (groups (length (cadddr category)))) + (let* ((gnus-tmp-name (car category)) + (gnus-tmp-groups (length (cadddr category)))) (beginning-of-line) (gnus-add-text-properties (point) (prog1 (1+ (point)) ;; Insert the text. (eval gnus-category-line-format-spec)) - (list 'gnus-category name)))) + (list 'gnus-category gnus-tmp-name)))) (defun gnus-enter-category-buffer () "Go to the Category buffer." @@ -1319,14 +1318,14 @@ The following commands are available: (cdr (assq 'dormant (gnus-info-marks info))))) nov-file (gnus-agent-article-name ".overview" group)) - (gnus-agent-load-alist group) + (gnus-agent-load-alist group) (gnus-message 5 "Expiring articles in %s" group) (set-buffer overview) (erase-buffer) (when (file-exists-p nov-file) (nnheader-insert-file-contents nov-file)) (goto-char (point-min)) - (setq article 0) + (setq article 0) (while (setq elem (pop articles)) (setq article (car elem)) (when (or (null low) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index c057755..8fb2a32 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -36,7 +36,6 @@ (require 'browse-url) (require 'alist) (require 'mime-view) -(require 'mm-bodies) (defgroup gnus-article nil "Article display." @@ -958,8 +957,6 @@ characters to translate to." (process-send-region "article-x-face" beg end) (process-send-eof "article-x-face")))))))))) -;; -;; Semi-gnus specific (defun gnus-article-decode-rfc1522 () "Decode MIME encoded-words in header fields." (let (buffer-read-only) @@ -968,73 +965,6 @@ characters to translate to." default-mime-charset))) (eword-decode-header charset) ))) -;; Semi-gnus specific -;; - -;; - pgnus specific -(defun gnus-article-decode-mime-words () - "Decode all MIME-encoded words in the article." - (interactive) - (save-excursion - (set-buffer gnus-article-buffer) - (let ((inhibit-point-motion-hooks t) - buffer-read-only) - (rfc2047-decode-region (point-min) (point-max))))) - -(defun gnus-article-decode-charset (&optional prompt) - "Decode charset-encoded text in the article. -If PROMPT (the prefix), prompt for a coding system to use." - (interactive "P") - (save-excursion - (set-buffer gnus-article-buffer) - (let* ((inhibit-point-motion-hooks t) - (ct (message-fetch-field "Content-Type" t)) - (cte (message-fetch-field "Content-Transfer-Encoding" t)) - (charset (cond - (prompt - (mm-read-coding-system "Charset to decode: ")) - (ct - (mm-content-type-charset ct)) - (gnus-newsgroup-name - (gnus-group-find-parameter - gnus-newsgroup-name 'charset)))) - buffer-read-only) - (save-restriction - (goto-char (point-min)) - (search-forward "\n\n" nil 'move) - (narrow-to-region (point) (point-max)) - (mm-decode-body - charset (and cte (intern (downcase (gnus-strip-whitespace cte))))))))) - -(defalias 'gnus-decode-rfc1522 'article-decode-rfc1522) -(defalias 'gnus-article-decode-rfc1522 'article-decode-rfc1522) -(defun article-decode-rfc1522 () - "Remove QP encoding from headers." - (let ((inhibit-point-motion-hooks t) - (buffer-read-only nil)) - (save-restriction - (message-narrow-to-head) - (rfc2047-decode-region (point-min) (point-max))))) - -(defun article-de-quoted-unreadable (&optional force) - "Translate a quoted-printable-encoded article. -If FORCE, decode the article whether it is marked as quoted-printable -or not." - (interactive (list 'force)) - (save-excursion - (let ((buffer-read-only nil) - (type (gnus-fetch-field "content-transfer-encoding"))) - (gnus-article-decode-rfc1522) - (when (or force - (and type (string-match "quoted-printable" (downcase type)))) - (goto-char (point-min)) - (search-forward "\n\n" nil 'move) - (quoted-printable-decode-region (point) (point-max)))))) - -(defun article-mime-decode-quoted-printable-buffer () - "Decode Quoted-Printable in the current buffer." - (quoted-printable-decode-region (point-min) (point-max))) -;; - pgnus specific (defun article-hide-pgp (&optional arg) "Toggle hiding of any PGP headers and signatures in the current article. @@ -1931,8 +1861,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is ["Hide signature" gnus-article-hide-signature t] ["Hide citation" gnus-article-hide-citation t] ["Treat overstrike" gnus-article-treat-overstrike t] - ["Remove carriage return" gnus-article-remove-cr t] - )) + ["Remove carriage return" gnus-article-remove-cr t])) ;; Note "Commands" menu is defined in gnus-sum.el for consistency @@ -1976,7 +1905,6 @@ commands: (buffer-disable-undo (current-buffer)) (setq buffer-read-only t) (set-syntax-table gnus-article-mode-syntax-table) - (mm-enable-multibyte) (gnus-run-hooks 'gnus-article-mode-hook)) (defun gnus-article-setup-buffer () @@ -2162,8 +2090,6 @@ If ALL-HEADERS is non-nil, no headers are hidden." (or all-headers gnus-show-all-headers)))) (when (or (numberp article) (stringp article)) - ;; Hooks for getting information from the article. - ;; This hook must be called before being narrowed. (let ((method (if gnus-show-mime (progn @@ -2173,6 +2099,8 @@ If ALL-HEADERS is non-nil, no headers are hidden." gnus-article-display-method-for-mime gnus-article-display-method-for-encoded-word)) gnus-article-display-method-for-traditional))) + ;; Hooks for getting information from the article. + ;; This hook must be called before being narrowed. (gnus-run-hooks 'gnus-tmp-internal-hook) (gnus-run-hooks 'gnus-article-prepare-hook) ;; Display message. diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index c1ed5b6..9a35377 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -384,9 +384,6 @@ header line with the old Message-ID." ;; this buffer should be passed to all mail/news reply/post routines. (setq gnus-article-copy (gnus-get-buffer-create " *gnus article copy*")) (buffer-disable-undo gnus-article-copy) - (save-excursion - (set-buffer gnus-article-copy) - (mm-enable-multibyte)) (let ((article-buffer (or article-buffer gnus-article-buffer)) end beg) (if (not (and (get-buffer article-buffer) diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el index 71345c9..39236e5 100644 --- a/lisp/gnus-soup.el +++ b/lisp/gnus-soup.el @@ -540,8 +540,7 @@ Return whether the unpacking was successful." (search-forward "\n\n") (forward-char -1) (insert mail-header-separator) - (setq message-newsreader (setq message-mailer - (gnus-extended-version))) + (setq message-user-agent (gnus-extended-version)) (cond ((string= (gnus-soup-reply-kind (car replies)) "news") (gnus-message 5 "Sending news message to %s..." diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index 1294f6a..8d7de10 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -241,6 +241,14 @@ (point) (progn ,@form (point)) '(gnus-face t face ,(symbol-value (intern (format "gnus-face-%d" type)))))) +;;; Avoid byte-compile warning. +(defun gnus-tilde-pad-form (el pad-width) + "Dummy function except for XEmacs-mule. It will be redefined +by `gnus-xmas-redefine'." + (if (symbolp el) + `(eval ,el) + `,el)) + (defun gnus-tilde-max-form (el max-width) "Return a form that limits EL to MAX-WIDTH." (let ((max (abs max-width))) @@ -282,11 +290,6 @@ (if (equal val ,ignore-value) "" val)))) -;;; dummy function. XEmacs will redefine this. -(defun gnus-tilde-pad-form (el pad-width) - "Return a form that pads EL to PAD-WIDTH." - ) - (defun gnus-parse-format (format spec-alist &optional insert) ;; This function parses the FORMAT string with the help of the ;; SPEC-ALIST and returns a list that can be eval'ed to return the diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 2c23302..2ae347a 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1405,10 +1405,6 @@ increase the score of each group you read." "c" gnus-article-highlight-citation "s" gnus-article-highlight-signature) - (gnus-define-keys (gnus-summary-wash-mime-map "M" gnus-summary-wash-map) - "w" gnus-article-decode-mime-words - "c" gnus-article-decode-charset) - (gnus-define-keys (gnus-summary-wash-time-map "T" gnus-summary-wash-map) "z" gnus-article-date-ut "u" gnus-article-date-ut @@ -1508,10 +1504,6 @@ increase the score of each group you read." ["Headers" gnus-article-highlight-headers t] ["Signature" gnus-article-highlight-signature t] ["Citation" gnus-article-highlight-citation t]) - ("MIME" - ["Words" gnus-article-decode-mime-words t] - ["Charset" gnus-article-decode-charset t] - ["QP" gnus-article-de-quoted-unreadable t]) ("Date" ["Local" gnus-article-date-local t] ["ISO8601" gnus-article-date-iso8601 t] @@ -1903,7 +1895,6 @@ The following commands are available: (make-local-hook 'pre-command-hook) (add-hook 'pre-command-hook 'gnus-set-global-variables nil t) (gnus-run-hooks 'gnus-summary-mode-hook) - (mm-enable-multibyte) (gnus-update-format-specifications nil 'summary 'summary-mode 'summary-dummy) (gnus-update-summary-mark-positions)) @@ -4237,7 +4228,7 @@ If WHERE is `summary', the summary mode line format will be used." ;; We might have to chop a bit of the string off... (when (> (length mode-string) max-len) (setq mode-string - (concat (truncate-string mode-string (- max-len 3)) + (concat (gnus-truncate-string mode-string (- max-len 3)) "..."))) ;; Pad the mode string a bit. (setq mode-string (format (format "%%-%ds" max-len) mode-string)))) diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 1cc28ce..6b6d104 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -534,8 +534,7 @@ Timezone package is used." (set-buffer gnus-work-buffer) (erase-buffer)) (set-buffer (gnus-get-buffer-create gnus-work-buffer)) - (kill-all-local-variables) - (mm-enable-multibyte))) + (kill-all-local-variables))) (defmacro gnus-group-real-name (group) "Find the real name of a foreign newsgroup." diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index ebad8a7..4f637e0 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -482,28 +482,7 @@ call it with the value of the `gnus-data' text property." 'x-color-values (lambda (color) (color-instance-rgb-components - (make-color-instance color))))) - - (when (featurep 'mule) - (defun gnus-tilde-pad-form (el pad-width) - "Return a form that pads EL to PAD-WIDTH." - (let ((pad (abs pad-width))) - (if (symbolp el) - (if (< pad-width 0) - `(concat ,el (make-string - (max 0 (- ,pad (string-width ,el))) ?\ )) - `(concat (make-string - (max 0 (- ,pad (string-width ,el))) ?\ ) - ,el)) - (if (< pad-width 0) - `(let ((val (eval ,el))) - (concat val (make-string - (max 0 (- ,pad (string-width val))) ?\ ))) - `(let ((val (eval ,el))) - (concat (make-string - (max 0 (- ,pad (string-width val))) ?\ ) - val)))))) - )) + (make-color-instance color)))))) (defun gnus-xmas-redefine () "Redefine lots of Gnus functions for XEmacs." @@ -606,6 +585,25 @@ the resulting string may be narrower than END-COLUMN. (concat head-padding str tail-padding) str)))) + (defun gnus-tilde-pad-form (el pad-width) + "Return a form that pads EL to PAD-WIDTH." + (let ((pad (abs pad-width))) + (if (symbolp el) + (if (< pad-width 0) + `(concat ,el (make-string + (max 0 (- ,pad (string-width ,el))) ?\ )) + `(concat (make-string + (max 0 (- ,pad (string-width ,el))) ?\ ) + ,el)) + (if (< pad-width 0) + `(let ((val (eval ,el))) + (concat val (make-string + (max 0 (- ,pad (string-width val))) ?\ ))) + `(let ((val (eval ,el))) + (concat (make-string + (max 0 (- ,pad (string-width val))) ?\ ) + val)))))) + (defun gnus-tilde-max-form (el max-width) "Return a form that limits EL to MAX-WIDTH." (let ((max (abs max-width))) diff --git a/lisp/gnus.el b/lisp/gnus.el index 97e17bb..91cdcc6 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -253,7 +253,7 @@ is restarted, and sometimes reloaded." (defconst gnus-product-name "T-gnus" "Product name of this version of gnus.") -(defconst gnus-version-number "6.9.07" +(defconst gnus-version-number "6.9.08" "Version number for this version of gnus.") (defconst gnus-original-version-number "0.13" @@ -1358,15 +1358,11 @@ face." (defcustom gnus-article-display-hook (if (and (string-match "XEmacs" emacs-version) (featurep 'xface)) -;; '(gnus-article-decode-charset - comment out for Semi-gnus -;; gnus-article-decode-rfc1522 - comment out for Semi-gnus '(gnus-article-hide-headers-if-wanted gnus-article-hide-boring-headers gnus-article-treat-overstrike gnus-article-maybe-highlight gnus-article-display-x-face) -;; '(gnus-article-decode-charset - comment out for Semi-gnus -;; gnus-article-decode-rfc1522 - comment out for Semi-gnus '(gnus-article-hide-headers-if-wanted gnus-article-hide-boring-headers gnus-article-treat-overstrike @@ -1494,6 +1490,12 @@ want." "bugs@gnus.org (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") +(defconst semi-gnus-developers + "Semi-gnus Developers: + semi-gnus-en@meadow.scphys.kyoto-u.ac.jp (In English),\ + semi-gnus-ja@meadow.scphys.kyoto-u.ac.jp (In Japanese);" + "The mail address of the Semi-gnus developers.") + (defvar gnus-info-nodes '((gnus-group-mode "(gnus)The Group Buffer") (gnus-summary-mode "(gnus)The Summary Buffer") @@ -1584,8 +1586,6 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") (cdr package))))) '(("info" Info-goto-node) ("pp" pp pp-to-string pp-eval-expression) - ("qp" quoted-printable-decode-region quoted-printable-decode-string) - ("rfc2047" rfc2047-decode-region rfc2047-decode-string) ("ps-print" ps-print-preprint) ("mail-extr" mail-extract-address-components) ("browse-url" browse-url) @@ -1718,7 +1718,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") gnus-article-date-original gnus-article-date-lapsed gnus-article-show-all-headers gnus-article-edit-mode gnus-article-edit-article - gnus-article-edit-done gnus-decode-rfc1522 article-decode-rfc1522 + gnus-article-edit-done gnus-start-date-timer gnus-stop-date-timer) ("gnus-int" gnus-request-type) ("gnus-start" gnus-newsrc-parse-options gnus-1 gnus-no-server-1 diff --git a/lisp/message.el b/lisp/message.el index 41a2149..ae061e8 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -46,8 +46,6 @@ (require 'mail-abbrevs) (require 'mailabbrev)) (require 'mime-edit) -(require 'rfc2047) -(require 'mm-bodies) (defgroup message '((user-mail-address custom-variable) (user-full-name custom-variable)) @@ -1182,8 +1180,7 @@ The cdr of ech entry is a function for applying the face to a region.") (set-buffer " *message work*") (erase-buffer)) (set-buffer (get-buffer-create " *message work*")) - (kill-all-local-variables) - (mm-enable-multibyte))) + (kill-all-local-variables))) (defun message-functionp (form) "Return non-nil if FORM is funcallable." @@ -1507,7 +1504,6 @@ C-c C-r message-caesar-buffer-body (rot13 the message body)." (setq adaptive-fill-first-line-regexp (concat "[ \t]*[-a-z0-9A-Z]*>+[ \t]*\\|" adaptive-fill-first-line-regexp)) - (mm-enable-multibyte) (run-hooks 'text-mode-hook 'message-mode-hook)) @@ -2198,10 +2194,8 @@ the user from the mailer." (let ((message-deletable-headers (if news nil message-deletable-headers))) (message-generate-headers message-required-mail-headers)) -;; (rfc2047-encode-message-header) ;; Let the user do all of the above. (run-hooks 'message-header-hook)) -;; (message-encode-message-body) (unwind-protect (save-excursion (set-buffer tembuf) @@ -2401,10 +2395,8 @@ to find out how to use this." (message-narrow-to-headers) ;; Insert some headers. (message-generate-headers message-required-news-headers) -;; (rfc2047-encode-message-header) ;; Let the user do all of the above. (run-hooks 'message-header-hook)) -;; (message-encode-message-body) (message-cleanup-headers) (if (not (message-check-news-syntax)) (progn @@ -4501,32 +4493,6 @@ regexp varstr." (setq idx (1+ idx))) string)) -;;; -;;; MIME functions -;;; - -(defun message-encode-message-body () - "Examine the message body, encode it, and add the requisite headers." - (when (featurep 'mule) - (save-excursion - (save-restriction - (message-narrow-to-headers) - (message-remove-header - "^Content-Transfer-Encoding:\\|^Content-Type:\\|^Mime-Version:" t) - (goto-char (point-max)) - (widen) - (narrow-to-region (point) (point-max)) - (let* ((charset (mm-encode-body)) - (encoding (mm-body-encoding))) - (when (consp charset) - (error "Can't encode messages with multiple charsets (yet)")) - (widen) - (message-narrow-to-headers) - (goto-char (point-max)) - (mm-insert-rfc822-headers - (or charset (mm-mule-charset-to-mime-charset 'ascii)) - encoding)))))) - (run-hooks 'message-load-hook) (provide 'message) diff --git a/lisp/nndoc.el b/lisp/nndoc.el index 0da245a..932b196 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -468,7 +468,7 @@ from the document.") (limit (point))) (goto-char (point-min)) (or (save-excursion (re-search-forward "^MIME-Version:" limit t)) - (insert "Mime-Version: 1.0\n"))) + (insert "MIME-Version: 1.0\n"))) ;; Generate default header before entity fields. (goto-char (point-min)) (nndoc-generate-mime-parts-head article t)))