From: akr <akr>
Date: Mon, 23 Mar 1998 00:01:15 +0000 (+0000)
Subject: * eword-decode.el (eword-analyze-atom): Treat encoded-word immediately
X-Git-Tag: akr-199811302358~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ef0f212cbaef755720ce7bba19485715a4241199;p=elisp%2Fsemi.git

* eword-decode.el (eword-analyze-atom): Treat encoded-word immediately
after an atom.
---

diff --git a/ChangeLog b/ChangeLog
index 30c0a2c..b6e5c8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1998-03-22  Tanaka Akira  <akr@jaist.ac.jp>
 
+	* eword-decode.el (eword-analyze-atom): Treat encoded-word immediately
+	after an atom.
+
+1998-03-22  Tanaka Akira  <akr@jaist.ac.jp>
+
 	* eword-decode.el (eword-after-encoded-word-regexp): New constant.
 	eword-encoded-text-in-phrase-regexp: New constant.
 	eword-encoded-word-in-phrase-regexp: New constant.
diff --git a/eword-decode.el b/eword-decode.el
index 3b52aa4..897b942 100644
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -643,9 +643,10 @@ be the result."
   (std11-analyze-special string))
 
 (defun eword-analyze-encoded-word (string &optional must-unfold)
-  (let ((decoded (eword-decode-first-encoded-words string
+  (let ((decoded (eword-decode-first-encoded-words
+  		   string
 		   eword-encoded-word-in-phrase-regexp
-                   eword-after-encoded-word-in-phrase-regexp
+		   eword-after-encoded-word-in-phrase-regexp
 		   must-unfold)))
     (if decoded
       (cons (cons 'atom (car decoded)) (cdr decoded)))))
@@ -653,6 +654,11 @@ be the result."
 (defun eword-analyze-atom (string &optional must-unfold)
   (if (string-match std11-atom-regexp string)
       (let ((end (match-end 0)))
+	(if (and eword-decode-sticked-encoded-word
+		 (string-match eword-encoded-word-in-phrase-regexp
+		 	       (substring string 0 end))
+		 (< 0 (match-beginning 0)))
+	    (setq end (match-beginning 0)))
 	(cons (cons 'atom (decode-mime-charset-string
 			   (substring string 0 end)
 			   default-mime-charset))