[Emacs-diffs] Changes to emacs/src/fns.c

[Stefan Monnier]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.333 emacs/src/fns.c:1.334
*** emacs/src/fns.c:1.333       Sun Feb 16 19:32:12 2003
--- emacs/src/fns.c     Sat Feb 22 17:21:11 2003
***************
*** 1047,1053 ****
  {
    unsigned char *buf;
    int nbytes;
-   int i;
  
    if (STRING_MULTIBYTE (string))
      return string;
--- 1047,1052 ----
***************
*** 2699,2704 ****
--- 2698,2711 ----
      }
  }
  
+ static void void_call2 P_ ((Lisp_Object a, Lisp_Object b, Lisp_Object c));
+ static void
+ void_call2 (a, b, c)
+      Lisp_Object a, b, c;
+ {
+   call2 (a, b, c);
+ }
+ 
  DEFUN ("map-char-table", Fmap_char_table, Smap_char_table,
         2, 2, 0,
         doc: /* Call FUNCTION for each (normal and generic) characters in 
CHAR-TABLE.
***************
*** 2712,2718 ****
  
    CHECK_CHAR_TABLE (char_table);
  
!   map_char_table ((POINTER_TYPE *) call2, Qnil, char_table, function, 0, 
indices);
    return Qnil;
  }
  
--- 2719,2729 ----
  
    CHECK_CHAR_TABLE (char_table);
  
!   /* When Lisp_Object is represented as a union, `call2' cannot directly
!      be passed to map_char_table because it returns a Lisp_Object rather
!      than returning nothing.
!      Casting leads to crashes on some architectures.  -stef  */
!   map_char_table (void_call2, Qnil, char_table, function, 0, indices);
    return Qnil;
  }
  
***************
*** 3490,3496 ****
             it is consistent with CODESET?  If not, what to do?  */
          Faset (v, make_number (i),
                 code_convert_string_norecord (val, Vlocale_coding_system,
!                                              Qnil));
        }
        return v;
      }
--- 3501,3507 ----
             it is consistent with CODESET?  If not, what to do?  */
          Faset (v, make_number (i),
                 code_convert_string_norecord (val, Vlocale_coding_system,
!                                              0));
        }
        return v;
      }
***************
*** 3508,3514 ****
          str = nl_langinfo (months[i]);
          val = make_unibyte_string (str, strlen (str));
          p->contents[i] =
!           code_convert_string_norecord (val, Vlocale_coding_system, Qnil);
        }
        XSETVECTOR (val, p);
        return val;
--- 3519,3525 ----
          str = nl_langinfo (months[i]);
          val = make_unibyte_string (str, strlen (str));
          p->contents[i] =
!           code_convert_string_norecord (val, Vlocale_coding_system, 0);
        }
        XSETVECTOR (val, p);
        return val;