* lisp/dvc-utils.el (dvc-message-replace-header): New compatibility
function to implement message-replace-header.
* lisp/xgit-gnus.el (xgit-gnus-send-commit-notification): Use it.
---
Committed revision 2a28c123eca1a931d90b540942bcc24679e8d963
to <git://git.hcoop.net/git/mwolson/emacs/dvc.git>.
lisp/dvc-utils.el | 16 ++++++++++++++++
lisp/xgit-gnus.el | 2 +-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/lisp/dvc-utils.el b/lisp/dvc-utils.el
index 1eb5cb9..73f82c7 100644
--- a/lisp/dvc-utils.el
+++ b/lisp/dvc-utils.el
@@ -698,5 +698,21 @@ according to `string-match'."
(defsubst dvc-xor (a b)
(or (and a (not b)) (and (not a) b)))
+(defun dvc-message-replace-header (header new-value &optional after force)
+ "Remove HEADER and insert the NEW-VALUE.
+If AFTER, insert after this header. If FORCE, insert new field
+even if NEW-VALUE is empty."
+ ;; Similar to `nnheader-replace-header' but for message buffers.
+ (require 'message)
+ (save-excursion
+ (save-restriction
+ (message-narrow-to-headers)
+ (message-remove-header header))
+ (when (or force (> (length new-value) 0))
+ (if after
+ (message-position-on-field header after)
+ (message-position-on-field header))
+ (insert new-value))))
+
(provide 'dvc-utils)
;;; dvc-utils.el ends here
diff --git a/lisp/xgit-gnus.el b/lisp/xgit-gnus.el
index 1ae1ffe..0cb78b6 100644
--- a/lisp/xgit-gnus.el
+++ b/lisp/xgit-gnus.el
@@ -231,7 +231,7 @@ argument (C-u) is given, then prompt for this value."
(concat (if dest-specs (car dest-specs) "")
subject)))
(when from
- (message-replace-header "From" from))
+ (dvc-message-replace-header "From" from))
(message-goto-body)
;; do not PGP sign the message as per git convention
(when (looking-at "<#part[^>]*>")
--
1.5.4.3
--
| Michael Olson | FSF Associate Member #652 |
| http://mwolson.org/ | Hobbies: Lisp, HCoop |
| Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
`-------------------------------------------------------'
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev