[OS X Emacs] Aquamacs 2.1 and mouse classic emacs mapping

[Arnaud Sevin]

Hi all,

I have a problem with Aquamacs 2.1. 
I want to use the classic mapping.

I use only this with 1.9 :
(custom-set-variables
;'(osx-key-mode nil)
'(mac-option-modifier nil)
'(transient-mark-mode t)
'(x-select-enable-clipboard t))

I try to add this with 2.1 :
(define-key osx-key-mode-map [S-down-mouse-1] 'mouse-buffer-menu)
(define-key osx-key-mode-map [down-mouse-1] 'mouse-buffer-menu)
(define-key osx-key-mode-map [down-mouse-2] 'mouse-yank-at-click)
(define-key osx-key-mode-map [down-mouse-3] 'mouse-set-region)
(define-key osx-key-mode-map [double-down-mouse-3] 'mouse-save-then-kill)

But there is a problem with clipboard and it's not working very well...

Do you have any idea ?

Cheers,

Arnaud