(hexlify-command): Apply shell-quote-argument after

expanding hexl-program in case exec-directory contains a space.
(dehexlify-command): Ditto.

1 files changed, 8 insertions, 2 deletions

diff --git a/lisp/hexl.el b/lisp/hexl.el
index 40096800d0e..e4c80c68c79 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -77,13 +77,19 @@ and \"-de\" when dehexlifying a buffer."
   :group 'hexl)
 
 (defcustom hexlify-command
-  (format "%s%s %s" exec-directory hexl-program hexl-options)
+  (format "%s %s"
+          (shell-quote-argument
+           (expand-file-name hexl-program exec-directory))
+          hexl-options)
   "The command to use to hexlify a buffer."
   :type 'string
   :group 'hexl)
 
 (defcustom dehexlify-command
-  (format "%s%s -de %s" exec-directory hexl-program hexl-options)
+  (format "%s -de %s"
+          (shell-quote-argument
+           (expand-file-name hexl-program exec-directory))
+          hexl-options)
   "The command to use to unhexlify a buffer."
   :type 'string
   :group 'hexl)