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

[Luc Teirlinck]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.346 emacs/lisp/startup.el:1.347
*** emacs/lisp/startup.el:1.346 Tue Apr 12 19:59:54 2005
--- emacs/lisp/startup.el       Tue Apr 12 23:06:44 2005
***************
*** 746,751 ****
--- 746,754 ----
    (custom-reevaluate-setting 'blink-cursor-mode)
    (custom-reevaluate-setting 'normal-erase-is-backspace)
  
+   ;; If you change the code below, you need to also change the
+   ;; corresponding code in the tooltip-mode defcustom.  The two need
+   ;; to be equivalent under all conditions, or Custom will get confused.
    (unless (or noninteractive
              emacs-basic-display
                (not (display-graphic-p))
***************
*** 963,968 ****
--- 966,975 ----
  
    ;; 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,980 ****
          (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.
--- 981,990 ----
          (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.