[Emacs-diffs] Changes to emacs/lisp/startup.el

[Luc Teirlinck]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.348 emacs/lisp/startup.el:1.349
*** emacs/lisp/startup.el:1.348 Wed Apr 13 00:23:52 2005
--- emacs/lisp/startup.el       Wed Apr 13 22:24:03 2005
***************
*** 752,757 ****
--- 752,767 ----
                (not (fboundp 'x-show-tip)))
      (tooltip-mode 1))
  
+   ;; If you change the code below, you need to also change the
+   ;; corresponding code in the xterm-mouse-mode defcustom.  The two need
+   ;; to be equivalent under all conditions, or Custom will get confused.
+   (unless (or noninteractive
+             window-system)
+     (let ((term (getenv "TERM")))
+       (and term
+          (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" term)
+          (xterm-mouse-mode 1))))
+ 
    ;; Register default TTY colors for the case the terminal hasn't a
    ;; terminal init file.
    (unless (memq window-system '(x w32))
***************
*** 964,972 ****
    ;; Load library for our terminal type.
    ;; User init file can set term-file-prefix to nil to prevent this.
  
-   ;; If you change the code below, you need to also change the
-   ;; corresponding code in the xterm-mouse-mode defcustom.  The two need
-   ;; to be equivalent under all conditions, or Custom will get confused.
    (unless (or noninteractive
                window-system
                (null term-file-prefix))
--- 974,979 ----
***************
*** 978,987 ****
          (setq term
                (if (setq hyphend (string-match "[-_][^-_]+$" term))
                    (substring term 0 hyphend)
!                 nil)))
!       (and term
!          (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" term)
!          (xterm-mouse-mode 1))))
  
    ;; Update the out-of-memory error message based on user's key bindings
    ;; for save-some-buffers.
--- 985,991 ----
          (setq term
                (if (setq hyphend (string-match "[-_][^-_]+$" term))
                    (substring term 0 hyphend)
!                 nil)))))
  
    ;; Update the out-of-memory error message based on user's key bindings
    ;; for save-some-buffers.