Merge from emacs--devo--0

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 6054099bb4d8d5e4d841367db8d99ad48c1fb27b..749956091df004d679b94ee46a2d212a47956645 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -651,6 +651,8 @@ is nil, ask the user where to save the desktop."
       value)))
 
 ;; ----------------------------------------------------------------------------
+(declare-function uniquify-item-base "uniquify" (cl-x) t) ; defstruct
+
 (defun desktop-buffer-info (buffer)
   (set-buffer buffer)
   (list