X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7b1019e2781472c793d0bf74e2b9ee17894270b8..8bff7c00b717303a526a71286232040b231d14c0:/lisp/sha1.el

diff --git a/lisp/sha1.el b/lisp/sha1.el
index 2b082c1ccd..351af62783 100644
--- a/lisp/sha1.el
+++ b/lisp/sha1.el
@@ -1,7 +1,7 @@
 ;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: SHA1, FIPS 180-1
@@ -63,7 +63,7 @@
   :group 'extensions)
 
 (defcustom sha1-maximum-internal-length 500
-  "*Maximum length of message to use Lisp version of SHA1 function.
+  "Maximum length of message to use Lisp version of SHA1 function.
 If message is longer than this, `sha1-program' is used instead.
 
 If this variable is set to 0, use external program only.
@@ -72,7 +72,7 @@ If this variable is set to nil, use internal function only."
   :group 'sha1)
 
 (defcustom sha1-program '("sha1sum")
-  "*Name of program to compute SHA1.
+  "Name of program to compute SHA1.
 It must be a string \(program name\) or list of strings \(name and its args\)."
   :type '(repeat string)
   :group 'sha1)
@@ -80,20 +80,22 @@ It must be a string \(program name\) or list of strings \(name and its args\)."
 (defcustom sha1-use-external (condition-case ()
 				 (executable-find (car sha1-program))
 			       (error))
-  "*Use external SHA1 program.
+  "Use external SHA1 program.
 If this variable is set to nil, use internal function only."
   :type 'boolean
   :group 'sha1)
 
 (defun sha1-string-external (string &optional binary)
-  (let (prog args digest)
+  (let ((default-directory "/") ;; in case otherwise non-existent
+        (process-connection-type nil) ;; pipe
+        prog args digest)
     (if (consp sha1-program)
 	(setq prog (car sha1-program)
 	      args (cdr sha1-program))
       (setq prog sha1-program
 	    args nil))
     (with-temp-buffer
-      (set-buffer-multibyte nil)
+      (unless (featurep 'xemacs) (set-buffer-multibyte nil))
       (insert string)
       (apply (function call-process-region)
 	     (point-min) (point-max)