110d525ec6
Main changes: * Vim-style expandtab option * Provides Turkish translation * Backspace now deletes \ rather than being escaped * T during motion commands is now VI-compatible * Encoding related fixes, such as UTF-8 detection * Fixed a number of memory management issues MFC after: 3 weeks
100 lines
2.1 KiB
C
100 lines
2.1 KiB
C
/*-
|
|
* Copyright (c) 1992, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
* Copyright (c) 1992, 1993, 1994, 1995, 1996
|
|
* Keith Bostic. All rights reserved.
|
|
*
|
|
* See the LICENSE file for redistribution information.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/queue.h>
|
|
#include <sys/time.h>
|
|
|
|
#include <bitstring.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
|
|
#include "../common/common.h"
|
|
#include "vi.h"
|
|
|
|
/*
|
|
* v_xchar -- [buffer] [count]x
|
|
* Deletes the character(s) on which the cursor sits.
|
|
*
|
|
* PUBLIC: int v_xchar(SCR *, VICMD *);
|
|
*/
|
|
int
|
|
v_xchar(SCR *sp, VICMD *vp)
|
|
{
|
|
size_t len;
|
|
int isempty;
|
|
|
|
if (db_eget(sp, vp->m_start.lno, NULL, &len, &isempty)) {
|
|
if (isempty)
|
|
goto nodel;
|
|
return (1);
|
|
}
|
|
if (len == 0) {
|
|
nodel: msgq(sp, M_BERR, "206|No characters to delete");
|
|
return (1);
|
|
}
|
|
|
|
/*
|
|
* Delete from the cursor toward the end of line, w/o moving the
|
|
* cursor.
|
|
*
|
|
* !!!
|
|
* Note, "2x" at EOL isn't the same as "xx" because the left movement
|
|
* of the cursor as part of the 'x' command isn't taken into account.
|
|
* Historically correct.
|
|
*/
|
|
if (F_ISSET(vp, VC_C1SET))
|
|
vp->m_stop.cno += vp->count - 1;
|
|
if (vp->m_stop.cno >= len - 1) {
|
|
vp->m_stop.cno = len - 1;
|
|
vp->m_final.cno = vp->m_start.cno ? vp->m_start.cno - 1 : 0;
|
|
} else
|
|
vp->m_final.cno = vp->m_start.cno;
|
|
|
|
if (cut(sp,
|
|
F_ISSET(vp, VC_BUFFER) ? &vp->buffer : NULL,
|
|
&vp->m_start, &vp->m_stop, 0))
|
|
return (1);
|
|
return (del(sp, &vp->m_start, &vp->m_stop, 0));
|
|
}
|
|
|
|
/*
|
|
* v_Xchar -- [buffer] [count]X
|
|
* Deletes the character(s) immediately before the current cursor
|
|
* position.
|
|
*
|
|
* PUBLIC: int v_Xchar(SCR *, VICMD *);
|
|
*/
|
|
int
|
|
v_Xchar(SCR *sp, VICMD *vp)
|
|
{
|
|
u_long cnt;
|
|
|
|
if (vp->m_start.cno == 0) {
|
|
v_sol(sp);
|
|
return (1);
|
|
}
|
|
|
|
cnt = F_ISSET(vp, VC_C1SET) ? vp->count : 1;
|
|
if (cnt >= vp->m_start.cno)
|
|
vp->m_start.cno = 0;
|
|
else
|
|
vp->m_start.cno -= cnt;
|
|
--vp->m_stop.cno;
|
|
vp->m_final.cno = vp->m_start.cno;
|
|
|
|
if (cut(sp,
|
|
F_ISSET(vp, VC_BUFFER) ? &vp->buffer : NULL,
|
|
&vp->m_start, &vp->m_stop, 0))
|
|
return (1);
|
|
return (del(sp, &vp->m_start, &vp->m_stop, 0));
|
|
}
|