(sha1-string-external): Use set-buffer-multibyte rather than

setting default-enable-multibyte-characters.

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc42fababf7..d8f9b361527 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * sha1.el (sha1-string-external): Use set-buffer-multibyte rather than
+        setting default-enable-multibyte-characters.
+
         * emulation/viper-util.el (viper-file-remote-p): Remove, unused.
 
         * comint.el: Fix up indentation and comment style.  Remove `function'.
diff --git a/lisp/sha1.el b/lisp/sha1.el
index c70b99c10b0..de2f0636b7c 100644
--- a/lisp/sha1.el
+++ b/lisp/sha1.el
@@ -88,16 +88,17 @@ If this variable is set to nil, use internal function only."
   :group 'sha1)
 
 (defun sha1-string-external (string &optional binary)
-  (let (prog args digest default-enable-multibyte-characters)
+  (let (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)
       (insert string)
       (apply (function call-process-region)
-             (point-min)(point-max)
+             (point-min) (point-max)
              prog t t nil args)
       ;; SHA1 is 40 bytes long in hexadecimal form.
       (setq digest (buffer-substring (point-min)(+ (point-min) 40))))