aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Paul Wallington2006-03-03 23:55:18 +0000
committerJohn Paul Wallington2006-03-03 23:55:18 +0000
commitda92726901b0a73ada40c386c01f95fd1723e97e (patch)
tree74bcf5a2d3f6be80f03d1df63cae8daf789f271f
parent5e9edb94b78ef77981213fca9319d591c7362855 (diff)
downloademacs-da92726901b0a73ada40c386c01f95fd1723e97e.tar.gz
emacs-da92726901b0a73ada40c386c01f95fd1723e97e.zip
(t-mouse-drag-start, t-mouse-swap-alt-keys): Doc fix; escape
parentheses at beginning of line. (t-mouse-tty, t-mouse-make-event): Doc fix; use imperative. (t-mouse-mode): Remove period from end of error message.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/t-mouse.el32
2 files changed, 25 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a539543947..61808a4c423 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,13 @@
12006-03-03 John Paul Wallington <jpw@pobox.com>
2
3 * t-mouse.el (t-mouse-drag-start, t-mouse-swap-alt-keys): Doc fix;
4 escape parentheses at beginning of line.
5 (t-mouse-tty, t-mouse-make-event): Doc fix; use imperative.
6 (t-mouse-mode): Remove period from end of error message.
7
12006-03-03 Agustin Martin <agustin.martin@hispalinux.es> 82006-03-03 Agustin Martin <agustin.martin@hispalinux.es>
2 9
3 textmodes/flyspell.el (flyspell-process-localwords): Be 10 * textmodes/flyspell.el (flyspell-process-localwords): Be
4 case-sensitive. 11 case-sensitive.
5 12
62006-03-03 Martin Rudalics <rudalics@gmx.at> 132006-03-03 Martin Rudalics <rudalics@gmx.at>
@@ -33,7 +40,7 @@
33 40
342006-03-03 Ken Manheimer <ken.manheimer@gmail.com> 412006-03-03 Ken Manheimer <ken.manheimer@gmail.com>
35 42
36 allout.el: Restablished intermediate missing comment header to 43 * allout.el: Restablished intermediate missing comment header to
37 preserve outline structure. 44 preserve outline structure.
38 (allout-beginning-of-current-entry): Wasn't skipping invisible 45 (allout-beginning-of-current-entry): Wasn't skipping invisible
39 text - fixed. 46 text - fixed.
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 2dae9d1f977..17d486749b3 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -6,7 +6,7 @@
6 6
7;; Copyright (C) 1994,1995 Alessandro Rubini <rubini@linux.it> 7;; Copyright (C) 1994,1995 Alessandro Rubini <rubini@linux.it>
8;; parts are by Ian T Zimmermann <itz@rahul.net>, 1995,1998 8;; parts are by Ian T Zimmermann <itz@rahul.net>, 1995,1998
9;; Copyright (C) 2006 9;; Copyright (C) 2006
10;; Free Software Foundation, Inc. 10;; Free Software Foundation, Inc.
11 11
12;; This file is part of GNU Emacs. 12;; This file is part of GNU Emacs.
@@ -29,15 +29,15 @@
29;;; Commentary: 29;;; Commentary:
30 30
31;; This package provides access to mouse event as reported by the 31;; This package provides access to mouse event as reported by the
32;; gpm-Linux package. It uses the program "mev" to get mouse events. 32;; gpm-Linux package. It uses the program "mev" to get mouse events.
33;; It tries to reproduce the functionality offered by emacs under X. 33;; It tries to reproduce the functionality offered by Emacs under X.
34;; The "gpm" server runs under Linux, so this package is rather 34;; The "gpm" server runs under Linux, so this package is rather
35;; Linux-dependent. 35;; Linux-dependent.
36 36
37;; Modified by Nick Roberts for Emacs 22. In particular, the mode-line is 37;; Modified by Nick Roberts for Emacs 22. In particular, the mode-line is
38;; now position sensitive. 38;; now position sensitive.
39 39
40(defvar t-mouse-process nil 40(defvar t-mouse-process nil
41 "Embeds the process which passes mouse events to emacs. 41 "Embeds the process which passes mouse events to emacs.
42It is used by the program t-mouse.") 42It is used by the program t-mouse.")
43 43
@@ -53,7 +53,7 @@ See `t-mouse-start-debug'.")
53 53
54(defvar t-mouse-drag-start nil 54(defvar t-mouse-drag-start nil
55 "Whenever a drag starts in a special part of a window 55 "Whenever a drag starts in a special part of a window
56(not the text), the `translated' starting coordinates including the 56\(not the text), the `translated' starting coordinates including the
57window and part involved are saved here. This is necessary lest they 57window and part involved are saved here. This is necessary lest they
58get re-translated when the button goes up, at which time window 58get re-translated when the button goes up, at which time window
59configuration may have changed.") 59configuration may have changed.")
@@ -63,10 +63,10 @@ configuration may have changed.")
63 63
64(defvar t-mouse-swap-alt-keys nil 64(defvar t-mouse-swap-alt-keys nil
65 "When set, Emacs will handle mouse events with the right Alt 65 "When set, Emacs will handle mouse events with the right Alt
66(a.k.a. Alt-Ger) modifier, not with the regular left Alt modifier. 66\(a.k.a. Alt-Ger) modifier, not with the regular left Alt modifier.
67Useful for people who play strange games with their keyboard tables.") 67Useful for people who play strange games with their keyboard tables.")
68 68
69(defvar t-mouse-fix-21 nil 69(defvar t-mouse-fix-21 nil
70 "Enable brain-dead chords for 2 button mice.") 70 "Enable brain-dead chords for 2 button mice.")
71 71
72 72
@@ -75,7 +75,7 @@ Useful for people who play strange games with their keyboard tables.")
75;; get the number of the current virtual console 75;; get the number of the current virtual console
76 76
77(defun t-mouse-tty () 77(defun t-mouse-tty ()
78 "Returns number of virtual terminal Emacs is running on, as a string. 78 "Return number of virtual terminal Emacs is running on, as a string.
79For example, \"2\" for /dev/tty2." 79For example, \"2\" for /dev/tty2."
80 (with-temp-buffer 80 (with-temp-buffer
81 (call-process "ps" nil t nil "h" (format "%s" (emacs-pid))) 81 (call-process "ps" nil t nil "h" (format "%s" (emacs-pid)))
@@ -148,8 +148,8 @@ For example, \"2\" for /dev/tty2."
148 148
149;;; This fun is partly Copyright (C) 1994 Per Abrahamsen <abraham@iesd.auc.dk> 149;;; This fun is partly Copyright (C) 1994 Per Abrahamsen <abraham@iesd.auc.dk>
150(defun t-mouse-make-event () 150(defun t-mouse-make-event ()
151 "Makes a Lisp style event from the contents of mouse input accumulator. 151 "Make a Lisp style event from the contents of mouse input accumulator.
152Also trims the accumulator by all the data used to build the event." 152Also trim the accumulator by all the data used to build the event."
153 (let (ob (ob-pos (condition-case nil 153 (let (ob (ob-pos (condition-case nil
154 (progn 154 (progn
155 ;; this test is just needed for Fedora Core 3 155 ;; this test is just needed for Fedora Core 3
@@ -185,13 +185,13 @@ Also trims the accumulator by all the data used to build the event."
185 (progn 185 (progn
186 (setq end-of-root-event-name (match-beginning 0)) 186 (setq end-of-root-event-name (match-beginning 0))
187 (setq new-event-name-string 187 (setq new-event-name-string
188 (concat (substring 188 (concat (substring
189 event-name-string 0 189 event-name-string 0
190 end-of-root-event-name) "-3")) 190 end-of-root-event-name) "-3"))
191 191
192 ;;Change the event to the symbol that corresponds to the 192 ;;Change the event to the symbol that corresponds to the
193 ;;name we made. The proper symbol already exists. 193 ;;name we made. The proper symbol already exists.
194 (setq event-type 194 (setq event-type
195 (intern new-event-name-string)))))) 195 (intern new-event-name-string))))))
196 196
197 ;;store current position for mouse-position 197 ;;store current position for mouse-position
@@ -231,7 +231,7 @@ Also trims the accumulator by all the data used to build the event."
231 (concat t-mouse-filter-accumulator string)) 231 (concat t-mouse-filter-accumulator string))
232 (let ((event (t-mouse-make-event))) 232 (let ((event (t-mouse-make-event)))
233 (while event 233 (while event
234 (if (or track-mouse 234 (if (or track-mouse
235 (not (eq 'mouse-movement (event-basic-type event)))) 235 (not (eq 'mouse-movement (event-basic-type event))))
236 (setq unread-command-events 236 (setq unread-command-events
237 (nconc unread-command-events (list event)))) 237 (nconc unread-command-events (list event))))
@@ -249,7 +249,7 @@ The (secret) scrollbar interface is not implemented yet."
249;; stop-process. That doesn't work; mev receives the signal fine but 249;; stop-process. That doesn't work; mev receives the signal fine but
250;; is not really stopped: instead it returns from 250;; is not really stopped: instead it returns from
251;; kill(getpid(), SIGTSTP) immediately. I don't understand what's up 251;; kill(getpid(), SIGTSTP) immediately. I don't understand what's up
252;; itz Tue Mar 24 14:27:38 PST 1998. 252;; itz Tue Mar 24 14:27:38 PST 1998.
253 253
254(add-hook 'suspend-hook 254(add-hook 'suspend-hook
255 (function (lambda () 255 (function (lambda ()
@@ -281,8 +281,8 @@ Turn it on to use emacs mouse commands, and off to use t-mouse commands."
281 (let ((tty (t-mouse-tty)) 281 (let ((tty (t-mouse-tty))
282 (process-connection-type t)) 282 (process-connection-type t))
283 (if (not (stringp tty)) 283 (if (not (stringp tty))
284 (error "Cannot find a virtual terminal.")) 284 (error "Cannot find a virtual terminal"))
285 (setq t-mouse-process 285 (setq t-mouse-process
286 (start-process "t-mouse" nil 286 (start-process "t-mouse" nil
287 "mev" "-i" "-E" "-C" tty 287 "mev" "-i" "-E" "-C" tty
288 (if t-mouse-swap-alt-keys 288 (if t-mouse-swap-alt-keys