diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-01-06 16:13:05 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-01-06 16:13:05 +0000 |
| commit | a8bf7299ee74781dd485c33c5eac20aee0f0ebef (patch) | |
| tree | d2bc1c0d3d7a64a19945b5bb5d175cae37088bca /lisp/term/mac-win.el | |
| parent | e079ecf45241cc5d2904db7ede9592f9861bb9aa (diff) | |
| parent | 600bc46cd52fbdedf592158c6b03ccfca88dbade (diff) | |
| download | emacs-a8bf7299ee74781dd485c33c5eac20aee0f0ebef.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 683-684)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493
Diffstat (limited to 'lisp/term/mac-win.el')
| -rw-r--r-- | lisp/term/mac-win.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 6feaa347c8b..dea988868eb 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1381,7 +1381,7 @@ in `selection-converter-alist', which see." (put 'core-event 'mac-apple-event-class "aevt") ; kCoreEventClass (put 'internet-event 'mac-apple-event-class "GURL") ; kAEInternetEventClass -;;; Event IDs +;;; Event IDs ;; kCoreEventClass (put 'open-application 'mac-apple-event-id "oapp") ; kAEOpenApplication (put 'reopen-application 'mac-apple-event-id "rapp") ; kAEReopenApplication @@ -1409,14 +1409,14 @@ in `selection-converter-alist', which see." (error "Not an Apple event: %S" ae) (let ((type-data (cdr (assoc keyword (cdr ae)))) data) - (when (and type type-data) + (when (and type type-data (not (equal type (car type-data)))) (setq data (mac-coerce-ae-data (car type-data) (cdr type-data) type)) (setq type-data (if data (cons type data) nil))) type-data))) (defun mac-ae-list (ae &optional keyword type) (or keyword (setq keyword "----")) ;; Direct object. - (let ((desc (mac-ae-parameter ae keyword))) + (let ((desc (mac-ae-parameter ae keyword "list"))) (cond ((null desc) nil) ((not (equal (car desc) "list")) @@ -1588,6 +1588,9 @@ Currently the `mailto' scheme is supported." (setq service-message (intern (decode-coding-string service-message 'utf-8))) (setq binding (lookup-key binding (vector service-message)))) + ;; Replace (cadr event) with a dummy position so that event-start + ;; returns it. + (setcar (cdr event) (list (selected-window) (point) '(0 . 0) 0)) (call-interactively binding))) (global-set-key [mac-apple-event] 'mac-dispatch-apple-event) |