[Emacs-diffs] Changes to emacs/lisp/hexl.el

[Stefan Monnier]

Index: emacs/lisp/hexl.el
diff -c emacs/lisp/hexl.el:1.71 emacs/lisp/hexl.el:1.72
*** emacs/lisp/hexl.el:1.71     Thu Feb 28 11:19:45 2002
--- emacs/lisp/hexl.el  Sun Mar  3 20:13:52 2002
***************
*** 65,89 ****
    :group 'hexl)
  
  (defcustom hexl-options (format "-hex %s" hexl-iso)
!   "Options to `hexl-program' that suit your needs."
!   :type 'string
!   :group 'hexl)
! 
! (defcustom hexlify-command
!   (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 -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)
  
--- 65,72 ----
    :group 'hexl)
  
  (defcustom hexl-options (format "-hex %s" hexl-iso)
!   "Space separated options to `hexl-program' that suit your needs.
! Quoting cannot be used, so the arguments cannot themselves contain spaces."
    :type 'string
    :group 'hexl)
  
***************
*** 627,633 ****
    (let ((coding-system-for-read 'raw-text)
        (coding-system-for-write buffer-file-coding-system)
        (buffer-undo-list t))
!     (shell-command-on-region (point-min) (point-max) hexlify-command t)
      (if (> (point) (hexl-address-to-marker hexl-max-address))
        (hexl-goto-address hexl-max-address))))
  
--- 610,618 ----
    (let ((coding-system-for-read 'raw-text)
        (coding-system-for-write buffer-file-coding-system)
        (buffer-undo-list t))
!     (apply 'call-process-region (point-min) (point-max)
!          (expand-file-name hexl-program exec-directory)
!          t t nil (split-string hexl-options))
      (if (> (point) (hexl-address-to-marker hexl-max-address))
        (hexl-goto-address hexl-max-address))))
  
***************
*** 642,648 ****
    (let ((coding-system-for-write 'raw-text)
        (coding-system-for-read buffer-file-coding-system)
        (buffer-undo-list t))
!     (shell-command-on-region (point-min) (point-max) dehexlify-command t)))
  
  (defun hexl-char-after-point ()
    "Return char for ASCII hex digits at point."
--- 627,635 ----
    (let ((coding-system-for-write 'raw-text)
        (coding-system-for-read buffer-file-coding-system)
        (buffer-undo-list t))
!     (apply 'call-process-region (point-min) (point-max)
!          (expand-file-name hexl-program exec-directory)
!          t t nil "-de" (split-string hexl-options))))
  
  (defun hexl-char-after-point ()
    "Return char for ASCII hex digits at point."