X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f58dd69bcff5d6fa16da7b8ae4667614d7bb9fa9..00ddb61e2ef31d1509216fd49200c0fe06bf15d6:/src/cmds.c

diff --git a/src/cmds.c b/src/cmds.c
index 1e8ded4694..5c0f7cd475 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -1,5 +1,5 @@
 /* Simple built-in editing commands.
-   Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1985, 93, 94, 95, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
@@ -24,15 +25,23 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "buffer.h"
 #include "syntax.h"
 #include "window.h"
+#include "keyboard.h"
 
 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function;
 
 /* A possible value for a buffer's overwrite-mode variable.  */
 Lisp_Object Qoverwrite_mode_binary;
 
+/* Non-nil means put this face on the next self-inserting character.  */
+Lisp_Object Vself_insert_face;
+
+/* This is the command that set up Vself_insert_face.  */
+Lisp_Object Vself_insert_face_command;
+
+extern Lisp_Object Qface;
 
 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "p",
-  "Move point right ARG characters (left if ARG negative).\n\
+  "Move point right N characters (left if N is negative).\n\
 On reaching end of buffer, stop and signal error.")
   (n)
      Lisp_Object n;
@@ -68,7 +77,7 @@ On reaching end of buffer, stop and signal error.")
 }
 
 DEFUN ("backward-char", Fbackward_char, Sbackward_char, 0, 1, "p",
-  "Move point left ARG characters (right if ARG negative).\n\
+  "Move point left N characters (right if N is negative).\n\
 On attempt to pass beginning or end of buffer, stop and signal error.")
   (n)
      Lisp_Object n;
@@ -83,12 +92,12 @@ On attempt to pass beginning or end of buffer, stop and signal error.")
 }
 
 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "p",
-  "Move ARG lines forward (backward if ARG is negative).\n\
-Precisely, if point is on line I, move to the start of line I + ARG.\n\
+  "Move N lines forward (backward if N is negative).\n\
+Precisely, if point is on line I, move to the start of line I + N.\n\
 If there isn't room, go as far as possible (no error).\n\
 Returns the count of lines left to move.  If moving forward,\n\
-that is ARG - number of lines moved; if backward, ARG + number moved.\n\
-With positive ARG, a non-empty line at the end counts as one line\n\
+that is N - number of lines moved; if backward, N + number moved.\n\
+With positive N, a non-empty line at the end counts as one line\n\
   successfully moved (for the return value).")
   (n)
      Lisp_Object n;
@@ -106,7 +115,7 @@ With positive ARG, a non-empty line at the end counts as one line\n\
     }
 
   negp = count <= 0;
