# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 826358595 0
# Node ID 619266555aec22b6c65f34b0532a6c0a4729b972
# Parent  8557ab78a8216d233157482f93c6c2bffb1f397d
(mail-get-names): Understand "+username" format for /etc/passwd lines.

diff -r 8557ab78a821 -r 619266555aec lisp/mail/mailalias.el
--- a/lisp/mail/mailalias.el	Sat Mar 09 00:32:05 1996 +0000
+++ b/lisp/mail/mailalias.el	Sat Mar 09 08:03:15 1996 +0000
@@ -334,10 +334,14 @@
 	(insert-file-contents "/etc/passwd" nil nil nil t)
 	(setq mail-local-names)
 	(while (not (eobp))
-	  (setq mail-local-names
-		`((,(buffer-substring (point)
-				      (1- (search-forward ":"))))
-		  ,@mail-local-names))
+	  ;;Recognize lines like
+	  ;;  nobody:*:65534:65534::/:
+	  ;;  +demo::::::/bin/csh
+	  ;;  +ethanb
+	  ;;while skipping
+	  ;;  +@SOFTWARE
+	  (if (looking-at "\\+?\\([^:@\n+]+\\)")
+	      (add-to-list 'mail-local-names (list (match-string 1))))
 	  (beginning-of-line 2))
 	(kill-buffer (current-buffer))))
   (if (or (eq mail-names t)