X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=std11.el;h=9227ad0cb20851e8273002b17946db2c934d1f41;hb=caf43ddadf46a06e795f0a220118fca4318af85f;hp=a0832361db1ad9e9d789135851ea0cef9530e23b;hpb=41fe6bdf8523a73c43e73612b5df85caa5622081;p=elisp%2Fflim.git

diff --git a/std11.el b/std11.el
index a083236..9227ad0 100644
--- a/std11.el
+++ b/std11.el
@@ -1,8 +1,8 @@
 ;;; std11.el --- STD 11 functions for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99,2000,01,02 Free Software Foundation, Inc.
 
-;; Author:   MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author:   MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: mail, news, RFC 822, STD 11
 
 ;; This file is part of FLIM (Faithful Library about Internet Message).
@@ -24,10 +24,7 @@
 
 ;;; Code:
 
-(or (fboundp 'buffer-substring-no-properties)
-    (require 'poe))
-
-(require 'custom)
+(require 'custom)			; std11-lexical-analyzer
 
 
 ;;; @ fetch
@@ -47,9 +44,7 @@ The optional argument BOUNDs the search; it is a buffer position."
     (if (re-search-forward "^$" bound t)
 	(goto-char (1- (match-beginning 0)))
       (end-of-line)
-      ))
-  (point)
-  )
+      (point))))
 
 ;;;###autoload
 (defun std11-fetch-field (name)
@@ -292,6 +287,11 @@ be the result."
   )
 ;; (defconst std11-spaces-regexp
 ;;   (eval-when-compile (concat "[" std11-space-char-list "]+")))
+
+(defconst std11-non-atom-regexp
+  (eval-when-compile
+    (concat "[" std11-special-char-list std11-space-char-list "]")))
+
 (defconst std11-atom-regexp
   (eval-when-compile
     (concat "[^" std11-special-char-list std11-space-char-list "]+")))
@@ -316,13 +316,21 @@ be the result."
     ))
 
 (defun std11-analyze-atom (string start)
-  (if (and (string-match std11-atom-regexp string start)
-	   (= (match-beginning 0) start))
-      (let ((end (match-end 0)))
-	(cons (cons 'atom (substring string start end))
-	      ;;(substring string end)
-	      end)
-	)))
+  (if (string-match std11-non-atom-regexp string start)
+      (if (> (match-beginning 0) start)
+	  (cons (cons 'atom (substring string start (match-beginning 0)))
+		(match-beginning 0))
+	nil)
+    (cons (cons 'atom (substring string start))
+	  (length string)))
+  ;; (if (and (string-match std11-atom-regexp string start)
+  ;;          (= (match-beginning 0) start))
+  ;;     (let ((end (match-end 0)))
+  ;;       (cons (cons 'atom (substring string start end))
+  ;;             ;;(substring string end)
+  ;;             end)
+  ;;       ))
+  )
 
 (defun std11-check-enclosure (string open close &optional recursive from)
   (let ((len (length string))
@@ -399,7 +407,7 @@ be the result."
 			  (null (setq r (funcall func string start))))
 		(setq rest (cdr rest)))
 	      (or r
-		  (list (cons 'error (substring string start)) (1+ len)))
+		  (cons (cons 'error (substring string start)) (1+ len)))
 	      ))
       (setq dest (cons (car ret) dest)
 	    start (cdr ret))
@@ -436,8 +444,7 @@ be the result."
 		(setq token (car lal))
 		(or (std11-ignored-token-p token)
 		    (if (and (setq token-value (cdr token))
-			     (find-non-ascii-charset-string token-value)
-			     )
+			     (delq 'ascii (find-charset-string token-value)))
 			(setq token nil)
 		      )))
       (setq lal (cdr lal))
@@ -766,7 +773,7 @@ represents addr-spec of RFC 822."
   "Return string of address part from parsed ADDRESS of RFC 822."
   (cond ((eq (car address) 'group)
 	 (mapconcat (function std11-address-string)
-		    (car (cdr address))
+		    (nth 2 address)
 		    ", ")
 	 )
 	((eq (car address) 'mailbox)