(Fformat_network_address): Fix int/Lisp_Object mixup.

2 files changed, 18 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a557c1e259d..244fcdbc2b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-31  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * process.c (Fformat_network_address): Fix int/Lisp_Object mixup.
+
 2002-10-30  Stefan Monnier  <monnier@cs.yale.edu>
 
         * editfns.c (overlays_around, get_pos_property): New funs.
@@ -211,10 +215,17 @@
 
         * fns.c (Flength): Doc fix.
 
+2002-10-04  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * keyboard.c (keyremap): New struct.
+        (read_key_sequence): Use it: globally replace keytran_foo with
+        keytran.foo and fkey_foo with fkey.foo.  Rename temp vars
+        keytran_next and fkey_next to just `next'.
+
 2002-10-04  Steven Tamm  <steventamm@mac.com>
 
         * macterm.c (keycode_to_xkeysym_table): Change return to be
-        treated like an X keysym
+        treated like an X keysym.
 
 2002-10-03  Jan D.  <jan.h.d@swipnet.se>
 
diff --git a/src/process.c b/src/process.c
index 5a271149319..2f2017dbeac 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1078,11 +1078,11 @@ Returns nil if format of ADDRESS is invalid.  */)
         return Qnil;
 
       args[0] = build_string ("%d.%d.%d.%d:%d");
-      args[1] = XINT (p->contents[0]);
-      args[2] = XINT (p->contents[1]);
-      args[3] = XINT (p->contents[2]);
-      args[4] = XINT (p->contents[3]);
-      args[5] = XINT (p->contents[4]);
+      args[1] = p->contents[0];
+      args[2] = p->contents[1];
+      args[3] = p->contents[2];
+      args[4] = p->contents[3];
+      args[5] = p->contents[4];
       return Fformat (6, args);
     }
 
@@ -1090,7 +1090,7 @@ Returns nil if format of ADDRESS is invalid.  */)
     {
       Lisp_Object args[2];
       args[0] = build_string ("<Family %d>");
-      args[1] = XINT (Fcar (address));
+      args[1] = Fcar (address);
       return Fformat (2, args);
       
     }