Merge from origin/emacs-25

[gnu-emacs] / lisp / org / org-protocol.el

diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 2f2c54b6af6e162f836c6fcc1a79975e6bdc1281..667b7482d09f4852b5e15bb6e339240dbb247973 100644 (file)
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -119,7 +119,7 @@
 (eval-when-compile
   (require 'cl))
 
-(declare-function org-publish-get-project-from-filename "org-publish"
+(declare-function org-publish-get-project-from-filename "ox-publish"
                  (filename &optional up))
 (declare-function server-edit "server" (&optional arg))