* window.c (Fwindow_live_p): Use WINDOW_LIVE_P.

[gnu-emacs] / src / cmds.c

diff --git a/src/cmds.c b/src/cmds.c
index 27d6812d05f4875cf049592451a6e2f1e5fe4ac5..b3394c2fc4ea12299045f1845599114f0db9cfb8 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -117,7 +117,6 @@ With positive N, a non-empty line at the end counts as one line\n\
   int opoint = PT, opoint_byte = PT_BYTE;
   int pos, pos_byte;
   int count, shortage;
-  int temp;
 
   if (NILP (n))
     count = 1;
@@ -349,8 +348,7 @@ internal_self_insert (c, noautofill)
   int spaces_to_insert = 0;
 
   overwrite = current_buffer->overwrite_mode;
-  if (!NILP (Vbefore_change_function) || !NILP (Vafter_change_function)
-      || !NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions))
+  if (!NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions))
     hairy = 1;
 
   /* At first, get multi-byte form of C in STR.  */
@@ -443,7 +441,7 @@ internal_self_insert (c, noautofill)
 
       sym = Fexpand_abbrev ();
 
-      /* If we expanded an abbrev which has only a hook,
+      /* If we expanded an abbrev which has a hook,
         and the hook has a non-nil `no-self-insert' property,
         return right away--don't really self-insert.  */
       if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function)
@@ -495,7 +493,6 @@ internal_self_insert (c, noautofill)
        hairy = 2;
     }
 
-#ifdef HAVE_FACES
   /* If previous command specified a face to use, use it.  */
   if (!NILP (Vself_insert_face)
       && EQ (current_kboard->Vlast_command, Vself_insert_face_command))
@@ -504,7 +501,6 @@ internal_self_insert (c, noautofill)
                          Qface, Vself_insert_face, Qnil);
       Vself_insert_face = Qnil;
     }
-#endif
 
   synt = SYNTAX (c);
   if ((synt == Sclose || synt == Smath)