X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2e16553ccc8c37df91211c6f63fafd66d69b7105..1c9e62fec0a5b3ed35a4441d439d49f2473785a3:/src/cmds.c diff --git a/src/cmds.c b/src/cmds.c index 867a646657..494ef14db9 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -1,5 +1,6 @@ /* Simple built-in editing commands. - Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,15 +16,20 @@ 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., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include #include "lisp.h" #include "commands.h" #include "buffer.h" +#include "charset.h" #include "syntax.h" #include "window.h" +#include "keyboard.h" +#include "keymap.h" +#include "dispextern.h" Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function; @@ -37,17 +43,28 @@ Lisp_Object Vself_insert_face; Lisp_Object Vself_insert_face_command; extern Lisp_Object Qface; +extern Lisp_Object Vtranslation_table_for_input; +DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0, + doc: /* Return buffer position N characters after (before if N negative) point. */) + (n) + Lisp_Object n; +{ + CHECK_NUMBER (n); + + return make_number (PT + XINT (n)); +} + DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "p", - "Move point right ARG characters (left if ARG negative).\n\ -On reaching end of buffer, stop and signal error.") - (n) + doc: /* Move point right N characters (left if N is negative). +On reaching end of buffer, stop and signal error. */) + (n) Lisp_Object n; { if (NILP (n)) XSETFASTINT (n, 1); else - CHECK_NUMBER (n, 0); + CHECK_NUMBER (n); /* This used to just set point to point + XINT (n), and then check to see if it was within boundaries. But now that SET_PT can @@ -55,7 +72,7 @@ On reaching end of buffer, stop and signal error.") hooks, etcetera), that's not a good approach. So we validate the proposed position, then set point. */ { - int new_point = point + XINT (n); + int new_point = PT + XINT (n); if (new_point < BEGV) { @@ -75,118 +92,169 @@ 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\ -On attempt to pass beginning or end of buffer, stop and signal error.") - (n) + doc: /* Move point left N characters (right if N is negative). +On attempt to pass beginning or end of buffer, stop and signal error. */) + (n) Lisp_Object n; { if (NILP (n)) XSETFASTINT (n, 1); else - CHECK_NUMBER (n, 0); + CHECK_NUMBER (n); XSETINT (n, - XINT (n)); return Fforward_char (n); } 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\ -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\ - successfully moved (for the return value).") - (n) + doc: /* Move N lines forward (backward if N is negative). +Precisely, if point is on line I, move to the start of line I + N. +If there isn't room, go as far as possible (no error). +Returns the count of lines left to move. If moving forward, +that is N - number of lines moved; if backward, N + number moved. +With positive N, a non-empty line at the end counts as one line + successfully moved (for the return value). */) + (n) Lisp_Object n; { - int pos2 = point; - int pos; - int count, shortage, negp; + int opoint = PT, opoint_byte = PT_BYTE; + int pos, pos_byte; + int count, shortage; if (NILP (n)) count = 1; else { - CHECK_NUMBER (n, 0); + CHECK_NUMBER (n); count = XINT (n); } - negp = count <= 0; - pos = scan_buffer ('\n', pos2, 0, count - negp, &shortage, 1); + if (count <= 0) + shortage = scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, count - 1, 1); + else + shortage = scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, count, 1); + + /* Since scan_newline does TEMP_SET_PT_BOTH, + and we want to set PT "for real", + go back to the old point and then come back here. */ + pos = PT; + pos_byte = PT_BYTE; + TEMP_SET_PT_BOTH (opoint, opoint_byte); + SET_PT_BOTH (pos, pos_byte); + if (shortage > 0 - && (negp + && (count <= 0 || (ZV > BEGV - && pos != pos2 - && FETCH_CHAR (pos - 1) != '\n'))) + && PT != opoint + && (FETCH_BYTE (PT_BYTE - 1) != '\n')))) shortage--; - SET_PT (pos); - return make_number (negp ? - shortage : shortage); + + return make_number (count <= 0 ? - shortage : shortage); } -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\ -If scan reaches end of buffer, stop there without error.") - (n) +DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "p", + doc: /* Move point to beginning of current line. +With argument N not nil or 1, move forward N - 1 lines first. +If point reaches the beginning or end of buffer, it stops there. + +This function constrains point to the current field unless this moves +point to a different line than the original, unconstrained result. If +N is nil or 1, and a front-sticky field starts at point, the point +does not move. To ignore field boundaries bind +`inhibit-field-text-motion' to t, or use the `forward-line' function +instead. For instance, `(forward-line 0)' does the same thing as +`(beginning-of-line)', except that it ignores field boundaries. */) + (n) Lisp_Object n; { if (NILP (n)) XSETFASTINT (n, 1); else - CHECK_NUMBER (n, 0); + CHECK_NUMBER (n); + + SET_PT (XINT (Fline_beginning_position (n))); - Fforward_line (make_number (XINT (n) - 1)); return Qnil; } -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\ -If scan reaches end of buffer, stop there without error.") - (n) +DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "p", + doc: /* Move point to end of current line. +With argument N not nil or 1, move forward N - 1 lines first. +If point reaches the beginning or end of buffer, it stops there. +To ignore intangibility, bind `inhibit-point-motion-hooks' to t. + +This function constrains point to the current field unless this moves +point to a different line than the original, unconstrained result. If +N is nil or 1, and a rear-sticky field ends at point, the point does +not move. To ignore field boundaries bind `inhibit-field-text-motion' +to t. */) + (n) Lisp_Object n; { - register int pos; - register int stop; + int newpos; if (NILP (n)) XSETFASTINT (n, 1); else - CHECK_NUMBER (n, 0); + CHECK_NUMBER (n); + + while (1) + { + newpos = XINT (Fline_end_position (n)); + SET_PT (newpos); - SET_PT (find_before_next_newline (PT, 0, XINT (n) - (XINT (n) <= 0))); + if (PT > newpos + && FETCH_CHAR (PT - 1) == '\n') + { + /* If we skipped over a newline that follows + an invisible intangible run, + move back to the last tangible position + within the line. */ + + SET_PT (PT - 1); + break; + } + else if (PT > newpos && PT < ZV + && FETCH_CHAR (PT) != '\n') + /* If we skipped something intangible + and now we're not really at eol, + keep going. */ + n = make_number (1); + else + break; + } return Qnil; } DEFUN ("delete-char", Fdelete_char, Sdelete_char, 1, 2, "p\nP", - "Delete the following ARG characters (previous, with negative arg).\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.") - (n, killflag) + doc: /* Delete the following N characters (previous if N is negative). +Optional second arg KILLFLAG non-nil means kill instead (save in kill ring). +Interactively, N is the prefix arg, and KILLFLAG is set if +N was explicitly specified. */) + (n, killflag) Lisp_Object n, killflag; { - CHECK_NUMBER (n, 0); + int pos; + + CHECK_NUMBER (n); + pos = PT + XINT (n); if (NILP (killflag)) { if (XINT (n) < 0) { - if (point + XINT (n) < BEGV) + if (pos < BEGV) Fsignal (Qbeginning_of_buffer, Qnil); else - del_range (point + XINT (n), point); + del_range (pos, PT); } else { - if (point + XINT (n) > ZV) + if (pos > ZV) Fsignal (Qend_of_buffer, Qnil); else - del_range (point, point + XINT (n)); + del_range (PT, pos); } } else @@ -197,120 +265,289 @@ 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\ -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.") - (n, killflag) + 1, 2, "p\nP", + doc: /* Delete the previous N characters (following if N is negative). +Optional second arg KILLFLAG non-nil means kill instead (save in kill ring). +Interactively, N is the prefix arg, and KILLFLAG is set if +N was explicitly specified. */) + (n, killflag) Lisp_Object n, killflag; { - CHECK_NUMBER (n, 0); - return Fdelete_char (make_number (-XINT (n)), killflag); + Lisp_Object value; + int deleted_special = 0; + int pos, pos_byte, i; + + CHECK_NUMBER (n); + + /* See if we are about to delete a tab or newline backwards. */ + pos = PT; + pos_byte = PT_BYTE; + for (i = 0; i < XINT (n) && pos_byte > BEGV_BYTE; i++) + { + int c; + + DEC_BOTH (pos, pos_byte); + c = FETCH_BYTE (pos_byte); + if (c == '\t' || c == '\n') + { + deleted_special = 1; + break; + } + } + + /* 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_special + && ! (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n')) + { + int column = (int) current_column (); /* iftc */ + + value = Fdelete_char (make_number (-XINT (n)), killflag); + i = column - (int) current_column (); /* iftc */ + Finsert_char (make_number (' '), make_number (i), Qnil); + /* Whitespace chars are ASCII chars, so we can simply subtract. */ + SET_PT_BOTH (PT - i, PT_BYTE - i); + } + else + value = Fdelete_char (make_number (-XINT (n)), killflag); + + return value; } +/* Note that there's code in command_loop_1 which typically avoids + calling this. */ 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; + doc: /* Insert the character you type. +Whichever character you type to run this command is inserted. */) + (n) + Lisp_Object n; { - CHECK_NUMBER (arg, 0); + CHECK_NUMBER (n); /* Barf if the key that invoked this was not a character. */ if (!INTEGERP (last_command_char)) bitch_at_user (); - else - while (XINT (arg) > 0) + { + int character = translate_char (Vtranslation_table_for_input, + XINT (last_command_char), 0, 0, 0); + if (XINT (n) >= 2 && NILP (current_buffer->overwrite_mode)) { - /* Ok since old and new vals both nonneg */ - XSETFASTINT (arg, XFASTINT (arg) - 1); - internal_self_insert (XINT (last_command_char), XFASTINT (arg) != 0); + int modified_char = character; + /* Add the offset to the character, for Finsert_char. + We pass internal_self_insert the unmodified character + because it itself does this offsetting. */ + if (! NILP (current_buffer->enable_multibyte_characters)) + modified_char = unibyte_char_to_multibyte (modified_char); + + XSETFASTINT (n, XFASTINT (n) - 2); + /* The first one might want to expand an abbrev. */ + internal_self_insert (character, 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 (make_number (modified_char), n, Qt); + /* The last one might want to auto-fill. */ + internal_self_insert (character, 0); } + else + while (XINT (n) > 0) + { + /* Ok since old and new vals both nonneg */ + XSETFASTINT (n, XFASTINT (n) - 1); + internal_self_insert (character, XFASTINT (n) != 0); + } + } return Qnil; } -/* Insert character C1. If NOAUTOFILL is nonzero, don't do autofill +/* Insert character C. If NOAUTOFILL is nonzero, don't do autofill even if it is enabled. If this insertion is suitable for direct output (completely simple), 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. */ -internal_self_insert (c1, noautofill) - char c1; +static Lisp_Object Qexpand_abbrev; + +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; - register int c = c1; - Lisp_Object overwrite; + Lisp_Object overwrite, string; + /* Length of multi-byte form of C. */ + int len; + /* Working buffer and pointer for multi-byte form of C. */ + unsigned char str[MAX_MULTIBYTE_LENGTH]; + int chars_to_delete = 0; + 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. */ + if (!NILP (current_buffer->enable_multibyte_characters)) + { + c = unibyte_char_to_multibyte (c); + len = CHAR_STRING (c, str); + if (len == 1) + /* If C has modifier bits, this makes C an appropriate + one-byte char. */ + c = *str; + } + else + { + str[0] = (SINGLE_BYTE_CHAR_P (c) + ? c + : multibyte_char_to_unibyte (c, Qnil)); + len = 1; + } if (!NILP (overwrite) - && point < ZV - && (EQ (overwrite, Qoverwrite_mode_binary) - || (c != '\n' && FETCH_CHAR (point) != '\n')) - && (EQ (overwrite, Qoverwrite_mode_binary) - || FETCH_CHAR (point) != '\t' - || XINT (current_buffer->tab_width) <= 0 - || XFASTINT (current_buffer->tab_width) > 20 - || !((current_column () + 1) % XFASTINT (current_buffer->tab_width)))) + && PT < ZV) { - del_range (point, point + 1); + /* In overwrite-mode, we substitute a character at point (C2, + hereafter) by C. For that, we delete C2 in advance. But, + just substituting C2 by C may move a remaining text in the + line to the right or to the left, which is not preferable. + So we insert more spaces or delete more characters in the + following cases: if C is narrower than C2, after deleting C2, + we fill columns with spaces, if C is wider than C2, we delete + C2 and several characters following C2. */ + + /* This is the character after point. */ + int c2 = FETCH_CHAR (PT_BYTE); + + /* Column the cursor should be placed at after this insertion. + The correct value should be calculated only when necessary. */ + int target_clm = 0; + + /* Overwriting in binary-mode always replaces C2 by C. + Overwriting in textual-mode doesn't always do that. + It inserts newlines in the usual way, + and inserts any character at end of line + or before a tab if it doesn't use the whole width of the tab. */ + if (EQ (overwrite, Qoverwrite_mode_binary) + || (c != '\n' + && c2 != '\n' + && ! (c2 == '\t' + && XINT (current_buffer->tab_width) > 0 + && XFASTINT (current_buffer->tab_width) < 20 + && (target_clm = ((int) current_column () /* iftc */ + + XINT (Fchar_width (make_number (c)))), + target_clm % XFASTINT (current_buffer->tab_width))))) + { + int pos = PT; + int pos_byte = PT_BYTE; + + if (target_clm == 0) + chars_to_delete = 1; + else + { + /* The actual cursor position after the trial of moving + to column TARGET_CLM. It is greater than TARGET_CLM + if the TARGET_CLM is middle of multi-column + character. In that case, the new point is set after + that character. */ + int actual_clm + = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil)); + + chars_to_delete = PT - pos; + + if (actual_clm > target_clm) + { + /* We will delete too many columns. Let's fill columns + by spaces so that the remaining text won't move. */ + spaces_to_insert = actual_clm - target_clm; + } + } + SET_PT_BOTH (pos, pos_byte); + hairy = 2; + } hairy = 2; } if (!NILP (current_buffer->abbrev_mode) && SYNTAX (c) != Sword && NILP (current_buffer->read_only) - && point > BEGV && SYNTAX (FETCH_CHAR (point - 1)) == Sword) + && PT > BEGV && SYNTAX (XFASTINT (Fprevious_char ())) == Sword) { int modiff = MODIFF; - Fexpand_abbrev (); - /* We can't trust the value of Fexpand_abbrev, - but if Fexpand_abbrev changed the buffer, - assume it expanded something. */ + 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, + return right away--don't really self-insert. */ + if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function) + && SYMBOLP (XSYMBOL (sym)->function)) + { + Lisp_Object prop; + prop = Fget (XSYMBOL (sym)->function, intern ("no-self-insert")); + if (! NILP (prop)) + return 1; + } + if (MODIFF != modiff) hairy = 2; } - if ((c == ' ' || c == '\n') + + if (chars_to_delete) + { + string = make_string_from_bytes (str, 1, len); + if (spaces_to_insert) + { + tem = Fmake_string (make_number (spaces_to_insert), + make_number (' ')); + string = concat2 (tem, string); + } + + replace_range (PT, PT + chars_to_delete, string, 1, 1, 1); + Fforward_char (make_number (1 + spaces_to_insert)); + } + else + insert_and_inherit (str, len); + + if ((CHAR_TABLE_P (Vauto_fill_chars) + ? !NILP (CHAR_TABLE_REF (Vauto_fill_chars, c)) + : (c == ' ' || c == '\n')) && !noautofill && !NILP (current_buffer->auto_fill_function)) { - 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') - SET_PT (point + 1); - hairy = 2; + Lisp_Object tem; + + if (c == '\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_BOTH (PT - 1, PT_BYTE - 1); + tem = call0 (current_buffer->auto_fill_function); + /* Test PT < ZV in case the auto-fill-function is strange. */ + if (c == '\n' && PT < ZV) + SET_PT_BOTH (PT + 1, PT_BYTE + 1); + if (!NILP (tem)) + hairy = 2; } - else - insert_and_inherit (&c1, 1); /* 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); - XSETINT (after, PT); - Fput_text_property (before, after, Qface, Vself_insert_face, Qnil); + Fput_text_property (make_number (PT - 1), make_number (PT), + Qface, Vself_insert_face, Qnil); Vself_insert_face = Qnil; } + 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; @@ -320,6 +557,7 @@ internal_self_insert (c1, noautofill) /* module initialization */ +void syms_of_cmds () { Qkill_backward_chars = intern ("kill-backward-chars"); @@ -331,21 +569,25 @@ syms_of_cmds () 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, - "If non-nil, set the face of the next self-inserting character to this.\n\ -See also `self-insert-face-command'."); + doc: /* If non-nil, set the face of the next self-inserting character to this. +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'."); + doc: /* This is the command that set up `self-insert-face'. +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."); + doc: /* Function called, if non-nil, whenever a close parenthesis is inserted. +More precisely, a char with closeparen syntax is self-inserted. */); Vblink_paren_function = Qnil; + defsubr (&Sforward_point); defsubr (&Sforward_char); defsubr (&Sbackward_char); defsubr (&Sforward_line); @@ -358,6 +600,7 @@ More precisely, a char with closeparen syntax is self-inserted."); defsubr (&Sself_insert_command); } +void keys_of_cmds () { int n; @@ -379,3 +622,6 @@ keys_of_cmds () initial_define_key (global_map, Ctl ('F'), "forward-char"); initial_define_key (global_map, 0177, "delete-backward-char"); } + +/* arch-tag: 022ba3cd-67f9-4978-9c5d-7d2b18d8644e + (do not change this comment) */