# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 761004281 0
# Node ID 3d155c2636bfa4a11f279ff12d2c6cfe90efd8d1
# Parent  909b94d547c4b53b8f8558c6c62348e0ef641de0
(rmail-variables, rmail-insert-inbox-text): Change user-original-login-name to
user-login-name.

diff -r 909b94d547c4 -r 3d155c2636bf lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Fri Feb 11 22:01:56 1994 +0000
+++ b/lisp/mail/rmail.el	Fri Feb 11 22:04:41 1994 +0000
@@ -38,9 +38,6 @@
 (require 'mail-utils)
 
 ;; For Emacs V18 compatibility
-(and (not (fboundp 'user-original-login-name))
-     (fboundp 'user-real-login-name)
-     (defalias 'user-original-login-name 'user-real-login-name))
 (and (not (fboundp 'buffer-disable-undo))
      (fboundp 'buffer-flush-undo)
      (defalias 'buffer-disable-undo 'buffer-flush-undo))
@@ -577,7 +574,7 @@
 	     (or rmail-primary-inbox-list
 		 (list (or (getenv "MAIL")
 			   (concat rmail-spool-directory
-				   (user-original-login-name)))))))
+				   (user-login-name)))))))
   (make-local-variable 'rmail-keywords)
   ;; this gets generated as needed
   (setq rmail-keywords nil)
@@ -782,7 +779,7 @@
 	    ;; On some systems, /usr/spool/mail/foo is a directory
 	    ;; and the actual inbox is /usr/spool/mail/foo/foo.
 	    (if (file-directory-p file)
-		(setq file (expand-file-name (user-original-login-name)
+		(setq file (expand-file-name (user-login-name)
 					     file)))))
       (if popmail
 	  (message "Getting mail from post office ...")