Merge from origin/emacs-25

[gnu-emacs] / lisp / url / url-dired.el

diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index bb29fecb65595f1363dd444837ff3a138cc8149c..e9d2129b228af33f7e74b65007abc98edff4d11e 100644 (file)
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -1,6 +1,6 @@
 ;;; url-dired.el --- URL Dired minor mode
 
-;; Copyright (C) 1996-1999, 2004-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2016 Free Software Foundation, Inc.
 
 ;; Keywords: comm, files
 
@@ -43,7 +43,10 @@
   (url-dired-find-file))
 
 (define-minor-mode url-dired-minor-mode
-  "Minor mode for directory browsing."
+  "Minor mode for directory browsing.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil."
   :lighter " URL" :keymap url-dired-minor-mode-map)
 
 (defun url-find-file-dired (dir)