Merge from emacs-24; up to 2012-11-19T11:36:02Z!yamaoka@jpl.org

[bpt/emacs.git] / lisp / dired.el

diff --git a/lisp/dired.el b/lisp/dired.el
index b62b4d1..1d6c667 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3732,6 +3732,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;  Desktop support
 
 (eval-when-compile (require 'desktop))
+(declare-function desktop-file-name "desktop" (filename dirname))
 
 (defun dired-desktop-buffer-misc-data (dirname)
   "Auxiliary information to be saved in desktop file."