* xdisp.c (display_text_line): Apply faces to characters according

[gnu-emacs] / src / cmds.c

diff --git a/src/cmds.c b/src/cmds.c
index 8a6fb19535c7c99e70ad06241fba48d84bd016a1..e81d7c61e59acc4fa6a9bf677209b731d588a415 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -26,7 +26,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function;
 
-int overwrite_binary_mode;
+/* A possible value for a buffer's overwrite-mode variable.  */
+Lisp_Object Qoverwrite_mode_binary;
+
 \f
 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "p",
   "Move point right ARG characters (left if ARG negative).\n\
@@ -273,16 +275,19 @@ internal_self_insert (c1, noautofill)
   Lisp_Object tem;
   register enum syntaxcode synt;
   register int c = c1;
+  Lisp_Object overwrite = current_buffer->overwrite_mode;
 
   if (!NILP (Vbefore_change_function) || !NILP (Vafter_change_function))
     hairy = 1;
 
-  if (!NILP (current_buffer->overwrite_mode)
+  if (!NILP (overwrite)
       && point < ZV
-      && (overwrite_binary_mode || (c != '\n' && FETCH_CHAR (point) != '\n'))
-      && (overwrite_binary_mode
+      && (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))))
     {
       del_range (point, point + 1);
@@ -335,11 +340,8 @@ syms_of_cmds ()
   Qkill_forward_chars = intern ("kill-forward-chars");
   staticpro (&Qkill_forward_chars);
 
-  DEFVAR_BOOL ("overwrite-binary-mode", &overwrite_binary_mode,
-    "*Non-nil means overwrite mode treats tab and newline normally.\n\
-Ordinarily, overwriting preserves a tab until its whole width is overwritten\n\
-and never replaces a newline.");
-  overwrite_binary_mode = 1;
+  Qoverwrite_mode_binary = intern ("overwrite-mode-binary");
+  staticpro (&Qoverwrite_mode_binary);
 
   DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function,
     "Function called, if non-nil, whenever a close parenthesis is inserted.\n\