2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b39bf122642..7ddc5425435 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,8 @@
         * mouse.el (mouse-yank-primary):
         Reorder to silence --without-x compilation.
 
+        * mpc.el (doc-view-mode): Silence --without-x compilation.
+
         * mail/rmailmm.el (rmail-mime-set-bulk-data):
         Silence --without-x compilation.
 
diff --git a/lisp/mpc.el b/lisp/mpc.el
index bd61c261246..2bb3f91abc9 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1139,7 +1139,8 @@ If PLAYLIST is t or nil or missing, use the main playlist."
   "Major mode for the features common to all buffers of MPC."
   (buffer-disable-undo)
   (setq buffer-read-only t)
-  (setq-local tool-bar-map mpc-tool-bar-map)
+  (if (boundp 'tool-bar-map)            ; not if --without-x
+      (setq-local tool-bar-map mpc-tool-bar-map))
   (setq-local truncate-lines t))
 
 ;;; The mpc-status-mode buffer ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;