File U_Require-vm-reply.el-from-vm-compose-mail.patch of Package emacs-vm

From: Egbert Eich <>
Date: Thu Jan 21 14:47:45 2016 +0100
Subject: Require vm-reply.el from vm-compose-mail.
Patch-mainline: Upstream

References: bsc#939497

Also, cleaned up all redundant autoloads in vm-reply.el.

Uday S Reddy

Signed-off-by: Egbert Eich <>
Signed-off-by: Egbert Eich <>
 lisp/vm-reply.el | 9 ---------
 lisp/vm.el       | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/lisp/vm-reply.el b/lisp/vm-reply.el
index add837f..34b794d 100755
--- a/lisp/vm-reply.el
+++ b/lisp/vm-reply.el
@@ -114,7 +114,6 @@
   (while (re-search-forward "^" (point-max) t)
     (insert vm-included-text-prefix)))
 (defun vm-fill-long-lines-in-reply ()
   (let ((vm-word-wrap-paragraphs vm-word-wrap-paragraphs-in-reply)
@@ -295,7 +294,6 @@ messages of the folder are involved in this reply."
 	    (setq re-list (cdr re-list))))
 (defun vm-mail-yank-default (&optional message)
   "The default message yank handler when `mail-citation-hook' is set to nil."
@@ -319,7 +317,6 @@ messages of the folder are involved in this reply."
 	(insert vm-included-text-prefix)
 	(forward-line 1)))))
 (defun vm-yank-message-other-folder (folder)
   "Like vm-yank-message except the message is yanked from a folder other
 than the one that spawned the current Mail mode buffer.  The name of the
@@ -366,7 +363,6 @@ Don't call this function from a program."
       (vm-bury-buffer newbuf)
       (vm-bury-buffer sumbuf))))
 (defun vm-yank-message (message)
   "Yank message number N into the current buffer at point.
 When called interactively N is always read from the minibuffer.  When
@@ -627,7 +623,6 @@ specified by `vm-included-text-headers' and
 	       (setq alternatives (1- alternatives))
 	       (setq parts (cdr parts))))))))
 (defun vm-mail-send-and-exit (&rest ignored)
   "Send message and maybe delete the composition buffer.
 The value of `vm-keep-sent-mesages' determines whether the composition buffer
@@ -803,7 +798,6 @@ This function is a variant of `vm-get-header-contents'."
 (defvar coding-system-for-write)
 (defun vm-mail-send ()
   "Just like mail-send except that VM flags the appropriate message(s)
 as replied to, forwarded, etc, if appropriate."
@@ -888,7 +882,6 @@ as replied to, forwarded, etc, if appropriate."
       (vm-keep-mail-buffer (current-buffer)))
     (vm-display nil nil '(vm-mail-send) '(vm-mail-send))))
 (defun vm-do-fcc-before-mime-encode ()
   "The name says it all.
 Sometimes you may want to save a message unencoded, specifically not to waste
@@ -923,7 +916,6 @@ storage for attachments which are stored on disk anyway."
 	    nil ))))))
 (defun vm-mail-mode-remove-header (header-name-regexp)
   (let (regexp)
     (setq regexp (concat "^\\(" header-name-regexp "\\)\\|\\(^"
@@ -1653,7 +1645,6 @@ there is a current message."
     (vm-get-header-contents (car vm-message-pointer) "From:")))
 (defun* vm-mail-internal (&key buffer-name to guessed-to subject 
 			       in-reply-to cc references newsgroups)
     "Create a message buffer and set it up according to args.
diff --git a/lisp/vm.el b/lisp/vm.el
index 9b1395f..650d60e 100755
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -1207,6 +1207,7 @@ summary buffer to select a folder."
 			send-actions return-action &rest ignored)
+  (require 'vm-reply)
   (if continue
     (let ((buffer (vm-mail-internal
openSUSE Build Service is sponsored by