Switch to recommended form of GPLv3 permissions notice.

[bpt/emacs.git] / lisp / mail / mailalias.el

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 55c284d..0ccb1b4 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -1,16 +1,17 @@
 ;;; mailalias.el --- expand and complete mailing address aliases
 
-;; Copyright (C) 1985, 1987, 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003,
+;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
 
 ;; 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 2, 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
@@ -18,9 +19,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:
 
@@ -261,6 +260,12 @@ By default, this is the file specified by `mail-personal-alias-file'."
                  ((file-exists-p (setq file (concat "~/" file)))
                   (insert-file-contents file))
                  (t (setq file nil)))
+           (goto-char (point-min))
+           ;; Delete comments from the contents.
+           (while (search-forward "# " nil t)
+             (let ((p (- (point) 2)))
+               (end-of-line)
+               (delete-region p (point))))
            ;; Don't lose if no final newline.
            (goto-char (point-max))
            (or (eq (preceding-char) ?\n) (newline))
@@ -546,5 +551,5 @@ See `mail-directory-stream'."
 
 (provide 'mailalias)
 
-;;; arch-tag: 1d6a0f87-eb34-4d45-8816-60c1b952cf46
+;; arch-tag: 1d6a0f87-eb34-4d45-8816-60c1b952cf46
 ;;; mailalias.el ends here