/[emacs]/emacs/lisp/gnus/message.el
ViewVC logotype

Diff of /emacs/lisp/gnus/message.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.43 by zsh, Sun Nov 25 15:17:24 2001 UTC revision 1.44 by zsh, Sun Nov 25 20:45:37 2001 UTC
# Line 3635  than 988 characters long, and if they ar Line 3635  than 988 characters long, and if they ar
3635      (push '(message-mode (encrypt . mc-encrypt-message)      (push '(message-mode (encrypt . mc-encrypt-message)
3636                           (sign . mc-sign-message))                           (sign . mc-sign-message))
3637            mc-modes-alist))            mc-modes-alist))
3638    (when actions    (dolist (action actions)
3639      (setq message-send-actions actions))      (condition-case nil
3640            (add-to-list 'message-send-actions
3641                         `(apply ',(car action) ',(cdr action)))))
3642    (setq message-reply-buffer replybuffer)    (setq message-reply-buffer replybuffer)
3643    (goto-char (point-min))    (goto-char (point-min))
3644    ;; Insert all the headers.    ;; Insert all the headers.
# Line 4155  Source is the sender, and if the origina Line 4157  Source is the sender, and if the origina
4157  the list of newsgroups is was posted to."  the list of newsgroups is was posted to."
4158    (concat "["    (concat "["
4159             (let ((prefix             (let ((prefix
4160                    (or (message-fetch-field                    (or (message-fetch-field "newsgroups")
4161                         (if (message-news-p) "newsgroups" "from"))                        (message-fetch-field "from")
4162                        "(nowhere)")))                        "(nowhere)")))
4163               (if message-forward-decoded-p               (if message-forward-decoded-p
4164                   prefix                   prefix
# Line 4199  the message." Line 4201  the message."
4201  (eval-when-compile  (eval-when-compile
4202    (defvar gnus-article-decoded-p))    (defvar gnus-article-decoded-p))
4203    
4204    
4205  ;;;###autoload  ;;;###autoload
4206  (defun message-forward (&optional news digest)  (defun message-forward (&optional news digest)
4207    "Forward the current message via mail.    "Forward the current message via mail.
# Line 4206  Optional NEWS will use news to forward i Line 4209  Optional NEWS will use news to forward i
4209  Optional DIGEST will use digest to forward."  Optional DIGEST will use digest to forward."
4210    (interactive "P")    (interactive "P")
4211    (let* ((cur (current-buffer))    (let* ((cur (current-buffer))
4212           (message-forward-decoded-p           (message-forward-decoded-p
4213            (if (local-variable-p 'gnus-article-decoded-p (current-buffer))            (if (local-variable-p 'gnus-article-decoded-p (current-buffer))
4214                gnus-article-decoded-p  ;; In an article buffer.                gnus-article-decoded-p ;; In an article buffer.
4215              message-forward-decoded-p))              message-forward-decoded-p))
4216           (subject (message-make-forward-subject))           (subject (message-make-forward-subject)))
          art-beg)  
4217      (if news      (if news
4218          (message-news nil subject)          (message-news nil subject)
4219        (message-mail nil subject))        (message-mail nil subject))
4220      ;; Put point where we want it before inserting the forwarded      (message-forward-make-body cur digest)))
4221      ;; message.  
4222      (if message-forward-before-signature  ;;;###autoload
4223          (message-goto-body)  (defun message-forward-make-body (forward-buffer &optional digest)
4224        (goto-char (point-max)))    ;; Put point where we want it before inserting the forwarded
4225      (if message-forward-as-mime    ;; message.
4226          (if digest    (if message-forward-before-signature
4227              (insert "\n<#multipart type=digest>\n")        (message-goto-body)
4228            (if message-forward-show-mml      (goto-char (point-max)))
4229                (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")    (if message-forward-as-mime
             (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")))  
       (insert "\n-------------------- Start of forwarded message --------------------\n"))  
     (let ((b (point)) e)  
4230        (if digest        (if digest
4231            (if message-forward-as-mime            (insert "\n<#multipart type=digest>\n")
4232                (insert-buffer-substring cur)          (if message-forward-show-mml
4233              (mml-insert-buffer cur))              (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")
4234          (if (and message-forward-show-mml            (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")))
4235                   (not message-forward-decoded-p))      (insert "\n-------------------- Start of forwarded message --------------------\n"))
4236              (insert    (let ((b (point)) e)
4237               (with-temp-buffer      (if digest
4238                 (mm-disable-multibyte-mule4) ;; Must copy buffer in unibyte mode          (if message-forward-as-mime
4239                (insert-buffer-substring forward-buffer)
4240              (mml-insert-buffer forward-buffer))
4241          (if (and message-forward-show-mml
4242                   (not message-forward-decoded-p))
4243              (insert
4244               (with-temp-buffer
4245                 (mm-disable-multibyte-mule4) ;; Must copy buffer in unibyte mode
4246                 (insert                 (insert
4247                  (with-current-buffer cur                  (with-current-buffer forward-buffer
4248                    (mm-string-as-unibyte (buffer-string))))                    (mm-string-as-unibyte (buffer-string))))
4249                 (mm-enable-multibyte-mule4)                 (mm-enable-multibyte-mule4)
4250                 (mime-to-mml)                 (mime-to-mml)
# Line 4246  Optional DIGEST will use digest to forwa Line 4252  Optional DIGEST will use digest to forwa
4252                 (when (looking-at "From ")                 (when (looking-at "From ")
4253                   (replace-match "X-From-Line: "))                   (replace-match "X-From-Line: "))
4254                 (buffer-string)))                 (buffer-string)))
4255            (save-restriction          (save-restriction
4256              (narrow-to-region (point) (point))            (narrow-to-region (point) (point))
4257              (mml-insert-buffer cur)            (mml-insert-buffer forward-buffer)
4258              (goto-char (point-min))            (goto-char (point-min))
4259              (when (looking-at "From ")            (when (looking-at "From ")
4260                (replace-match "X-From-Line: "))              (replace-match "X-From-Line: "))
4261              (goto-char (point-max)))))            (goto-char (point-max)))))
4262        (setq e (point))      (setq e (point))
4263        (if message-forward-as-mime      (if message-forward-as-mime
4264            (if digest          (if digest
4265                (insert "<#/multipart>\n")              (insert "<#/multipart>\n")
4266              (if message-forward-show-mml            (if message-forward-show-mml
4267                  (insert "<#/mml>\n")                (insert "<#/mml>\n")
4268                (insert "<#/part>\n")))              (insert "<#/part>\n")))
4269          (insert "\n-------------------- End of forwarded message --------------------\n"))        (insert "\n-------------------- End of forwarded message --------------------\n"))
4270        (if (and digest message-forward-as-mime)      (if (and digest message-forward-as-mime)
4271            (save-restriction          (save-restriction
4272              (narrow-to-region b e)            (narrow-to-region b e)
4273              (goto-char b)            (goto-char b)
4274              (narrow-to-region (point)            (narrow-to-region (point)
4275                                (or (search-forward "\n\n" nil t) (point)))                              (or (search-forward "\n\n" nil t) (point)))
4276              (delete-region (point-min) (point-max)))            (delete-region (point-min) (point-max)))
4277          (when (and (not current-prefix-arg)        (when (and (not current-prefix-arg)
4278                     message-forward-ignored-headers)                   message-forward-ignored-headers)
4279            (save-restriction          (save-restriction
4280              (narrow-to-region b e)            (narrow-to-region b e)
4281              (goto-char b)            (goto-char b)
4282              (narrow-to-region (point)            (narrow-to-region (point)
4283                                (or (search-forward "\n\n" nil t) (point)))                              (or (search-forward "\n\n" nil t) (point)))
4284              (message-remove-header message-forward-ignored-headers t)))))            (message-remove-header message-forward-ignored-headers t)))))
4285      (message-position-point)))    (message-position-point))
4286    
4287    ;;;###autoload
4288    (defun message-forward-rmail-make-body (forward-buffer)
4289      (save-window-excursion
4290        (set-buffer forward-buffer)
4291        (let (rmail-enable-mime)
4292          (rmail-toggle-header 0)))
4293      (message-forward-make-body forward-buffer))
4294    
4295    ;;;###autoload
4296    (defun message-insinuate-rmail ()
4297      "Let RMAIL uses message to forward."
4298      (interactive)
4299      (setq rmail-enable-mime-composing t)
4300      (setq rmail-insert-mime-forwarded-message-function
4301            'message-forward-rmail-make-body))
4302    
4303  ;;;###autoload  ;;;###autoload
4304  (defun message-resend (address)  (defun message-resend (address)
# Line 4648  regexp varstr." Line 4670  regexp varstr."
4670        ;; /usr/bin/mail.        ;; /usr/bin/mail.
4671        (unless content-type-p        (unless content-type-p
4672          (goto-char (point-min))          (goto-char (point-min))
4673          (re-search-forward "^MIME-Version:")          ;; For unknown reason, MIME-Version doesn't exist.
4674          (forward-line 1)          (when (re-search-forward "^MIME-Version:" nil t)
4675          (insert "Content-Type: text/plain; charset=us-ascii\n")))))            (forward-line 1)
4676              (insert "Content-Type: text/plain; charset=us-ascii\n"))))))
4677    
4678  (defun message-read-from-minibuffer (prompt)  (defun message-read-from-minibuffer (prompt)
4679    "Read from the minibuffer while providing abbrev expansion."    "Read from the minibuffer while providing abbrev expansion."

Legend:
Removed from v.1.43  
changed lines
  Added in v.1.44

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26