Mercurial > emacs
comparison lisp/dnd.el @ 110855:bec49af30c2f
Merge changes from emacs-23 branch.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 08 Oct 2010 12:14:47 +0200 |
| parents | 280c8ae2476d 018f0b2e8f23 |
| children | 2a665aeb6cbc |
comparison
equal
deleted
inserted
replaced
| 110820:e60b0b3ed516 | 110855:bec49af30c2f |
|---|---|
| 153 str)) | 153 str)) |
| 154 f t t)) | 154 f t t)) |
| 155 (let* ((decoded-f (decode-coding-string | 155 (let* ((decoded-f (decode-coding-string |
| 156 f | 156 f |
| 157 (or file-name-coding-system | 157 (or file-name-coding-system |
| 158 default-file-name-coding-system))) | 158 default-file-name-coding-system)))) |
| 159 (try-f (if (file-readable-p decoded-f) decoded-f f))) | 159 (setq f (cond ((file-readable-p decoded-f) decoded-f) |
| 160 (when (file-readable-p try-f) try-f))))) | 160 ((file-readable-p f) f) |
| 161 | 161 (t nil))))) |
| 162 f)) | |
| 162 | 163 |
| 163 (defun dnd-open-local-file (uri action) | 164 (defun dnd-open-local-file (uri action) |
| 164 "Open a local file. | 165 "Open a local file. |
| 165 The file is opened in the current window, or a new window if | 166 The file is opened in the current window, or a new window if |
| 166 `dnd-open-file-other-window' is set. URI is the url for the file, | 167 `dnd-open-file-other-window' is set. URI is the url for the file, |