diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-02-25 11:04:30 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-02-25 11:04:30 +0100 |
| commit | 525795c1bd665eabf5b62e9ab6706ea0a6c25c19 (patch) | |
| tree | f4df963354c07d03b4d2ad48dfaa43910e15ac73 | |
| parent | f008086fd23420f0ea9d030b7efd827e6fe551b4 (diff) | |
| download | emacs-525795c1bd665eabf5b62e9ab6706ea0a6c25c19.tar.gz | |
Make drop on NS/OSX behave the same as other platforms (Bug 5855 and 10050).
* doc/emacs/macos.texi (Mac / GNUstep Customization): Remove text about
ns-find-file and ns-drag-file (Bug#5855, Bug#10050).
* lisp/term/ns-win.el (global-map): Bind ns-drag-file to
ns-find-file (Bug#5855, Bug#10050).
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/macos.texi | 12 | ||||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 3d3c8f003cb..2f4653540e2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2012-02-25 Jan Djärv <jan.h.d@swipnet.se> + + * macos.texi (Mac / GNUstep Customization): Remove text about + ns-find-file and ns-drag-file (Bug#5855, Bug#10050). + 2012-02-25 Dani Moncayo <dmoncayo@gmail.com> (tiny change) * buffers.texi (Select Buffer): Mention that saving in a new file diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index fb70a462bd1..10293fe7747 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -113,18 +113,6 @@ close the altered one. Useful in this context is the listing of all faces obtained by @kbd{M-x list-faces-display}. -@subsection Open files by dragging to an Emacs window - -The default behavior when a user drags files from another application -into an Emacs frame is to insert the contents of all the dragged files -into the current buffer. To remap the @code{ns-drag-file} event to -open the dragged files in the current frame use the following line: - -@lisp -(define-key global-map [ns-drag-file] 'ns-find-file) -@end lisp - - @subsection Customization options specific to Mac OS / GNUstep The following customization options are specific to the Nextstep port. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c502a3affc..aa62fd9a70b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-02-25 Jan Djärv <jan.h.d@swipnet.se> + + * term/ns-win.el (global-map): Bind ns-drag-file to + ns-find-file (Bug#5855, Bug#10050). + + 2012-02-25 Andreas Schwab <schwab@linux-m68k.org> * calendar/parse-time.el (parse-time-string): Allow extractor to diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 2782d63b719..b681ec3440f 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -163,7 +163,7 @@ The properties returned may include `top', `left', `height', and `width'." (define-key global-map [ns-power-off] 'save-buffers-kill-emacs) (define-key global-map [ns-open-file] 'ns-find-file) (define-key global-map [ns-open-temp-file] [ns-open-file]) -(define-key global-map [ns-drag-file] 'ns-insert-file) +(define-key global-map [ns-drag-file] 'ns-find-file) (define-key global-map [ns-drag-color] 'ns-set-foreground-at-mouse) (define-key global-map [S-ns-drag-color] 'ns-set-background-at-mouse) (define-key global-map [ns-drag-text] 'ns-insert-text) |