X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fietf-drums.el;h=e681ecfb3d68bc18b4256c4593d5af3e2c30834d;hb=8fbe1cab213763b9122b59cfb92e8cf1da521d2c;hp=45a6ce2eae78799e6c02e9a29af48301e081d83c;hpb=e2c9efb05a1ae9e65fd40bab80466da331f3981b;p=gnus

diff --git a/lisp/ietf-drums.el b/lisp/ietf-drums.el
index 45a6ce2ea..e681ecfb3 100644
--- a/lisp/ietf-drums.el
+++ b/lisp/ietf-drums.el
@@ -1,7 +1,6 @@
 ;;; ietf-drums.el --- Functions for parsing RFC822bis headers
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -39,7 +38,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(require 'time-date)
 (require 'mm-util)
 
 (defvar ietf-drums-no-ws-ctl-token "\001-\010\013\014\016-\037\177"
@@ -208,7 +206,6 @@ backslash and doublequote.")
 		   (1+ (point))
 		   (progn (forward-sexp 1) (1- (point))))))))
 	 (t
-	  (message "Unknown symbol: %c" c)
 	  (forward-char 1))))
       ;; If we found no display-name, then we look for comments.
       (if display-name
@@ -216,7 +213,8 @@ backslash and doublequote.")
 		(mapconcat 'identity (reverse display-name) " "))
 	(setq display-string (ietf-drums-get-comment string)))
       (if (not mailbox)
-	  (when (string-match "@" display-string)
+	  (when (and display-string
+		     (string-match "@" display-string))
 	    (cons
 	     (mapconcat 'identity (nreverse display-name) "")
 	     (ietf-drums-get-comment string)))
@@ -296,5 +294,4 @@ a list of address strings."
 
 (provide 'ietf-drums)
 
-;; arch-tag: 379a0191-dbae-4ca6-a0f5-d4202c209ef9
 ;;; ietf-drums.el ends here