procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/gnus/mml1991.el (mml1991-mailcrypt-encrypt): Remove use of ill-designed

Browse source 
mm-with-unibyte-current-buffer.  The buffer should not contain any
multibyte chars anyway at this stage.
This commit is contained in:
Stefan Monnier 2011-05-30 14:21:59 -03:00
parent 6105399dcc
commit 7a54264e4c
2 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/gnus/ChangeLog
View file

@ -1,3 +1,9 @@
2011-05-30 Stefan Monnier <monnier@iro.umontreal.ca>
* mml1991.el (mml1991-mailcrypt-encrypt): Remove use of ill-designed
mm-with-unibyte-current-buffer. The buffer should not contain any
multibyte chars anyway at this stage.
2011-05-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el (shr-urlify): Use shr-add-font to make underlines be less ugly

53
lisp/gnus/mml1991.el
View file

@ -137,33 +137,32 @@ Whether the passphrase is cached at all is controlled by
(while (looking-at "^Content[^ ]+:") (forward-line))
(unless (bobp)
(delete-region (point-min) (point)))
(mm-with-unibyte-current-buffer
(with-temp-buffer
(inline (mm-disable-multibyte))
(setq cipher (current-buffer))
(insert-buffer-substring text)
(unless (mc-encrypt-generic
(or
(message-options-get 'message-recipients)
(message-options-set 'message-recipients
(read-string "Recipients: ")))
nil
(point-min) (point-max)
(message-options-get 'message-sender)
'sign)
(unless (> (point-max) (point-min))
(pop-to-buffer result-buffer)
(error "Encrypt error")))
(goto-char (point-min))
(while (re-search-forward "\r+$" nil t)
(replace-match "" t t))
(set-buffer text)
(delete-region (point-min) (point-max))
;;(insert "Content-Type: application/pgp-encrypted\n\n")
;;(insert "Version: 1\n\n")
(insert "\n")
(insert-buffer-substring cipher)
(goto-char (point-max))))))
(with-temp-buffer
(inline (mm-disable-multibyte))
(setq cipher (current-buffer))
(insert-buffer-substring text)
(unless (mc-encrypt-generic
(or
(message-options-get 'message-recipients)
(message-options-set 'message-recipients
(read-string "Recipients: ")))
nil
(point-min) (point-max)
(message-options-get 'message-sender)
'sign)
(unless (> (point-max) (point-min))
(pop-to-buffer result-buffer)
(error "Encrypt error")))
(goto-char (point-min))
(while (re-search-forward "\r+$" nil t)
(replace-match "" t t))
(set-buffer text)
(delete-region (point-min) (point-max))
;;(insert "Content-Type: application/pgp-encrypted\n\n")
;;(insert "Version: 1\n\n")
(insert "\n")
(insert-buffer-substring cipher)
(goto-char (point-max)))))
;; pgg wrapper