[Emacs-diffs] Changes to emacs/lisp/x-dnd.el

[Richard M . Stallman]

Index: emacs/lisp/x-dnd.el
diff -c emacs/lisp/x-dnd.el:1.17 emacs/lisp/x-dnd.el:1.18
*** emacs/lisp/x-dnd.el:1.17    Mon Oct  3 19:41:25 2005
--- emacs/lisp/x-dnd.el Tue Oct  4 20:29:50 2005
***************
*** 308,320 ****
         (w (posn-window (event-start event))))
      (when handler
        (if (and (windowp w) (window-live-p w)
!              (not (minibufferp (window-buffer w))))
!         ;; If dropping in a window, open files in that window rather
!         ;; than in a new widow.
          (progn
            (goto-char (posn-point (event-start event)))
            (funcall handler window action data))
!       (let ((dnd-open-file-other-window t))  ;; Dropping on non-window.
          (select-frame frame)
          (funcall handler window action data))))))
  
--- 308,323 ----
         (w (posn-window (event-start event))))
      (when handler
        (if (and (windowp w) (window-live-p w)
!              (not (window-minibuffer-p w))
!              (not (window-dedicated-p w)))
!         ;; If dropping in an ordinary window which we could use,
!         ;; let dnd-open-file-other-window specify what to do.
          (progn
            (goto-char (posn-point (event-start event)))
            (funcall handler window action data))
!       ;; If we can't display the file here,
!       ;; make a new window for it.
!       (let ((dnd-open-file-other-window t))
          (select-frame frame)
          (funcall handler window action data))))))