mirror of
https://github.com/rfivet/uemacs.git
synced 2024-12-12 04:56:22 -05:00
Fix assertion violation when invoking help macro at end of help file. &mid function was not safe to call on empty line, same for &mid.
Minor reformatting of help file to avoid content to be mistaken as section reference by help macro.
This commit is contained in:
parent
5b2884b93c
commit
54145a48f8
14
emacs.hlp
14
emacs.hlp
@ -111,8 +111,8 @@ Pipe command .......... ^X @ Execute buffer ........ not bound
|
|||||||
Search forward ........ Meta S :: End string with Meta.
|
Search forward ........ Meta S :: End string with Meta.
|
||||||
Incremental search .... ^X S :: Search next ^X, stop Meta, cancel ^G.
|
Incremental search .... ^X S :: Search next ^X, stop Meta, cancel ^G.
|
||||||
Search reverse ........ ^R
|
Search reverse ........ ^R
|
||||||
Reverse incremental search Hunt forward .......... Alt-S
|
Reverse incremental Hunt forward .......... Alt-S
|
||||||
....................... ^X R Hunt backward ......... Alt-R
|
search ^X R Hunt backward ......... Alt-R
|
||||||
Replace string ........ Meta R
|
Replace string ........ Meta R
|
||||||
Query replace string .. Meta ^R :: Yes/no Y/N, replace rest !, cancel ^G.
|
Query replace string .. Meta ^R :: Yes/no Y/N, replace rest !, cancel ^G.
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
@ -164,9 +164,9 @@ Page overlap .......... $overlap :: # lines, default 0, 0 = 1/3 page
|
|||||||
=> FILE NAME COMPLETION
|
=> FILE NAME COMPLETION
|
||||||
|
|
||||||
File name completion can be used with all file commands (find-file,
|
File name completion can be used with all file commands (find-file,
|
||||||
view-file, ...) but it works only under UNIX and MS-DOS. It is invoked
|
view-file, ...). It is invoked by a <Space> or <Tab>. If there exist more
|
||||||
by a <Space> or <Tab>. If there exist more than one possible completions
|
than one possible completions they are displayed one by one. If the file
|
||||||
they are displayed one by one. If the file name contains wild card
|
name contains wild card characters, the name is expanded instead of simple
|
||||||
characters, the name is expanded instead of simple completion. Special
|
completion. Special characters can be entered verbatim by prefixing them
|
||||||
characters can be entered verbatim by prefixing them with ^V (or ^Q).
|
with ^V (or ^Q).
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
18
eval.c
18
eval.c
@ -395,13 +395,8 @@ static const char *gtfun( char *fname) {
|
|||||||
case UFLEFT:
|
case UFLEFT:
|
||||||
sz1 = strlen( argv[ 0]) ;
|
sz1 = strlen( argv[ 0]) ;
|
||||||
sz = 0 ;
|
sz = 0 ;
|
||||||
for( int i = atoi( argv[ 1]) ; i > 0 ; i -= 1) {
|
for( int i = atoi( argv[ 1]) ; sz < sz1 && i > 0 ; i -= 1)
|
||||||
unicode_t c ;
|
|
||||||
|
|
||||||
sz += utf8_to_unicode( argv[ 0], sz, sz1, &c) ;
|
sz += utf8_to_unicode( argv[ 0], sz, sz1, &c) ;
|
||||||
if( sz == sz1)
|
|
||||||
break ;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( sz >= ressize) {
|
if( sz >= ressize) {
|
||||||
free( result) ;
|
free( result) ;
|
||||||
@ -431,19 +426,12 @@ static const char *gtfun( char *fname) {
|
|||||||
case UFMID:
|
case UFMID:
|
||||||
sz1 = strlen( argv[ 0]) ;
|
sz1 = strlen( argv[ 0]) ;
|
||||||
int start = 0 ;
|
int start = 0 ;
|
||||||
for( i = atoi( argv[ 1]) - 1 ; i > 0 ; i -= 1) {
|
for( i = atoi( argv[ 1]) - 1 ; start < sz1 && i > 0 ; i -= 1)
|
||||||
start += utf8_to_unicode( argv[ 0], start, sz1, &c) ;
|
start += utf8_to_unicode( argv[ 0], start, sz1, &c) ;
|
||||||
if( start == sz1)
|
|
||||||
break ;
|
|
||||||
}
|
|
||||||
|
|
||||||
sz = start ;
|
sz = start ;
|
||||||
if( sz < sz1)
|
for( i = atoi( argv[ 2]) ; sz < sz1 && i > 0 ; i -= 1)
|
||||||
for( i = atoi( argv[ 2]) ; i > 0 ; i -= 1) {
|
|
||||||
sz += utf8_to_unicode( argv[ 0], sz, sz1, &c) ;
|
sz += utf8_to_unicode( argv[ 0], sz, sz1, &c) ;
|
||||||
if( sz == sz1)
|
|
||||||
break ;
|
|
||||||
}
|
|
||||||
|
|
||||||
sz -= start ;
|
sz -= start ;
|
||||||
if( sz >= ressize) {
|
if( sz >= ressize) {
|
||||||
|
Loading…
Reference in New Issue
Block a user