;; Pure binary
- ("\\.jpg$"
+ ("\\.jpg$\\|\\.jpeg$"
"image" "jpeg" nil
"base64"
"inline" (("filename" . file)))
;; XEmacs versions earlier than 21.1.1.
(format " (patch %d)" emacs-patch-level))
(t ""))
- " (" xemacs-codename ") ("
+ " (" xemacs-codename ")"
+ ;; `xemacs-extra-name' has appeared in the
+ ;; development version of XEmacs 21.5-b8.
+ (if (and (boundp 'xemacs-extra-name)
+ (symbol-value 'xemacs-extra-name))
+ (concat " " (symbol-value 'xemacs-extra-name))
+ "")
+ " ("
system-configuration ")")
" (" emacs-version ")"))
(let ((ver (if (string-match "\\.[0-9]+$" emacs-version)
(encrypted "Enclose as encrypted" mime-edit-enclose-pgp-encrypted-region)
(quote "Verbatim region" mime-edit-enclose-quote-region)
(key "Insert Public Key" mime-edit-insert-key)
- (split "About split" mime-edit-set-split)
- (sign "About sign" mime-edit-set-sign)
- (encrypt "About encryption" mime-edit-set-encrypt)
+ (split "Set splitting" mime-edit-set-split)
+ (sign "PGP sign" mime-edit-set-sign)
+ (encrypt "PGP encrypt" mime-edit-set-encrypt)
(preview "Preview Message" mime-edit-preview-message)
(level "Toggle transfer-level" mime-edit-toggle-transfer-level))
"MIME-edit menubar entry.")
(progn
(goto-char (1+ (match-end 0)))
(if (get-text-property (point) 'mime-edit-invisible)
- (next-single-property-change (point) 'mime-edit-invisible)
+ (or (next-single-property-change (point) 'mime-edit-invisible)
+ (point-max))
;; Move to the end of this text.
(if (re-search-forward mime-edit-tag-regexp nil 'move)
;; Don't forget a multiline tag.
;; Change value
(concat (substring ctype 0 (match-beginning 1))
parameter "=" value
- (substring contype (match-end 1))
+ (substring ctype (match-end 1))
opt-fields)
(concat ctype "; " parameter "=" value opt-fields)
)))
(while (progn (end-of-line) (not (eobp)))
(insert "\r")
(forward-line 1))
- (or (prog1 (smime-sign-buffer)
- (push nil buffer-undo-list)
- (ignore-errors (undo)))
+ (or (smime-sign-buffer)
(throw 'mime-edit-error 'pgp-error)))
(goto-char beg)
- (insert (format "--[[multipart/signed;
- boundary=\"%s\"; micalg=sha1;
- protocol=\"application/pkcs7-signature\"][7bit]]
---%s
-" smime-boundary smime-boundary))
- (goto-char (point-max))
- (insert (format "\n--%s
-Content-Type: application/pkcs7-signature; name=\"smime.p7s\"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename=\"smime.p7s\"
-Content-Description: S/MIME Cryptographic Signature
-
-" smime-boundary))
- (goto-char (point-max))
- (insert (format "\n--%s--\n" smime-boundary))))))
+ (if (re-search-forward "^Content-Type:\\s-*" nil t)
+ (let* ((start (match-beginning 0))
+ (body (buffer-substring (match-end 0) (std11-field-end))))
+ (delete-region start (line-beginning-position 2))
+ (goto-char beg)
+ (insert "--[[" body "][7bit]]\n")))))))
(defun mime-edit-encrypt-smime (beg end boundary)
(save-excursion
(or (smime-encrypt-buffer)
(throw 'mime-edit-error 'pgp-error))
(goto-char beg)
- (insert "--[[application/pkcs7-mime; name=\"smime.p7m\"
-Content-Disposition: attachment; filename=\"smime.p7m\"
-Content-Description: S/MIME Encrypted Message][base64]]\n")))))
+ (if (re-search-forward "^Content-Type:\\s-*" nil t)
+ (let* ((start (match-beginning 0))
+ (body (buffer-substring (match-end 0) (std11-field-end))))
+ (delete-region start (line-beginning-position 2))
+ (goto-char beg)
+ (insert "--[[" body "]]\n")))))))
(defsubst replace-space-with-underline (str)
(mapconcat (function
(or (looking-at mime-edit-beginning-tag-regexp)
(eobp)
(insert (mime-make-text-tag) "\n")))
- (visible-region beg end)
+ (remove-text-properties beg end '(invisible mime-edit-invisible))
(goto-char beg))
(cond
((mime-test-content-type contype "message")