-  pos = scan_buffer ('\n', pos2, count - negp, &shortage, 1);
+  pos = scan_buffer ('\n', pos2, 0, count - negp, &shortage, 1);
   if (shortage > 0
       && (negp
 	  || (ZV > BEGV
@@ -120,7 +129,7 @@ With positive ARG, a non-empty line at the end counts as one line\n\
 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line,
   0, 1, "p",
   "Move point to beginning of current line.\n\
-With argument ARG not nil or 1, move forward ARG - 1 lines first.\n\
+With argument N not nil or 1, move forward N - 1 lines first.\n\
 If scan reaches end of buffer, stop there without error.")
   (n)
      Lisp_Object n;
@@ -137,7 +146,7 @@ If scan reaches end of buffer, stop there without error.")
 DEFUN ("end-of-line", Fend_of_line, Send_of_line,
   0, 1, "p",
   "Move point to end of current line.\n\
-With argument ARG not nil or 1, move forward ARG - 1 lines first.\n\
+With argument N not nil or 1, move forward N - 1 lines first.\n\
 If scan reaches end of buffer, stop there without error.")
   (n)
      Lisp_Object n;
@@ -150,22 +159,16 @@ If scan reaches end of buffer, stop there without error.")
   else
     CHECK_NUMBER (n, 0);
 
-  if (XINT (n) != 1)
-    Fforward_line (make_number (XINT (n) - 1));
-
-  pos = point;
-  stop = ZV;
-  while (pos < stop && FETCH_CHAR (pos) != '\n') pos++;
-  SET_PT (pos);
+  SET_PT (find_before_next_newline (PT, 0, XINT (n) - (XINT (n) <= 0)));
 
   return Qnil;
 }
 
 DEFUN ("delete-char", Fdelete_char, Sdelete_char, 1, 2, "p\nP",
-  "Delete the following ARG characters (previous, with negative arg).\n\
+  "Delete the following N characters (previous if N is negative).\n\
 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\
-Interactively, ARG is the prefix arg, and KILLFLAG is set if\n\
-ARG was explicitly specified.")
+Interactively, N is the prefix arg, and KILLFLAG is set if\n\
+N was explicitly specified.")
   (n, killflag)
      Lisp_Object n, killflag;
 {
@@ -197,97 +200,81 @@ ARG was explicitly specified.")
 
 DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char,
   1, 2, "p\nP",
-  "Delete the previous ARG characters (following, with negative ARG).\n\
+  "Delete the previous N characters (following if N is negative).\n\
 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\
-Interactively, ARG is the prefix arg, and KILLFLAG is set if\n\
-ARG was explicitly specified.")
+Interactively, N is the prefix arg, and KILLFLAG is set if\n\
+N was explicitly specified.")
   (n, killflag)
      Lisp_Object n, killflag;
 {
+  Lisp_Object value;
+  int deleted_tab = 0;
+  int i;
+
   CHECK_NUMBER (n, 0);
-  return Fdelete_char (make_number (-XINT (n)), killflag);
+
+  /* See if we are about to delete a tab backwards.  */
+  for (i = 0; i < XINT (n); i++)
+    {
+      if (point - i < BEGV)
+	break;
+      if (FETCH_CHAR (point - i) == '\t')
+	{
+	  deleted_tab = 1;
+	  break;
+	}
+    }
+
+  value = Fdelete_char (make_number (-XINT (n)), killflag);
+
+  /* In overwrite mode, back over columns while clearing them out,
+     unless at end of line.  */
+  if (XINT (n) > 0
+      && ! NILP (current_buffer->overwrite_mode)
+      && ! deleted_tab
+      && ! (point == ZV || FETCH_CHAR (point) == '\n'))
+    {
+      Finsert_char (make_number (' '), XINT (n));
+      SET_PT (point - XINT (n));
+    }
+
+  return value;
 }
 
 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p",
   "Insert the character you type.\n\
 Whichever character you type to run this command is inserted.")
-  (arg)
-     Lisp_Object arg;
+  (n)
+     Lisp_Object n;
 {
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (n, 0);
 
   /* Barf if the key that invoked this was not a character.  */
   if (!INTEGERP (last_command_char))
     bitch_at_user ();
+  else if (XINT (n) >= 2 && NILP (current_buffer->overwrite_mode))
+    {
+      XSETFASTINT (n, XFASTINT (n) - 2);
+      /* The first one might want to expand an abbrev.  */
+      internal_self_insert (XINT (last_command_char), 1);
+      /* The bulk of the copies of this char can be inserted simply.
+	 We don't have to handle a user-specified face specially
+	 because it will get inherited from the first char inserted.  */
+      Finsert_char (last_command_char, n, Qt);
+      /* The last one might want to auto-fill.  */
+      internal_self_insert (XINT (last_command_char), 0);
+    }
   else
-    while (XINT (arg) > 0)
+    while (XINT (n) > 0)
       {
 	/* Ok since old and new vals both nonneg */
-	XSETFASTINT (arg, XFASTINT (arg) - 1);
-	internal_self_insert (XINT (last_command_char), XFASTINT (arg) != 0);
+	XSETFASTINT (n, XFASTINT (n) - 1);
+	internal_self_insert (XINT (last_command_char), XFASTINT (n) != 0);
       }
 
   return Qnil;
 }
 
-DEFUN ("newline", Fnewline, Snewline, 0, 1, "P",
-  "Insert a newline.  With arg, insert that many newlines.\n\
-In Auto Fill mode, if no numeric arg, break the preceding line if it's long.")
-  (arg1)
-     Lisp_Object arg1;
-{
-  int flag;
-  Lisp_Object arg;
-  char c1 = '\n';
-
-  arg = Fprefix_numeric_value (arg1);
-
-  if (!NILP (current_buffer->read_only))
-    Fbarf_if_buffer_read_only ();
-
-  /* Inserting a newline at the end of a line produces better
-     redisplay in try_window_id than inserting at the beginning of a
-     line, and the textual result is the same.  So, if we're at
-     beginning of line, pretend to be at the end of the previous line.  
-
-     We can't use internal_self_insert in that case since it won't do
-     the insertion correctly.  Luckily, internal_self_insert's special
-     features all do nothing in that case.  */
-
-  flag = point > BEGV && FETCH_CHAR (point - 1) == '\n';
-  /* Don't do this if at the beginning of the window.  */
-  if (XBUFFER (XWINDOW (selected_window)->buffer) == current_buffer
-      && marker_position (XWINDOW (selected_window)->start) == PT)
-    flag = 0;
-
-#ifdef USE_TEXT_PROPERTIES
-  /* We cannot use this optimization if properties change
-     in the vicinity.
-     ??? We need to check for change hook properties, etc.  */
-  if (flag)
-    if (! (point - 1 > BEGV && ! property_change_between_p (point - 2, point)))
-      flag = 0;
-#endif
-
-  if (flag)
-    SET_PT (point - 1);
-
-  while (XINT (arg) > 0)
-    {
-      if (flag)
-	insert (&c1, 1);
-      else
-	internal_self_insert ('\n', !NILP (arg1));
-      /* Ok since old and new vals both nonneg */
-      XSETFASTINT (arg, XFASTINT (arg) - 1);
-    }
-
-  if (flag)
-    SET_PT (point + 1);
-
-  return Qnil;
-}
-
 /* Insert character C1.  If NOAUTOFILL is nonzero, don't do autofill
    even if it is enabled.
 
@@ -296,7 +283,10 @@ In Auto Fill mode, if no numeric arg, break the preceding line if it's long.")
    A value of 2 means this did things that call for an undo boundary.  */
 
 internal_self_insert (c1, noautofill)
-     char c1;
+     /* This has to be unsigned char; when it is char,
+	some compilers sign-extend it in SYNTAX_ENTRY, despite
+	the casts to unsigned char there.  */
+     unsigned char c1;
      int noautofill;
 {
   extern Lisp_Object Fexpand_abbrev ();
@@ -339,21 +329,41 @@ internal_self_insert (c1, noautofill)
     }
   if ((c == ' ' || c == '\n')
       && !noautofill
-      && !NILP (current_buffer->auto_fill_function)
-      && current_column () > XFASTINT (current_buffer->fill_column))
+      && !NILP (current_buffer->auto_fill_function))
     {
-      if (c1 != '\n')
-	insert_and_inherit (&c1, 1);
-      call0 (current_buffer->auto_fill_function);
+      Lisp_Object tem;
+
+      insert_and_inherit (&c1, 1);
       if (c1 == '\n')
-	insert_and_inherit (&c1, 1);
-      hairy = 2;
+	/* After inserting a newline, move to previous line and fill */
+	/* that.  Must have the newline in place already so filling and */
+	/* justification, if any, know where the end is going to be. */
+	SET_PT (point - 1);
+      tem = call0 (current_buffer->auto_fill_function);
+      if (c1 == '\n')
+	SET_PT (point + 1);
+      if (!NILP (tem))
+	hairy = 2;
     }
   else
     insert_and_inherit (&c1, 1);
+
+#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))
+    {
+      Lisp_Object before, after;
+      XSETINT (before, PT - 1);
+      XSETINT (after, PT);
+      Fput_text_property (before, after, Qface, Vself_insert_face, Qnil);
+      Vself_insert_face = Qnil;
+    }
+#endif
   synt = SYNTAX (c);
   if ((synt == Sclose || synt == Smath)
-      && !NILP (Vblink_paren_function) && INTERACTIVE)
+      && !NILP (Vblink_paren_function) && INTERACTIVE
+      && !noautofill)
     {
       call0 (Vblink_paren_function);
       hairy = 2;
@@ -374,6 +384,16 @@ syms_of_cmds ()
   Qoverwrite_mode_binary = intern ("overwrite-mode-binary");
   staticpro (&Qoverwrite_mode_binary);
 
+  DEFVAR_LISP ("self-insert-face", &Vself_insert_face,
+    "If non-nil, set the face of the next self-inserting character to this.\n\
+See also `self-insert-face-command'.");
+  Vself_insert_face = Qnil;
+
+  DEFVAR_LISP ("self-insert-face-command", &Vself_insert_face_command,
+    "This is the command that set up `self-insert-face'.\n\
+If `last-command' does not equal this value, we ignore `self-insert-face'.");
+  Vself_insert_face_command = Qnil;
+
   DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function,
     "Function called, if non-nil, whenever a close parenthesis is inserted.\n\
 More precisely, a char with closeparen syntax is self-inserted.");
@@ -389,15 +409,13 @@ More precisely, a char with closeparen syntax is self-inserted.");
   defsubr (&Sdelete_backward_char);
 
   defsubr (&Sself_insert_command);
-  defsubr (&Snewline);
 }
 
 keys_of_cmds ()
 {
   int n;
 
-  initial_define_key (global_map, Ctl('M'), "newline");
-  initial_define_key (global_map, Ctl('I'), "self-insert-command");
+  initial_define_key (global_map, Ctl ('I'), "self-insert-command");
   for (n = 040; n < 0177; n++)
     initial_define_key (global_map, n, "self-insert-command");
 #ifdef MSDOS