[Emacs-diffs] Changes to emacs/lisp/net/dns.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/12 20:52:33

Index: net/dns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/dns.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- net/dns.el  8 Jan 2008 20:45:55 -0000       1.3
+++ net/dns.el  12 Mar 2008 20:52:31 -0000      1.4
@@ -102,11 +102,11 @@
   (dns-write-bytes 0))
 
 (defun dns-read-string-name (string buffer)
-  (let (default-enable-multibyte-characters)
     (with-temp-buffer
+    (set-buffer-multibyte nil)
       (insert string)
       (goto-char (point-min))
-      (dns-read-name buffer))))
+    (dns-read-name buffer)))
 
 (defun dns-read-name (&optional buffer)
   (let ((ended nil)
@@ -186,8 +186,8 @@
     (buffer-string)))
 
 (defun dns-read (packet)
-  (let (default-enable-multibyte-characters)
     (with-temp-buffer
+    (set-buffer-multibyte nil)
       (let ((spec nil)
             queries answers authorities additionals)
         (insert packet)
@@ -251,7 +251,7 @@
                                    type))))
                     qs))
             (push (list slot qs) spec)))
-        (nreverse spec)))))
+      (nreverse spec))))
 
 (defun dns-read-int32 ()
   ;; Full 32 bit Integers can't be handled by Emacs.  If we use
@@ -263,8 +263,8 @@
   (let ((buffer (current-buffer))
        (point (point)))
     (prog1
-        (let (default-enable-multibyte-characters)
           (with-temp-buffer
+          (set-buffer-multibyte nil)
             (insert string)
             (goto-char (point-min))
             (cond
@@ -296,7 +296,7 @@
               (cons (dns-read-bytes 2) (dns-read-name buffer)))
              ((or (eq type 'CNAME) (eq type 'NS) (eq type 'PTR))
               (dns-read-string-name string buffer))
-             (t string))))
+           (t string)))
       (goto-char point))))
 
 (defun dns-parse-resolv-conf ()
@@ -378,8 +378,8 @@
 
   (if (not dns-servers)
       (message "No DNS server configuration found")
-    (let (default-enable-multibyte-characters)
       (with-temp-buffer
+      (set-buffer-multibyte nil)
         (let ((process (condition-case ()
                            (dns-make-network-process (car dns-servers))
                          (error
@@ -422,9 +422,9 @@
                     (when (eq type (dns-get 'type answer))
                       (if (eq type 'TXT)
                           (dns-get-txt-answer (dns-get 'answers result))
-                        (dns-get 'data answer)))))))))))))
+                      (dns-get 'data answer))))))))))))
 
 (provide 'dns)
 
-;;; arch-tag: d0edd0c4-4cce-4538-ae92-06c3356ee80a
+;; arch-tag: d0edd0c4-4cce-4538-ae92-06c3356ee80a
 ;;; dns.el ends here