comparison lisp/vm/vm-reply.el @ 140:585fb297b004 r20-2b4

Import from CVS: tag r20-2b4
author cvs
date Mon, 13 Aug 2007 09:32:43 +0200
parents b980b6286996
children 43dd3413c7c7
comparison
equal deleted inserted replaced
139:2b5203979d01 140:585fb297b004
436 ;; 436 ;;
437 ;; also protect value of this-command from minibuffer reads 437 ;; also protect value of this-command from minibuffer reads
438 (let ((this-command this-command)) 438 (let ((this-command this-command))
439 (save-excursion 439 (save-excursion
440 (mail-send)))) 440 (mail-send))))
441 ;; be careful, something could have killed the composition
442 ;; buffer inside mail-send.
443 (if (eq (current-buffer) composition-buffer)
444 (progn
445 (vm-rename-current-mail-buffer)
446 (vm-keep-mail-buffer (current-buffer))))
441 (cond ((eq vm-system-state 'replying) 447 (cond ((eq vm-system-state 'replying)
442 (vm-mail-mark-replied)) 448 (vm-mail-mark-replied))
443 ((eq vm-system-state 'forwarding) 449 ((eq vm-system-state 'forwarding)
444 (vm-mail-mark-forwarded)) 450 (vm-mail-mark-forwarded))
445 ((eq vm-system-state 'redistributing) 451 ((eq vm-system-state 'redistributing)
446 (vm-mail-mark-redistributed))) 452 (vm-mail-mark-redistributed)))
447 (vm-display nil nil '(vm-mail-send) '(vm-mail-send)) 453 (vm-display nil nil '(vm-mail-send) '(vm-mail-send))))
448 ;; be careful, something could have killed the composition
449 ;; buffer inside mail-send.
450 (if (eq (current-buffer) composition-buffer)
451 (progn
452 (vm-rename-current-mail-buffer)
453 (vm-keep-mail-buffer (current-buffer))))))
454 454
455 (defun vm-mail-mode-get-header-contents (header-name-regexp) 455 (defun vm-mail-mode-get-header-contents (header-name-regexp)
456 (let ((contents nil) 456 (let ((contents nil)
457 regexp) 457 regexp)
458 (setq regexp (concat "^\\(" header-name-regexp "\\)\\|\\(^" 458 (setq regexp (concat "^\\(" header-name-regexp "\\)\\|\\(^"