Check whether diff supports --label before using it

[gnu-emacs] / lisp / dnd.el

diff --git a/lisp/dnd.el b/lisp/dnd.el
index 19b950161744b10b8af2f326a5d2b294ea28fa05..d9061273c32e9210cf899e2d82329b80e0002dea 100644 (file)
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -1,6 +1,6 @@
 ;;; dnd.el --- drag and drop support.  -*- coding: utf-8 -*-
 
-;; Copyright (C) 2005-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
 ;; Maintainer: FSF
@@ -160,7 +160,7 @@ Return nil if URI is not a local file."
       (setq f nil))
     f))
 
-(defun dnd-open-local-file (uri action)
+(defun dnd-open-local-file (uri _action)
   "Open a local file.
 The file is opened in the current window, or a new window if
 `dnd-open-file-other-window' is set.  URI is the url for the file,
@@ -180,7 +180,7 @@ An alternative for systems that do not support unc file names is
          'private)
       (error "Can not read %s" uri))))
 
-(defun dnd-open-remote-url (uri action)
+(defun dnd-open-remote-url (uri _action)
   "Open a remote file with `find-file' and `url-handler-mode'.
 Turns `url-handler-mode' on if not on before.  The file is opened in the
 current window, or a new window if `dnd-open-file-other-window' is set.