Skip to content

Suppressed insertion of signature when it's nil. #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeeger wants to merge 2 commits into
base: semi-1_14-wl
Choose a base branch
from
Open

Suppressed insertion of signature when it's nil. #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
173cf6e
Suppressed insertion of signature when it's nil.
jeeger Nov 16, 2020
e2b81c2
Added message when no signature is inserted.
jeeger Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 39 additions & 36 deletions mime-signature.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,44 +152,47 @@ When SIGNATURE is list, each string and function's result is inserted. Function
(let ((point (point))
(signature (mime-edit-signature-guess))
start end text-part-p plain-signature-p)
(setq plain-signature-p
(or (null (stringp signature))
(let ((file-type (mime-find-file-type signature)))
(and (equal "text" (car file-type))
(equal "plain" (cadr file-type))))))
(when (eq mime-edit-signature-position 'message)
(goto-char (point-max)))
(re-search-backward mime-edit-tag-regexp nil 'move)
(setq start (point)
end (if (re-search-forward mime-edit-tag-regexp nil t)
(match-beginning 0)
(point-max)))
(when (> point end)
(setq start end
(if signature
(progn
(setq plain-signature-p
(or (null (stringp signature))
(let ((file-type (mime-find-file-type signature)))
(and (equal "text" (car file-type))
(equal "plain" (cadr file-type))))))
(when (eq mime-edit-signature-position 'message)
(goto-char (point-max)))
(re-search-backward mime-edit-tag-regexp nil 'move)
(setq start (point)
end (if (re-search-forward mime-edit-tag-regexp nil t)
(match-beginning 0)
(point-max))))
(goto-char start)
(setq text-part-p
(or (null (looking-at mime-edit-single-part-tag-regexp))
(string-match "^text/plain" (match-string 1))))
(goto-char (cond ((eq mime-edit-signature-position 'message)
(point-max))
((eq mime-edit-signature-position 'part)
end)
(t
point)))
(unless (and text-part-p plain-signature-p)
(unless (eq (preceding-char) ?\n) (insert ?\n))
(mime-edit-insert-tag "text" "plain"))
(if plain-signature-p
(progn
(unless (eq (preceding-char) ?\n) (insert ?\n))
(when (or mime-edit-signature-position
(eq end point))
(insert mime-edit-signature-separator))
(mime-edit-signature-insert-plain signature))
(mime-edit-insert-file signature))))
(point-max)))
(when (> point end)
(setq start end
end (if (re-search-forward mime-edit-tag-regexp nil t)
(match-beginning 0)
(point-max))))
(goto-char start)
(setq text-part-p
(or (null (looking-at mime-edit-single-part-tag-regexp))
(string-match "^text/plain" (match-string 1))))
(goto-char (cond ((eq mime-edit-signature-position 'message)
(point-max))
((eq mime-edit-signature-position 'part)
end)
(t
point)))
(unless (and text-part-p plain-signature-p)
(unless (eq (preceding-char) ?\n) (insert ?\n))
(mime-edit-insert-tag "text" "plain"))
(if plain-signature-p
(progn
(unless (eq (preceding-char) ?\n) (insert ?\n))
(when (or mime-edit-signature-position
(eq end point))
(insert mime-edit-signature-separator))
(mime-edit-signature-insert-plain signature))
(mime-edit-insert-file signature)))
(message "No signature defined."))))

;;; @ end
;;;
Expand Down