diff options
author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
---|---|---|
committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/gnus/mm-uu.el | |
parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/gnus/mm-uu.el')
-rw-r--r-- | lisp/gnus/mm-uu.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index 9d4c4bfead7..a52613a092c 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -145,6 +145,14 @@ This can be either \"inline\" or \"attachment\".") ,#'mm-uu-pgp-key-extract ,#'mm-uu-gpg-key-skip-to-last nil) + (markdown-emacs-sources + "^```\\(?:elisp\\|emacs-lisp\\|\n(\\)" + "^```$" + ,#'mm-uu-emacs-sources-extract) + (markdown-diff ;; this should be higher than `git-format-patch' + "^```\\(?:diff\\|patch\\|\ndiff --git \\)" + "^```$" + ,#'mm-uu-diff-extract) (emacs-sources "^;;;?[ \t]*[^ \t]+\\.el[ \t]*--" "^;;;?[ \t]*\\([^ \t]+\\.el\\)[ \t]+ends here" @@ -511,7 +519,7 @@ apply the face `mm-uu-extract'." (list (mm-make-handle buf mm-uu-text-plain-type))))) (defun mm-uu-pgp-signed-extract () - (let ((mm-security-handle (list (format "multipart/signed")))) + (let ((mm-security-handle (list (substring "multipart/signed")))) (mm-set-handle-multipart-parameter mm-security-handle 'protocol "application/x-gnus-pgp-signature") (save-restriction @@ -579,7 +587,7 @@ apply the face `mm-uu-extract'." (list (mm-make-handle buf '("application/pgp-encrypted"))))))) (defun mm-uu-pgp-encrypted-extract () - (let ((mm-security-handle (list (format "multipart/encrypted")))) + (let ((mm-security-handle (list (substring "multipart/encrypted")))) (mm-set-handle-multipart-parameter mm-security-handle 'protocol "application/x-gnus-pgp-encrypted") (save-restriction |