diff options
| author | Jan Djärv | 2004-02-05 11:46:57 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-02-05 11:46:57 +0000 |
| commit | 14ca885408a6fcf5191d5e7869b2726c91081a71 (patch) | |
| tree | 7ef63542c45b40fbc5631beebbd641b08c887c68 | |
| parent | ebaff4af6850c6a11c29850b653affd35ab1bdc5 (diff) | |
| download | emacs-14ca885408a6fcf5191d5e7869b2726c91081a71.tar.gz emacs-14ca885408a6fcf5191d5e7869b2726c91081a71.zip | |
* x-dnd.el (x-dnd-get-local-file-name): Fix byte compiler warning
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/x-dnd.el | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 625c6aad812..0bb4307abf6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-02-05 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * x-dnd.el (x-dnd-get-local-file-name): Fix byte compiler warning | ||
| 4 | |||
| 1 | 2004-02-04 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2004-02-04 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * progmodes/cperl-mode.el (cperl-fill-paragraph): Call fill-paragraph | 7 | * progmodes/cperl-mode.el (cperl-fill-paragraph): Call fill-paragraph |
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 18fcb62d6bf..ad55e3cbd34 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el | |||
| @@ -289,8 +289,7 @@ Return nil if URI is not a local file." | |||
| 289 | (let ((f (cond ((string-match "^file:///" uri) ; XDND format. | 289 | (let ((f (cond ((string-match "^file:///" uri) ; XDND format. |
| 290 | (substring uri (1- (match-end 0)))) | 290 | (substring uri (1- (match-end 0)))) |
| 291 | ((string-match "^file:" uri) ; Old KDE, Motif, Sun | 291 | ((string-match "^file:" uri) ; Old KDE, Motif, Sun |
| 292 | (substring uri (match-end 0))) | 292 | (substring uri (match-end 0)))))) |
| 293 | nil))) | ||
| 294 | (when (and f must-exist) | 293 | (when (and f must-exist) |
| 295 | (let* ((decoded-f (decode-coding-string | 294 | (let* ((decoded-f (decode-coding-string |
| 296 | f | 295 | f |