aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>1996-03-09 08:03:15 +0000
committerRichard M. Stallman <[email protected]>1996-03-09 08:03:15 +0000
commit8bc49f8f86f125698f060c24ff697d6a4a350c6c (patch)
tree5f9cf5198db23aa98864b5d685acfef226b492f7
parentcd7ac8e8a4448e7fa26dccb3b3f969fb310b4adc (diff)
(mail-get-names): Understand "+username" format for /etc/passwd lines.
-rw-r--r--lisp/mail/mailalias.el12
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index e9890c9e72..ba884e75ab 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -334,10 +334,14 @@ Consults `/etc/passwd' and a directory service if one is set up via
(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)