Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index f074547..a93f9d2 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,7 +1,7 @@
 ;;; mml-gpg-old.el --- Old PGP message format (RFC 1991) support for MML
 ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
-;; Author: Sascha Lüdecke <sascha@meta-x.de>,
+;; Author: Sascha Ldecke <sascha@meta-x.de>,
 ;;     Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
 ;; Keywords PGP
 
@@ -34,7 +34,7 @@
               mml1991-mailcrypt-encrypt)
     (gpg mml1991-gpg-sign
         mml1991-gpg-encrypt))
-  "Alist of PGP/MIME functions.")
+  "Alist of PGP functions.")
 
 ;;; mailcrypt wrapper
 
@@ -46,15 +46,15 @@
 
 (defun mml1991-mailcrypt-sign (cont)
   (let ((text (current-buffer))
-        headers signature
-        (result-buffer (get-buffer-create "*GPG Result*")))
+       headers signature
+       (result-buffer (get-buffer-create "*GPG Result*")))
     ;; Save MIME Content[^ ]+: headers from signing
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (if (> (point) (point-min))
-        (progn
-          (setq headers (buffer-substring (point-min) (point)))
-          (kill-region (point-min) (point))))
+       (progn
+         (setq headers (buffer-substring (point-min) (point)))
+         (kill-region (point-min) (point))))
     (goto-char (point-max))
     (unless (bolp)
       (insert "\n"))
@@ -81,13 +81,13 @@
 (defun mml1991-mailcrypt-encrypt (cont)
   (let ((text (current-buffer))
        cipher
-        (result-buffer (get-buffer-create "*GPG Result*")))
+       (result-buffer (get-buffer-create "*GPG Result*")))
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (if (> (point) (point-min))
-        (progn
-          (kill-region (point-min) (point))))
+       (progn
+         (kill-region (point-min) (point))))
     (mm-with-unibyte-current-buffer-mule4
       (with-temp-buffer
        (setq cipher (current-buffer))
@@ -108,10 +108,10 @@
        (while (re-search-forward "\r+$" nil t)
          (replace-match "" t t))
        (set-buffer text)
-        (kill-region (point-min) (point-max))
+       (kill-region (point-min) (point-max))
        ;;(insert "Content-Type: application/pgp-encrypted\n\n")
        ;;(insert "Version: 1\n\n")
-        (insert "\n")
+       (insert "\n")
        (insert-buffer cipher)
        (goto-char (point-max))))))
 
@@ -122,24 +122,24 @@
 
 (defun mml1991-gpg-sign (cont)
   (let ((text (current-buffer))
-        headers signature
-        (result-buffer (get-buffer-create "*GPG Result*")))
+       headers signature
+       (result-buffer (get-buffer-create "*GPG Result*")))
     ;; Save MIME Content[^ ]+: headers from signing
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (if (> (point) (point-min))
-        (progn
-          (setq headers (buffer-substring (point-min) (point)))
-          (kill-region (point-min) (point))))
+       (progn
+         (setq headers (buffer-substring (point-min) (point)))
+         (kill-region (point-min) (point))))
     (goto-char (point-max))
     (unless (bolp)
       (insert "\n"))
     (quoted-printable-decode-region (point-min) (point-max))
     (with-temp-buffer
       (unless (gpg-sign-cleartext text (setq signature (current-buffer))
-                                  result-buffer
-                                  nil
-                                  (message-options-get 'message-sender))
+                                 result-buffer
+                                 nil
+                                 (message-options-get 'message-sender))
        (unless (> (point-max) (point-min))
          (pop-to-buffer result-buffer)
          (error "Sign error")))
@@ -157,13 +157,13 @@
 (defun mml1991-gpg-encrypt (cont)
   (let ((text (current-buffer))
        cipher
-        (result-buffer (get-buffer-create "*GPG Result*")))
+       (result-buffer (get-buffer-create "*GPG Result*")))
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (if (> (point) (point-min))
-        (progn
-          (kill-region (point-min) (point))))
+       (progn
+         (kill-region (point-min) (point))))
     (mm-with-unibyte-current-buffer-mule4
       (with-temp-buffer
        (unless (gpg-sign-encrypt
@@ -185,10 +185,10 @@
        (while (re-search-forward "\r+$" nil t)
          (replace-match "" t t))
        (set-buffer text)
-        (kill-region (point-min) (point-max))
+       (kill-region (point-min) (point-max))
        ;;(insert "Content-Type: application/pgp-encrypted\n\n")
        ;;(insert "Version: 1\n\n")
-        (insert "\n")
+       (insert "\n")
        (insert-buffer cipher)
        (goto-char (point-max))))))
 
@@ -210,7 +210,6 @@
 
 ;; Local Variables:
 ;; coding: iso-8859-1
-;; buffer-file-coding-system: iso-8859-1
 ;; End:
 
 ;;; mml1991.el ends here