Gnus -- minor build / warning fixes [OK For Upstream]

[gnus] / lisp / ietf-drums.el

diff --git a/lisp/ietf-drums.el b/lisp/ietf-drums.el
index f72b09c..c0e1542 100644 (file)
--- 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, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -122,7 +121,7 @@ backslash and doublequote.")
        (setq c (char-after))
        (cond
         ((eq c ?\")
-         (condition-case err
+         (condition-case nil
              (forward-sexp 1)
            (error (goto-char (point-max)))))
         ((eq c ?\()
@@ -207,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
@@ -215,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)))