Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
56a98455
Commit
56a98455
authored
Jan 14, 1992
by
Jim Blandy
Browse files
*** empty log message ***
parent
0849f191
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
82 deletions
+61
-82
src/editfns.c
src/editfns.c
+12
-30
src/indent.c
src/indent.c
+9
-11
src/minibuf.c
src/minibuf.c
+37
-41
src/window.h
src/window.h
+3
-0
No files found.
src/editfns.c
View file @
56a98455
...
...
@@ -92,7 +92,7 @@ init_editfns ()
/* If the user name claimed in the environment vars differs from
the real uid, use the claimed name to find the full name. */
tem
=
Fstring_equal
(
Vuser_name
,
Vuser_real_name
);
if
(
N
ULL
(
tem
))
if
(
N
ILP
(
tem
))
pw
=
(
struct
passwd
*
)
getpwnam
(
XSTRING
(
Vuser_name
)
->
data
);
p
=
(
unsigned
char
*
)
(
pw
?
USER_FULL_NAME
:
"unknown"
);
...
...
@@ -202,7 +202,7 @@ region_limit (beginningp)
{
register
Lisp_Object
m
;
m
=
Fmarker_position
(
current_buffer
->
mark
);
if
(
N
ULL
(
m
))
error
(
"There is no region now"
);
if
(
N
ILP
(
m
))
error
(
"There is no region now"
);
if
((
point
<
XFASTINT
(
m
))
==
beginningp
)
return
(
make_number
(
point
));
else
...
...
@@ -263,14 +263,14 @@ store it in a Lisp variable. Example:\n\
(pos)
Lisp_Object pos;
{
if (N
ULL
(pos))
if (N
ILP
(pos))
{
current_buffer->mark = Qnil;
return Qnil;
}
CHECK_NUMBER_COERCE_MARKER (pos, 0);
if (N
ULL
(current_buffer->mark))
if (N
ILP
(current_buffer->mark))
current_buffer->mark = Fmake_marker ();
Fset_marker (current_buffer->mark, pos, Qnil);
...
...
@@ -298,7 +298,7 @@ save_excursion_restore (info)
/* Otherwise could get error here while unwinding to top level
and crash */
/* In that case, Fmarker_buffer returns nil now. */
if
(
N
ULL
(
tem
))
if
(
N
ILP
(
tem
))
return
Qnil
;
Fset_buffer
(
tem
);
tem
=
Fcar
(
info
);
...
...
@@ -308,7 +308,7 @@ save_excursion_restore (info)
Fset_marker
(
current_buffer
->
mark
,
tem
,
Fcurrent_buffer
());
unchain_marker
(
tem
);
tem
=
Fcdr
(
Fcdr
(
info
));
if
(
!
N
ULL
(
tem
)
&&
current_buffer
!=
XBUFFER
(
XWINDOW
(
selected_window
)
->
buffer
))
if
(
!
N
ILP
(
tem
)
&&
current_buffer
!=
XBUFFER
(
XWINDOW
(
selected_window
)
->
buffer
))
Fswitch_to_buffer
(
Fcurrent_buffer
(),
Qnil
);
return
Qnil
;
}
...
...
@@ -720,14 +720,14 @@ They default to the beginning and the end of BUFFER.")
buf
=
Fget_buffer
(
buf
);
bp
=
XBUFFER
(
buf
);
if
(
N
ULL
(
b
))
if
(
N
ILP
(
b
))
beg
=
BUF_BEGV
(
bp
);
else
{
CHECK_NUMBER_COERCE_MARKER
(
b
,
0
);
beg
=
XINT
(
b
);
}
if
(
N
ULL
(
e
))
if
(
N
ILP
(
e
))
end
=
BUF_ZV
(
bp
);
else
{
...
...
@@ -782,7 +782,7 @@ and don't mark the buffer as really changed.")
look
=
XINT
(
fromchar
);
modify_region
(
pos
,
stop
);
if
(
!
N
ULL
(
noundo
))
if
(
!
N
ILP
(
noundo
))
{
if
(
MODIFF
-
1
==
current_buffer
->
save_modified
)
current_buffer
->
save_modified
++
;
...
...
@@ -794,10 +794,10 @@ and don't mark the buffer as really changed.")
{
if
(
FETCH_CHAR
(
pos
)
==
look
)
{
if
(
N
ULL
(
noundo
))
if
(
N
ILP
(
noundo
))
record_change
(
pos
,
1
);
FETCH_CHAR
(
pos
)
=
XINT
(
tochar
);
if
(
N
ULL
(
noundo
))
if
(
N
ILP
(
noundo
))
signal_after_change
(
pos
,
1
,
1
);
}
pos
++
;
...
...
@@ -1183,28 +1183,13 @@ Case is ignored if `case-fold-search' is non-nil in the current buffer.")
CHECK_NUMBER
(
c1
,
0
);
CHECK_NUMBER
(
c2
,
1
);
if
(
!
N
ULL
(
current_buffer
->
case_fold_search
)
if
(
!
N
ILP
(
current_buffer
->
case_fold_search
)
?
downcase
[
0xff
&
XFASTINT
(
c1
)]
==
downcase
[
0xff
&
XFASTINT
(
c2
)]
:
XINT
(
c1
)
==
XINT
(
c2
))
return
Qt
;
return
Qnil
;
}
#ifndef MAINTAIN_ENVIRONMENT
/* it is done in environ.c in that case */
DEFUN
(
"getenv"
,
Fgetenv
,
Sgetenv
,
1
,
2
,
0
,
"Return the value of environment variable VAR, as a string.
\n
\
VAR should be a string. Value is nil if VAR is undefined in the environment."
)
(
str
)
Lisp_Object
str
;
{
register
char
*
val
;
CHECK_STRING
(
str
,
0
);
val
=
(
char
*
)
egetenv
(
XSTRING
(
str
)
->
data
);
if
(
!
val
)
return
Qnil
;
return
build_string
(
val
);
}
#endif
/* MAINTAIN_ENVIRONMENT */
void
syms_of_editfns
()
...
...
@@ -1266,9 +1251,6 @@ syms_of_editfns ()
defsubr
(
&
Sunix_sync
);
defsubr
(
&
Smessage
);
defsubr
(
&
Sformat
);
#ifndef MAINTAIN_ENVIRONMENT
/* in environ.c */
defsubr
(
&
Sgetenv
);
#endif
defsubr
(
&
Sinsert_buffer_substring
);
defsubr
(
&
Ssubst_char_in_region
);
...
...
src/indent.c
View file @
56a98455
...
...
@@ -47,8 +47,6 @@ int last_known_column_point;
/* Value of MODIFF when current_column was called */
int
last_known_column_modified
;
extern
int
minibuf_prompt_width
;
/* Get the display table to use for the current buffer. */
struct
Lisp_Vector
*
...
...
@@ -99,7 +97,7 @@ current_column ()
int
post_tab
;
register
int
c
;
register
int
tab_width
=
XINT
(
current_buffer
->
tab_width
);
int
ctl_arrow
=
!
N
ULL
(
current_buffer
->
ctl_arrow
);
int
ctl_arrow
=
!
N
ILP
(
current_buffer
->
ctl_arrow
);
register
struct
Lisp_Vector
*
dp
=
buffer_display_table
();
int
stopchar
;
...
...
@@ -188,7 +186,7 @@ even if that goes past COLUMN; by default, MIN is zero.")
register
int
tab_width
=
XINT
(
current_buffer
->
tab_width
);
CHECK_NUMBER
(
col
,
0
);
if
(
N
ULL
(
minimum
))
if
(
N
ILP
(
minimum
))
XFASTINT
(
minimum
)
=
0
;
CHECK_NUMBER
(
minimum
,
1
);
...
...
@@ -293,7 +291,7 @@ and if COLUMN is in the middle of a tab character, change it to spaces.")
register
int
goal
;
register
int
end
;
register
int
tab_width
=
XINT
(
current_buffer
->
tab_width
);
register
int
ctl_arrow
=
!
N
ULL
(
current_buffer
->
ctl_arrow
);
register
int
ctl_arrow
=
!
N
ILP
(
current_buffer
->
ctl_arrow
);
register
struct
Lisp_Vector
*
dp
=
buffer_display_table
();
Lisp_Object
val
;
...
...
@@ -344,7 +342,7 @@ and if COLUMN is in the middle of a tab character, change it to spaces.")
/* If a tab char made us overshoot, change it to spaces
and scan through it again. */
if
(
!
N
ULL
(
force
)
&&
col
>
goal
&&
c
==
'\t'
&&
prev_col
<
goal
)
if
(
!
N
ILP
(
force
)
&&
col
>
goal
&&
c
==
'\t'
&&
prev_col
<
goal
)
{
del_range
(
point
-
1
,
point
);
Findent_to
(
make_number
(
col
-
1
));
...
...
@@ -353,7 +351,7 @@ and if COLUMN is in the middle of a tab character, change it to spaces.")
}
/* If line ends prematurely, add space to the end. */
if
(
col
<
goal
&&
!
N
ULL
(
force
))
if
(
col
<
goal
&&
!
N
ILP
(
force
))
Findent_to
(
make_number
(
col
=
goal
));
last_known_column
=
col
;
...
...
@@ -434,12 +432,12 @@ compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, ta
register
int
pos
;
register
int
c
;
register
int
tab_width
=
XFASTINT
(
current_buffer
->
tab_width
);
register
int
ctl_arrow
=
!
N
ULL
(
current_buffer
->
ctl_arrow
);
register
int
ctl_arrow
=
!
N
ILP
(
current_buffer
->
ctl_arrow
);
register
struct
Lisp_Vector
*
dp
=
buffer_display_table
();
int
selective
=
XTYPE
(
current_buffer
->
selective_display
)
==
Lisp_Int
?
XINT
(
current_buffer
->
selective_display
)
:
!
N
ULL
(
current_buffer
->
selective_display
)
?
-
1
:
0
;
:
!
N
ILP
(
current_buffer
->
selective_display
)
?
-
1
:
0
;
int
prevpos
;
int
selective_rlen
=
(
selective
&&
dp
&&
XTYPE
(
DISP_INVIS_ROPE
(
dp
))
==
Lisp_String
...
...
@@ -517,7 +515,7 @@ compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, ta
if
(
hscroll
||
(
truncate_partial_width_windows
&&
width
+
1
<
SCREEN_WIDTH
(
selected_screen
))
||
!
N
ULL
(
current_buffer
->
truncate_lines
))
||
!
N
ILP
(
current_buffer
->
truncate_lines
))
{
while
(
pos
<
to
&&
FETCH_CHAR
(
pos
)
!=
'\n'
)
pos
++
;
pos
--
;
...
...
@@ -593,7 +591,7 @@ vmotion (from, vtarget, width, hscroll, window)
int
selective
=
XTYPE
(
current_buffer
->
selective_display
)
==
Lisp_Int
?
XINT
(
current_buffer
->
selective_display
)
:
!
N
ULL
(
current_buffer
->
selective_display
)
?
-
1
:
0
;
:
!
N
ILP
(
current_buffer
->
selective_display
)
?
-
1
:
0
;
int
start_hpos
=
(
EQ
(
window
,
minibuf_window
)
?
minibuf_prompt_width
:
0
);
retry:
...
...
src/minibuf.c
View file @
56a98455
...
...
@@ -74,10 +74,6 @@ static Lisp_Object last_exact_completion;
Lisp_Object
Quser_variable_p
;
/* Width in columns of current minibuffer prompt. */
extern
int
minibuf_prompt_width
;
/* Actual minibuffer invocation. */
...
...
@@ -171,10 +167,10 @@ read_minibuf (map, initial, prompt, backup_n, expflag)
Ferase_buffer
();
minibuf_level
++
;
if
(
!
N
ULL
(
initial
))
if
(
!
N
ILP
(
initial
))
{
Finsert
(
1
,
&
initial
);
if
(
!
N
ULL
(
backup_n
)
&&
XTYPE
(
backup_n
)
==
Lisp_Int
)
if
(
!
N
ILP
(
backup_n
)
&&
XTYPE
(
backup_n
)
==
Lisp_Int
)
Fforward_char
(
backup_n
);
}
...
...
@@ -231,13 +227,13 @@ get_minibuffer (depth)
XFASTINT
(
num
)
=
depth
;
tail
=
Fnthcdr
(
num
,
Vminibuffer_list
);
if
(
N
ULL
(
tail
))
if
(
N
ILP
(
tail
))
{
tail
=
Fcons
(
Qnil
,
Qnil
);
Vminibuffer_list
=
nconc2
(
Vminibuffer_list
,
tail
);
}
buf
=
Fcar
(
tail
);
if
(
N
ULL
(
buf
)
||
N
ULL
(
XBUFFER
(
buf
)
->
name
))
if
(
N
ILP
(
buf
)
||
N
ILP
(
XBUFFER
(
buf
)
->
name
))
{
sprintf
(
name
,
" *Minibuf-%d*"
,
depth
);
buf
=
Fget_buffer_create
(
build_string
(
name
));
...
...
@@ -299,10 +295,10 @@ Fifth arg POSITION, if non-nil, is where to put point\n\
int
pos
=
0
;
CHECK_STRING
(
prompt
,
0
);
if
(
!
N
ULL
(
initial_input
))
if
(
!
N
ILP
(
initial_input
))
{
CHECK_STRING
(
initial_input
,
1
);
if
(
!
N
ULL
(
position
))
if
(
!
N
ILP
(
position
))
{
CHECK_NUMBER
(
position
,
0
);
/* Convert to distance from end of input. */
...
...
@@ -310,12 +306,12 @@ Fifth arg POSITION, if non-nil, is where to put point\n\
}
}
if
(
N
ULL
(
keymap
))
if
(
N
ILP
(
keymap
))
keymap
=
Vminibuffer_local_map
;
else
keymap
=
get_keymap
(
keymap
,
2
);
return
read_minibuf
(
keymap
,
initial_input
,
prompt
,
pos
,
!
N
ULL
(
read
));
pos
,
!
N
ILP
(
read
));
}
DEFUN
(
"read-minibuffer"
,
Fread_minibuffer
,
Sread_minibuffer
,
1
,
2
,
0
,
...
...
@@ -326,7 +322,7 @@ is a string to insert in the minibuffer before reading.")
Lisp_Object
prompt
,
initial_contents
;
{
CHECK_STRING
(
prompt
,
0
);
if
(
!
N
ULL
(
initial_contents
))
if
(
!
N
ILP
(
initial_contents
))
CHECK_STRING
(
initial_contents
,
1
)
return
read_minibuf
(
Vminibuffer_local_map
,
initial_contents
,
prompt
,
Qnil
,
1
);
}
...
...
@@ -359,7 +355,7 @@ Prompt with PROMPT, and provide INIT as an initial value of the input string.")
Lisp_Object
prompt
,
init
;
{
CHECK_STRING
(
prompt
,
0
);
if
(
!
N
ULL
(
init
))
if
(
!
N
ILP
(
init
))
CHECK_STRING
(
init
,
1
);
return
read_minibuf
(
Vminibuffer_local_ns_map
,
init
,
prompt
,
Qnil
,
0
);
...
...
@@ -413,7 +409,7 @@ If optional third arg REQUIRE-MATCH is non-nil, only existing buffer names are a
if
(
XTYPE
(
def
)
==
Lisp_Buffer
)
def
=
XBUFFER
(
def
)
->
name
;
if
(
!
N
ULL
(
def
))
if
(
!
N
ILP
(
def
))
{
args
[
0
]
=
build_string
(
"%s(default %s) "
);
args
[
1
]
=
prompt
;
...
...
@@ -453,7 +449,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
Lisp_Object
bestmatch
,
tail
,
elt
,
eltstring
;
int
bestmatchsize
;
int
compare
,
matchsize
;
int
list
=
CONSP
(
alist
)
||
N
ULL
(
alist
);
int
list
=
CONSP
(
alist
)
||
N
ILP
(
alist
);
int
index
,
obsize
;
int
matchcount
=
0
;
Lisp_Object
bucket
,
zero
,
end
,
tem
;
...
...
@@ -483,7 +479,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
if
(
list
)
{
if
(
N
ULL
(
tail
))
if
(
N
ILP
(
tail
))
break
;
elt
=
Fcar
(
tail
);
eltstring
=
Fcar
(
elt
);
...
...
@@ -520,7 +516,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
/* Ignore this element if there is a predicate
and the predicate doesn't like it. */
if
(
!
N
ULL
(
pred
))
if
(
!
N
ILP
(
pred
))
{
if
(
EQ
(
pred
,
Qcommandp
))
tem
=
Fcommandp
(
elt
);
...
...
@@ -530,13 +526,13 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
tem
=
call1
(
pred
,
elt
);
UNGCPRO
;
}
if
(
N
ULL
(
tem
))
continue
;
if
(
N
ILP
(
tem
))
continue
;
}
/* Update computation of how much all possible completions match */
matchcount
++
;
if
(
N
ULL
(
bestmatch
))
if
(
N
ILP
(
bestmatch
))
bestmatch
=
eltstring
,
bestmatchsize
=
XSTRING
(
eltstring
)
->
size
;
else
{
...
...
@@ -575,7 +571,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
}
}
if
(
N
ULL
(
bestmatch
))
if
(
N
ILP
(
bestmatch
))
return
Qnil
;
/* No completions found */
/* If we are ignoring case, and there is no exact match,
and no additional text was supplied,
...
...
@@ -642,7 +638,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
{
Lisp_Object
tail
,
elt
,
eltstring
;
Lisp_Object
allmatches
;
int
list
=
CONSP
(
alist
)
||
N
ULL
(
alist
);
int
list
=
CONSP
(
alist
)
||
N
ILP
(
alist
);
int
index
,
obsize
;
Lisp_Object
bucket
,
tem
;
struct
gcpro
gcpro1
,
gcpro2
,
gcpro3
,
gcpro4
;
...
...
@@ -672,7 +668,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
if
(
list
)
{
if
(
N
ULL
(
tail
))
if
(
N
ILP
(
tail
))
break
;
elt
=
Fcar
(
tail
);
eltstring
=
Fcar
(
elt
);
...
...
@@ -710,7 +706,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
/* Ignore this element if there is a predicate
and the predicate doesn't like it. */
if
(
!
N
ULL
(
pred
))
if
(
!
N
ILP
(
pred
))
{
if
(
EQ
(
pred
,
Qcommandp
))
tem
=
Fcommandp
(
elt
);
...
...
@@ -720,7 +716,7 @@ The argument given to PREDICATE is the alist element or the symbol from the obar
tem
=
call1
(
pred
,
elt
);
UNGCPRO
;
}
if
(
N
ULL
(
tem
))
continue
;
if
(
N
ILP
(
tem
))
continue
;
}
/* Ok => put it on the list. */
allmatches
=
Fcons
(
eltstring
,
allmatches
);
...
...
@@ -760,7 +756,7 @@ other component that is likely to be deleted.")
specbind
(
Qminibuffer_completion_confirm
,
EQ
(
require_match
,
Qt
)
?
Qnil
:
Qt
);
last_exact_completion
=
Qnil
;
val
=
read_minibuf
(
N
ULL
(
require_match
)
val
=
read_minibuf
(
N
ILP
(
require_match
)
?
Vminibuffer_local_completion_map
:
Vminibuffer_local_must_match_map
,
init
,
prompt
,
backup_n
,
0
);
...
...
@@ -794,7 +790,7 @@ temp_echo_area_glyphs (m)
Vinhibit_quit
=
Qt
;
Fsit_for
(
make_number
(
2
),
Qnil
,
Qnil
);
del_range
(
point
,
ZV
);
if
(
!
N
ULL
(
Vquit_flag
))
if
(
!
N
ILP
(
Vquit_flag
))
{
Vquit_flag
=
Qnil
;
unread_command_char
=
Ctl
(
'g'
);
...
...
@@ -825,7 +821,7 @@ do_completion ()
last
=
last_exact_completion
;
last_exact_completion
=
Qnil
;
if
(
N
ULL
(
completion
))
if
(
N
ILP
(
completion
))
{
bitch_at_user
();
temp_echo_area_glyphs
(
" [No match]"
);
...
...
@@ -837,7 +833,7 @@ do_completion ()
/* compiler bug */
tem
=
Fstring_equal
(
completion
,
Fbuffer_string
());
if
(
completedp
=
N
ULL
(
tem
))
if
(
completedp
=
N
ILP
(
tem
))
{
Ferase_buffer
();
/* Some completion happened */
Finsert
(
1
,
&
completion
);
...
...
@@ -845,7 +841,7 @@ do_completion ()
/* It did find a match. Do we match some possibility exactly now? */
if
(
CONSP
(
Vminibuffer_completion_table
)
||
N
ULL
(
Vminibuffer_completion_table
))
||
N
ILP
(
Vminibuffer_completion_table
))
tem
=
assoc_for_completion
(
Fbuffer_string
(),
Vminibuffer_completion_table
);
else
if
(
XTYPE
(
Vminibuffer_completion_table
)
==
Lisp_Vector
)
...
...
@@ -859,7 +855,7 @@ do_completion ()
XSTRING
(
tem
)
->
data
,
XSTRING
(
tem
)
->
size
);
if
(
XTYPE
(
tem
)
!=
Lisp_Symbol
)
tem
=
Qnil
;
else
if
(
!
N
ULL
(
Vminibuffer_completion_predicate
))
else
if
(
!
N
ILP
(
Vminibuffer_completion_predicate
))
tem
=
call1
(
Vminibuffer_completion_predicate
,
tem
);
else
tem
=
Qt
;
...
...
@@ -870,7 +866,7 @@ do_completion ()
Vminibuffer_completion_predicate
,
Qlambda
);
if
(
N
ULL
(
tem
))
if
(
N
ILP
(
tem
))
{
/* not an exact match */
if
(
completedp
)
return
5
;
...
...
@@ -886,10 +882,10 @@ do_completion ()
it means we've already given a "Complete but not unique"
message and the user's hit TAB again, so now we give him help. */
last_exact_completion
=
completion
;
if
(
!
N
ULL
(
last
))
if
(
!
N
ILP
(
last
))
{
tem
=
Fbuffer_string
();
if
(
!
N
ULL
(
Fequal
(
tem
,
last
)))
if
(
!
N
ILP
(
Fequal
(
tem
,
last
)))
Fminibuffer_completion_help
();
}
return
3
;
...
...
@@ -907,7 +903,7 @@ assoc_for_completion (key, list)
if
(
completion_ignore_case
)
key
=
Fupcase
(
key
);
for
(
tail
=
list
;
!
N
ULL
(
tail
);
tail
=
Fcdr
(
tail
))
for
(
tail
=
list
;
!
N
ILP
(
tail
);
tail
=
Fcdr
(
tail
))
{
register
Lisp_Object
elt
,
tem
,
thiscar
;
elt
=
Fcar
(
tail
);
...
...
@@ -918,7 +914,7 @@ assoc_for_completion (key, list)
if
(
completion_ignore_case
)
thiscar
=
Fupcase
(
thiscar
);
tem
=
Fequal
(
thiscar
,
key
);
if
(
!
N
ULL
(
tem
))
return
elt
;
if
(
!
N
ILP
(
tem
))
return
elt
;
QUIT
;
}
return
Qnil
;
...
...
@@ -968,7 +964,7 @@ a repetition of this command will exit.")
goto
exit
;
case
4
:
if
(
!
N
ULL
(
Vminibuffer_completion_confirm
))
if
(
!
N
ILP
(
Vminibuffer_completion_confirm
))
{
temp_echo_area_glyphs
(
" [Confirm]"
);
return
Qnil
;
...
...
@@ -1001,7 +997,7 @@ is added, provided that matches some possible completion.")
completion
=
Ftry_completion
(
Fbuffer_string
(),
Vminibuffer_completion_table
,
Vminibuffer_completion_predicate
);
if
(
N
ULL
(
completion
))
if
(
N
ILP
(
completion
))
{
bitch_at_user
();
temp_echo_area_glyphs
(
" [No match]"
);
...
...
@@ -1113,12 +1109,12 @@ or may be a list of two strings to be printed as if concatenated.")
set_buffer_internal
(
XBUFFER
(
Vstandard_output
));
if
(
N
ULL
(
completions
))
if
(
N
ILP
(
completions
))
insert_string
(
"There are no possible completions of what you have typed."
);
else
{
insert_string
(
"Possible completions are:"
);
for
(
tail
=
completions
,
i
=
0
;
!
N
ULL
(
tail
);
tail
=
Fcdr
(
tail
),
i
++
)
for
(
tail
=
completions
,
i
=
0
;
!
N
ILP
(
tail
);
tail
=
Fcdr
(
tail
),
i
++
)
{
/* this needs fixing for the case of long completions
and/or narrow windows */
...
...
@@ -1155,7 +1151,7 @@ DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_co
Vminibuffer_completion_predicate
);
echo_area_glyphs
=
0
;
if
(
N
ULL
(
completions
))
if
(
N
ILP
(
completions
))
{
bitch_at_user
();
temp_echo_area_glyphs
(
" [No completions]"
);
...
...
src/window.h
View file @
56a98455
...
...
@@ -205,6 +205,9 @@ extern Lisp_Object Fset_window_buffer ();
/* Prompt to display in front of the minibuffer contents. */
extern
char
*
minibuf_prompt
;
/* The visual width of the above. */
extern
int
minibuf_prompt_width
;
/* Message to display instead of minibuffer contents.
This is what the functions error and message make,
and command echoing uses it as well. It overrides the
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment