Changeset 1490 for branches/GNU/src/cmds.c

Timestamp:

02/17/98 01:45:05 (11 years ago)

Author:

himi

Message:

Meadow--Multilingual Enhancement to GNU Emacs with ADvantages Over Windows

Files:

• branches/GNU/src/cmds.c (modified) (27 diffs)

branches/GNU/src/cmds.c

@@ -1 +1 @@
-/* Simple built-in editing commands.
-97, 1998
+1997
-
-This file is part of GNU Emacs.
@@ -28 +28 @@
-#include "window.h"
-#include "keyboard.h"
-#include "dispextern.h"
-
-Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function;
@@ -41 +40 @@
-Lisp_Object Vself_insert_face_command;
-
+/* Offset to add to a non-ASCII value when inserting it.  */
+int nonascii_insert_offset;
+
-extern Lisp_Object Qface;
-
+/* Return buffer position which is N characters after `point'.  */
+int
+forward_point (n)
+     int n;
+{
+  int pos = PT, c;
+
+  if (!NILP (current_buffer->enable_multibyte_characters))
+    {
+      /* Simply adding N to `point' doesn't work because of multi-byte
+         form.  We had better not use INC_POS and DEC_POS because they
+         check the gap position every time.  But, for the moment, we
+         need working code.  */
+      if (n > 0)
+        {
+          while (pos < ZV && n--) INC_POS (pos);
+          if (pos < ZV) n++;
+        }
+      else
+        {
+          while (pos > BEGV && n++) DEC_POS (pos);
+          if (pos > BEGV) n--;
+        }
+    }
+  pos += n;
+
+  return pos;
+}
+
-DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
-  "Return buffer position N characters after (before if N negative) point.")
@@ -50 +81 @@
-  CHECK_NUMBER (n, 0);
-
-PT + XINT (n
+forward_point (XINT (n)
-}
-
@@ -70 +101 @@
-     proposed position, then set point.  */
-  {
-PT + XINT (n
+forward_point (XINT (n)
-
-    if (new_point < BEGV)
@@ -115 +146 @@
-     Lisp_Object n;
-{
-
-
-
-
+
+
+
-
-  if (NILP (n))
@@ -128 +158 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-  if (shortage > 0
-count <= 0
+negp
-          || (ZV > BEGV
-PT != opoint
-(FETCH_BYTE (PT_BYTE - 1) != '\n')
+pos != pos2
+FETCH_BYTE (pos - 1) != '\n'
-    shortage--;
-
-count <= 0
+
+negp
-}
-
@@ -201 +220 @@
-  CHECK_NUMBER (n, 0);
-
-PT + XINT (n
+forward_point (XINT (n)
-  if (NILP (killflag))
-    {
@@ -237 +256 @@
-  Lisp_Object value;
-  int deleted_special = 0;
-pos_byte, 
+
-
-  CHECK_NUMBER (n, 0);
@@ -243 +262 @@
-  /* See if we are about to delete a tab or newline backwards.  */
-  pos = PT;
-
-
+
-    {
-      int c;
-
-BOTH (pos, pos_byte
-_byte
+POS (pos
+
-      if (c == '\t' || c == '\n')
-        {
@@ -262 +280 @@
-      && ! NILP (current_buffer->overwrite_mode)
-      && ! deleted_special
-_BYTE
+
-    {
-      int column = current_column ();
@@ -269 +287 @@
-      i = column - current_column ();
-      Finsert_char (make_number (' '), make_number (i), Qnil);
-
-
+
-    }
-  else
@@ -297 +314 @@
-         We pass internal_self_insert the unmodified character
-         because it itself does this offsetting.  */
-
-
+
+
+
-
-      XSETFASTINT (n, XFASTINT (n) - 2);
@@ -328 +346 @@
-   A value of 2 means this did things that call for an undo boundary.  */
-
-int
-internal_self_insert (c, noautofill)
-     int c;
@@ -342 +359 @@
-  /* Working buffer and pointer for multi-byte form of C.  */
-  unsigned char workbuf[4], *str;
-chars
+number
-  int spaces_to_insert = 0;
+
+  if (c >= 0200 && c <= 0377
+      && ! NILP (current_buffer->enable_multibyte_characters))
+    c += nonascii_insert_offset;
-
-  overwrite = current_buffer->overwrite_mode;
@@ -352 +373 @@
-  /* At first, get multi-byte form of C in STR.  */
-  if (!NILP (current_buffer->enable_multibyte_characters))
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  if (!NILP (overwrite)
-      && PT < ZV)
@@ -376 +389 @@
-         C2 and several characters following C2.  */
-
-
-
-
-
+
+
+
+
+
-         The correct value should be calculated only when necessary.  */
-      int target_clm = 0;
@@ -394 +408 @@
-                    && XINT (current_buffer->tab_width) > 0
-                    && XFASTINT (current_buffer->tab_width) < 20
-
-
+
+
+
-                        target_clm % XFASTINT (current_buffer->tab_width)))))
-        {
-          int pos = PT;
-          int pos_byte = PT_BYTE;
-
-          if (target_clm == 0)
-chars_to_delete = 1
+number_to_delete = forward_point (1) - PT
-          else
-            {
@@ -413 +427 @@
-                = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil));
-
-chars
+number
-
-              if (actual_clm > target_clm)
@@ -422 +436 @@
-                }
-            }
-_BOTH (pos, pos_byte
+ (pos
-          hairy = 2;
-        }
@@ -453 +467 @@
-    }
-
-chars
-
-_from_bytes (str, 1
+number
+
+ (str
-      if (spaces_to_insert)
-        {
@@ -463 +477 @@
-        }
-
-chars_to_delete, string, 1
-Fforward_char (make_number (1 + spaces_to_insert)
+number_to_delete, string
+SET_PT (PT + XSTRING (string)->size
-    }
-  else
@@ -476 +490 @@
-
-      if (c == '\n')
-
-   that.  Must have the newline in place already so filling and
-   justification, if any, know where the end is going to be. 
-_BOTH (PT - 1, PT_BYTE
+ */
+/* that.  Must have the newline in place already so filling and */
+/* justification, if any, know where the end is going to be.
+ (PT
-      tem = call0 (current_buffer->auto_fill_function);
-      if (c == '\n')
-_BOTH (PT + 1, PT_BYTE
+ (PT
-      if (!NILP (tem))
-        hairy = 2;
@@ -492 +506 @@
-      && EQ (current_kboard->Vlast_command, Vself_insert_face_command))
-    {
-
-
+
+
+
+
-      Vself_insert_face = Qnil;
-    }
@@ -511 +527 @@
-/* module initialization */
-
-void
-syms_of_cmds ()
-{
@@ -537 +552 @@
-More precisely, a char with closeparen syntax is self-inserted.");
-  Vblink_paren_function = Qnil;
+
+  DEFVAR_INT ("nonascii-insert-offset", &nonascii_insert_offset,
+    "Offset to add to a non-ascii code 0200...0377 when inserting it.\n\
+This applies only when multibyte characters are enabled, and it serves\n\
+to convert a Latin-1 or similar 8-bit character code to the corresponding\n\
+Emacs character code.");
+  nonascii_insert_offset = 0;
-
-  defsubr (&Sforward_point);
@@ -551 +573 @@
-}
-
-void
-keys_of_cmds ()
-{