[Qemacs-commit] qemacs qe.c qe.h qeconfig.h

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/01/06 10:24:26

Modified files:
        .              : qe.c qe.h qeconfig.h 

Log message:
        improve overwrite-mode
        
        * accept universal argument: NO_ARG: toggle, ==0 insert, !=0 overwrite
        * added insert-mode command

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/qemacs/qeconfig.h?cvsroot=qemacs&r1=1.36&r2=1.37

Patches:
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- qe.c        6 Jan 2014 09:40:20 -0000       1.111
+++ qe.c        6 Jan 2014 10:24:26 -0000       1.112
@@ -1349,9 +1349,12 @@
     put_status(s, "Quote: ");
 }
 
-void do_insert(EditState *s)
+void do_overwrite_mode(EditState *s, int argval)
 {
+    if (argval == NO_ARG)
     s->insert = !s->insert;
+    else
+        s->insert = !argval;
 }
 
 void do_tab(EditState *s, int argval)

Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- qe.h        6 Jan 2014 09:40:21 -0000       1.109
+++ qe.h        6 Jan 2014 10:24:26 -0000       1.110
@@ -1668,7 +1668,7 @@
 void perform_scroll_up_down(EditState *s, int h);
 void do_center_cursor(EditState *s);
 void do_quote(EditState *s, int argval);
-void do_insert(EditState *s);
+void do_overwrite_mode(EditState *s, int argval);
 // should take argval
 void do_set_mark(EditState *s);
 void do_mark_whole_buffer(EditState *s);

Index: qeconfig.h
===================================================================
RCS file: /sources/qemacs/qemacs/qeconfig.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- qeconfig.h  29 Apr 2008 18:55:14 -0000      1.36
+++ qeconfig.h  6 Jan 2014 10:24:26 -0000       1.37
@@ -2,7 +2,7 @@
  * QEmacs, tiny but powerful multimode editor
  *
  * Copyright (c) 2000,2001 Fabrice Bellard.
- * Copyright (c) 2000-2008 Charlie Gordon.
+ * Copyright (c) 2000-2014 Charlie Gordon.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,8 +56,10 @@
           "beginning-of-line", do_bol)
     CMD0( KEY_CTRL('e'), KEY_END,
           "end-of-line", do_eol)
-    CMD0( KEY_INSERT, KEY_NONE,
-          "overwrite-mode", do_insert)
+    CMD2( KEY_INSERT, KEY_NONE,
+          "overwrite-mode", do_overwrite_mode, ESi, "ui")
+    CMD3( KEY_NONE, KEY_NONE,
+          "insert-mode", do_overwrite_mode, ESi, 0, "v")
     /* deletion commands should be allowed in read only buffers,
      * they should merely copy the data to the kill ring */
     CMD2( KEY_CTRL('d'), KEY_DELETE,