diff options
| author | Karoly Lorentey | 2006-05-10 15:04:01 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-05-10 15:04:01 +0000 |
| commit | 8dadeb1e1f78c7be07db5ae78aa9eed58d272a4e (patch) | |
| tree | 6262988e87d6b347a8c90fcc3c5b49f9bb5b36e1 /src/keyboard.c | |
| parent | f6cf85ac95e469835a2643024f995b471a4c5d52 (diff) | |
| parent | 9a4d87c8d5f4503d67d5155eae6d543cc31f86d0 (diff) | |
| download | emacs-8dadeb1e1f78c7be07db5ae78aa9eed58d272a4e.tar.gz emacs-8dadeb1e1f78c7be07db5ae78aa9eed58d272a4e.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-266
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-267
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-268
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-269
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-270
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-271
Rename "field-at-point" to "field-at-pos"
* emacs@sv.gnu.org/emacs--devo--0--patch-272
(comint-insert-input): Remove redundant calls to setq and goto-char
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-556
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 1ad852c819a..5dcd2f8f5ae 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -5992,8 +5992,7 @@ make_lispy_event (event) | |||
| 5992 | spec[1] = event->y; | 5992 | spec[1] = event->y; |
| 5993 | return Fcons (Qmac_apple_event, | 5993 | return Fcons (Qmac_apple_event, |
| 5994 | Fcons (Fvector (2, spec), | 5994 | Fcons (Fvector (2, spec), |
| 5995 | Fcons (mac_make_lispy_event_code (event->code), | 5995 | Fcons (event->arg, Qnil))); |
| 5996 | Qnil))); | ||
| 5997 | } | 5996 | } |
| 5998 | #endif | 5997 | #endif |
| 5999 | 5998 | ||