[Emacs-diffs] /srv/bzr/emacs/trunk r107425: Make drop on NS/OSX behave the same as other platforms (Bug 5855 and 10050).

[Jan D.]

------------------------------------------------------------
revno: 107425
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-25 11:04:30 +0100
message:
  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).
modified:
  doc/emacs/ChangeLog
  doc/emacs/macos.texi
  lisp/ChangeLog
  lisp/term/ns-win.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-02-25 03:49:22 +0000
+++ b/doc/emacs/ChangeLog       2012-02-25 10:04:30 +0000
@@ -1,3 +1,8 @@
+2012-02-25  Jan Djärv  <address@hidden>
+
+       * macos.texi (Mac / GNUstep Customization): Remove text about
+       ns-find-file and ns-drag-file (Bug#5855, Bug#10050).
+
 2012-02-25  Dani Moncayo  <address@hidden>  (tiny change)
 
        * buffers.texi (Select Buffer): Mention that saving in a new file

=== modified file 'doc/emacs/macos.texi'
--- a/doc/emacs/macos.texi      2012-02-22 08:16:48 +0000
+++ b/doc/emacs/macos.texi      2012-02-25 10:04:30 +0000
@@ -113,18 +113,6 @@
 Useful in this context is the listing of all faces obtained by
 @kbd{M-x list-faces-display}.
 
address@hidden 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:
-
address@hidden
-(define-key global-map [ns-drag-file] 'ns-find-file)
address@hidden lisp
-
-
 @subsection Customization options specific to Mac OS / GNUstep
 
 The following customization options are specific to the Nextstep port.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-25 10:00:08 +0000
+++ b/lisp/ChangeLog    2012-02-25 10:04:30 +0000
@@ -1,3 +1,9 @@
+2012-02-25  Jan Djärv  <address@hidden>
+
+       * term/ns-win.el (global-map): Bind ns-drag-file to
+       ns-find-file (Bug#5855, Bug#10050).
+
+
 2012-02-25  Andreas Schwab  <address@hidden>
 
        * calendar/parse-time.el (parse-time-string): Allow extractor to

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2012-01-19 07:21:25 +0000
+++ b/lisp/term/ns-win.el       2012-02-25 10:04:30 +0000
@@ -163,7 +163,7 @@
 (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)