X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/189fad68dd3b54a083a2e65912d2c9c59a073bb0..4acb738e57b4364f673246e424729ac195bf24dc:/src/cmds.c diff --git a/src/cmds.c b/src/cmds.c index abad2cf63a..64b06f20b9 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, 1993, 1994, 1995 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -24,9 +24,9 @@ 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; -Lisp_Object Vuse_hard_newlines; /* A possible value for a buffer's overwrite-mode variable. */ Lisp_Object Qoverwrite_mode_binary; @@ -37,14 +37,10 @@ Lisp_Object Vself_insert_face; /* This is the command that set up Vself_insert_face. */ Lisp_Object Vself_insert_face_command; -#ifdef USE_TEXT_PROPERTIES -Lisp_Object Qhard; -#endif - 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; @@ -80,7 +76,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; @@ -95,12 +91,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; @@ -132,7 +128,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; @@ -149,7 +145,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; @@ -168,10 +164,10 @@ If scan reaches end of buffer, stop there without error.") } 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; { @@ -203,10 +199,10 @@ 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; { @@ -217,100 +213,37 @@ ARG was explicitly specified.") 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, i; - 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); - - for (i = XINT (arg); i > 0; i--) - { - if (flag) - insert_and_inherit (&c1, 1); - else - internal_self_insert ('\n', !NILP (arg1)); - } - -#ifdef USE_TEXT_PROPERTIES - if (Vuse_hard_newlines) - { - Lisp_Object from, to, sticky; - XSETFASTINT (from, PT - arg); - XSETFASTINT (to, PT); - Fput_text_property (from, to, Qhard, Qt, Qnil); - /* If rear_nonsticky is not "t", locally add Qhard to the list. */ - sticky = Fget_text_property (from, Qrear_nonsticky, Qnil); - if (NILP (sticky) - || (CONSP (sticky) && NILP (Fmemq (Qhard, sticky)))) - { - sticky = Fcons (Qhard, sticky); - Fput_text_property (from, to, Qrear_nonsticky, sticky, Qnil); - } - } -#endif - - - if (flag) - SET_PT (point + 1); - - return Qnil; -} - /* Insert character C1. If NOAUTOFILL is nonzero, don't do autofill even if it is enabled. @@ -319,7 +252,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 (); @@ -364,19 +300,24 @@ internal_self_insert (c1, noautofill) && !noautofill && !NILP (current_buffer->auto_fill_function)) { - if (c1 != '\n') - insert_and_inherit (&c1, 1); + insert_and_inherit (&c1, 1); + if (c1 == '\n') + /* 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); call0 (current_buffer->auto_fill_function); if (c1 == '\n') - insert_and_inherit (&c1, 1); + SET_PT (point + 1); 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 (last_command, Vself_insert_face_command)) + && EQ (current_kboard->Vlast_command, Vself_insert_face_command)) { Lisp_Object before, after; XSETINT (before, PT - 1); @@ -384,9 +325,11 @@ internal_self_insert (c1, noautofill) 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; @@ -407,19 +350,6 @@ syms_of_cmds () Qoverwrite_mode_binary = intern ("overwrite-mode-binary"); staticpro (&Qoverwrite_mode_binary); - Qhard = intern ("hard"); - staticpro (&Qhard); - - DEFVAR_BOOL ("use-hard-newlines", &Vuse_hard_newlines, - "Non-nil means to distinguish hard and soft newlines.\n\ -When this is non-nil, the functions `newline' and `open-line' add the\n\ -text-property `hard' to newlines that they insert. Also, a line is\n\ -only considered as a candidate to match `paragraph-start' or\n\ -`paragraph-separate' if it follows a hard newline. Newlines not\n\ -marked hard are called \"soft\", and are always internal to\n\ -paragraphs. The fill functions always insert soft newlines."); - Vuse_hard_newlines = 0; - 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'."); @@ -445,14 +375,12 @@ 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"); for (n = 040; n < 0177; n++) initial_define_key (global_map, n, "self-insert-command");