*** empty log message ***

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 9e19bbdd53e91d35258bf12fb81c16cc57453323..20b4ff07018ea5c6d33a4fe39a3543655394e35b 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -205,10 +205,6 @@
   (setq x-switches-specified (append x-switches-specified
                                     initial-screen-alist
                                     screen-default-alist))
-  (and (string-equal (user-real-login-name) "mtr")
-       (setq x-switches-specified
-            (append (list '(name . "Die, Yuppie SCUM!!!"))
-                    x-switches-specified)))
   ;; see screen.el for this function
   (pop-initial-screen x-switches-specified)
   (delete-screen terminal-screen))
@@ -516,7 +512,7 @@
   '(lambda nil (interactive)
      (insert "\n")))
 
-(define-function-key global-function-map 'xk-kp-f1 'rmail)
+(define-function-key global-function-map 'xk-kp-f1 nil)
 (define-function-key global-function-map 'xk-kp-f2 nil)
 (define-function-key global-function-map 'xk-kp-f3 nil)
 (define-function-key global-function-map 'xk-kp-f4 nil)