Update.

[gnu-emacs] / lisp / mail / mail-extr.el

diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 9ef5a02bd264a0cdd88ca2676c3534c59b13430f..46f59e0284715f99adc3b28a372e1297a44cb57a 100644 (file)
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,7 +1,7 @@
 ;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@cs.bu.edu>
 ;; Maintainer: FSF
@@ -9,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -850,7 +848,7 @@ consing a string.)"
              (setq char ?\() ; HAVE I NO SHAME??
              )
             ;; record the position of various interesting chars, determine
-            ;; legality later.
+            ;; validity later.
             ((setq record-pos-symbol
                    (cdr (assq char
                               '((?< . <-pos) (?> . >-pos) (?@ . @-pos)
@@ -862,9 +860,9 @@ consing a string.)"
             ((eq char ?.)
              (forward-char 1))
             ((memq char '(
-                          ;; comment terminator illegal
+                          ;; comment terminator invalid
                           ?\)
-                          ;; domain literal terminator illegal
+                          ;; domain literal terminator invalid
                           ?\]
                           ;; \ allowed only within quoted strings,
                           ;; domain literals, and comments
@@ -2175,5 +2173,5 @@ place.  It affects how `mail-extract-address-components' works."
 \f
 (provide 'mail-extr)
 
-;;; arch-tag: 7785fade-1073-4ed6-b4f6-28db34a7982d
+;; arch-tag: 7785fade-1073-4ed6-b4f6-28db34a7982d
 ;;; mail-extr.el ends here