(xterm-mouse-mode): Provide correct standard value for Custom. No

longer show "Mouse" in mode line when enabled.  Doc fix.

diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 4f7e19623fe1356f76f6c89c5d74099186b46b19..90e127487f559d884defd7bde6e6349cf14f9acc 100644 (file)
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -156,10 +156,33 @@
 With prefix arg, turn XTerm mouse mode on iff arg is positive.
 
 Turn it on to use Emacs mouse commands, and off to use xterm mouse commands.
-This works in terminal emulators compatible with xterm.  Only single clicks
-are supported.  When turned on, the normal xterm mouse functionality is still
-available by holding down the SHIFT key while pressing the mouse button."
-  nil " Mouse" nil :global t :group 'mouse
+This works in terminal emulators compatible with xterm.  It only
+works for simple uses of the mouse.  Basically, only non-modified
+single clicks are supported.  When turned on, the normal xterm
+mouse functionality for such clicks is still available by holding
+down the SHIFT key while pressing the mouse button."
+  :global t :group 'mouse
+  ;; Do not change the :init-value below, without corresponding
+  ;; changes in the related code in startup.el.
+  :init-value (unless (or noninteractive
+                         window-system
+                         (null term-file-prefix))
+               (let ((term (getenv "TERM"))
+                     hyphend)
+                 (while
+                     (and term
+                          (not (load (concat term-file-prefix term) t t)))
+                   ;; Strip off last hyphen and what follows, then
+                   ;; try again
+                   (setq term
+                         (if (setq hyphend
+                                   (string-match "[-_][^-_]+$" term))
+                             (substring term 0 hyphend)
+                           nil)))
+                 (and term
+                      (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)"
+                                    term)
+                      t)))
   (if xterm-mouse-mode
       ;; Turn it on
       (unless window-system