From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 30 Apr 1998 06:39:27 +0000 (+0000)
Subject: (ethio-sera-to-fidel-mail): Use rfc822-goto-eoh.
X-Git-Tag: emacs-20.3~1206
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36f41f1db0a14a31801c7f95118ab8fdbe1d8ddb;p=emacs.git

(ethio-sera-to-fidel-mail): Use rfc822-goto-eoh.
(ethio-fidel-to-sera-mail): Likewise.
---

diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 7566cc19f57..ec3bb538f8d 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -832,14 +832,10 @@ and the body into FIDEL using `ethio-sera-to-fidel-region'."
 	border)
     (save-excursion
 
-      ;; look for the header-body separator
-      (goto-char (point-min))
-      (if (search-forward
-	   (if (eq major-mode 'rmail-mode)
-	       "\n\n" (concat "\n" mail-header-separator "\n"))
-	   nil t)
-	  (setq border (point))
-	(error "header separator not found"))
+      ;; follow RFC822 rules instead of looking for a fixed separator
+      (rfc822-goto-eoh)
+      (forward-line 1)
+      (setq border (point))
 
       ;; note that the point is placed at the border
       (if (or (re-search-forward "^<sera>$" nil t)
@@ -1225,15 +1221,11 @@ The very same procedure applies to the subject field, too."
 	border)
     (save-excursion
 
-      ;; look for the header-body separator
-      (goto-char (point-min))
-      (if (search-forward
-	   (if (eq major-mode 'rmail-mode)
-	       "\n\n" (concat "\n" mail-header-separator "\n"))
-	   nil t)
-	  (setq border (point))
-	(error "header separator not found"))
-			     
+      ;; follow RFC822 rules instead of looking for a fixed separator
+      (rfc822-goto-eoh)
+      (forward-line 1)
+      (setq border (point))
+
       ;; process body first not to change the border
       ;; note that the point is already at the border
       (if (re-search-forward "\\ce" nil t)