From d0eecffacb1b585868ab13af3b1cd808bce77bbe Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Fri, 11 Feb 1994 22:04:41 +0000 Subject: [PATCH] (rmail-variables, rmail-insert-inbox-text): Change user-original-login-name to user-login-name. --- lisp/mail/rmail.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 17b87a83c4d..5ce007ef8f6 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -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 @@ Instead, these commands are available: (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 @@ argument causes us to read a file name and use that file as the inbox." ;; 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 ...") -- 2.39.5