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

[Stefan Monnier]

Index: emacs/src/cmds.c
diff -c emacs/src/cmds.c:1.88 emacs/src/cmds.c:1.89
*** emacs/src/cmds.c:1.88       Sat Nov  9 07:46:25 2002
--- emacs/src/cmds.c    Tue Jul  8 17:25:35 2003
***************
*** 1,5 ****
  /* Simple built-in editing commands.
!    Copyright (C) 1985, 93, 94, 95, 96, 97, 1998, 2001, 02 Free Software 
Foundation, Inc.
  
  This file is part of GNU Emacs.
  
--- 1,6 ----
  /* Simple built-in editing commands.
!    Copyright (C) 1985, 93, 94, 95, 96, 97, 1998, 2001, 02, 03
!              Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
***************
*** 368,379 ****
     return 0.  A value of 1 indicates this *might* not have been simple.
     A value of 2 means this did things that call for an undo boundary.  */
  
  int
  internal_self_insert (c, noautofill)
       int c;
       int noautofill;
  {
-   extern Lisp_Object Fexpand_abbrev ();
    int hairy = 0;
    Lisp_Object tem;
    register enum syntaxcode synt;
--- 369,381 ----
     return 0.  A value of 1 indicates this *might* not have been simple.
     A value of 2 means this did things that call for an undo boundary.  */
  
+ static Lisp_Object Qexpand_abbrev;
+ 
  int
  internal_self_insert (c, noautofill)
       int c;
       int noautofill;
  {
    int hairy = 0;
    Lisp_Object tem;
    register enum syntaxcode synt;
***************
*** 477,483 ****
        int modiff = MODIFF;
        Lisp_Object sym;
  
!       sym = Fexpand_abbrev ();
  
        /* If we expanded an abbrev which has a hook,
         and the hook has a non-nil `no-self-insert' property,
--- 479,485 ----
        int modiff = MODIFF;
        Lisp_Object sym;
  
!       sym = call0 (Qexpand_abbrev);
  
        /* If we expanded an abbrev which has a hook,
         and the hook has a non-nil `no-self-insert' property,
***************
*** 564,569 ****
--- 566,574 ----
  
    Qoverwrite_mode_binary = intern ("overwrite-mode-binary");
    staticpro (&Qoverwrite_mode_binary);
+ 
+   Qexpand_abbrev = intern ("expand-abbrev");
+   staticpro (&Qexpand_abbrev);
  
    DEFVAR_LISP ("self-insert-face", &Vself_insert_face,
               doc: /* If non-nil, set the face of the next self-inserting 
character to this.