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
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
62137a95
Commit
62137a95
authored
Mar 14, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* minibuf.c (Ftry_completion, Fall_completions): Rename or remove locals
to avoid shadowing.
parent
5716756e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
22 deletions
+22
-22
src/ChangeLog
src/ChangeLog
+2
-0
src/minibuf.c
src/minibuf.c
+20
-22
No files found.
src/ChangeLog
View file @
62137a95
2011-03-15 Paul Eggert <eggert@cs.ucla.edu>
* minibuf.c (choose_minibuf_frame_1): Now static.
(Ftry_completion, Fall_completions): Rename or remove locals
to avoid shadowing.
* marker.c (bytepos_to_charpos): Remove; unused.
src/minibuf.c
View file @
62137a95
...
...
@@ -1212,7 +1212,7 @@ is used to further constrain the set of candidates. */)
&&
(
!
SYMBOLP
(
XCAR
(
collection
))
||
NILP
(
XCAR
(
collection
)))))
?
list_table
:
function_table
));
int
i
nde
x
=
0
,
obsize
=
0
;
int
i
d
x
=
0
,
obsize
=
0
;
int
matchcount
=
0
;
int
bindcount
=
-
1
;
Lisp_Object
bucket
,
zero
,
end
,
tem
;
...
...
@@ -1231,7 +1231,7 @@ is used to further constrain the set of candidates. */)
{
collection
=
check_obarray
(
collection
);
obsize
=
XVECTOR
(
collection
)
->
size
;
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
nde
x
];
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
d
x
];
}
while
(
1
)
...
...
@@ -1262,23 +1262,23 @@ is used to further constrain the set of candidates. */)
else
XSETFASTINT
(
bucket
,
0
);
}
else
if
(
++
i
nde
x
>=
obsize
)
else
if
(
++
i
d
x
>=
obsize
)
break
;
else
{
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
nde
x
];
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
d
x
];
continue
;
}
}
else
/* if (type == hash_table) */
{
while
(
i
nde
x
<
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
))
&&
NILP
(
HASH_HASH
(
XHASH_TABLE
(
collection
),
i
nde
x
)))
i
nde
x
++
;
if
(
i
nde
x
>=
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
)))
while
(
i
d
x
<
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
))
&&
NILP
(
HASH_HASH
(
XHASH_TABLE
(
collection
),
i
d
x
)))
i
d
x
++
;
if
(
i
d
x
>=
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
)))
break
;
else
elt
=
eltstring
=
HASH_KEY
(
XHASH_TABLE
(
collection
),
i
nde
x
++
);
elt
=
eltstring
=
HASH_KEY
(
XHASH_TABLE
(
collection
),
i
d
x
++
);
}
/* Is this element a possible completion? */
...
...
@@ -1333,7 +1333,7 @@ is used to further constrain the set of candidates. */)
tem
=
(
type
==
hash_table
?
call2
(
predicate
,
elt
,
HASH_VALUE
(
XHASH_TABLE
(
collection
),
i
nde
x
-
1
))
i
d
x
-
1
))
:
call1
(
predicate
,
elt
));
UNGCPRO
;
}
...
...
@@ -1477,7 +1477,7 @@ with a space are ignored unless STRING itself starts with a space. */)
:
NILP
(
collection
)
||
(
CONSP
(
collection
)
&&
(
!
SYMBOLP
(
XCAR
(
collection
))
||
NILP
(
XCAR
(
collection
))));
int
i
nde
x
=
0
,
obsize
=
0
;
int
i
d
x
=
0
,
obsize
=
0
;
int
bindcount
=
-
1
;
Lisp_Object
bucket
,
tem
,
zero
;
struct
gcpro
gcpro1
,
gcpro2
,
gcpro3
,
gcpro4
;
...
...
@@ -1494,7 +1494,7 @@ with a space are ignored unless STRING itself starts with a space. */)
{
collection
=
check_obarray
(
collection
);
obsize
=
XVECTOR
(
collection
)
->
size
;
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
nde
x
];
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
d
x
];
}
while
(
1
)
...
...
@@ -1525,23 +1525,23 @@ with a space are ignored unless STRING itself starts with a space. */)
else
XSETFASTINT
(
bucket
,
0
);
}
else
if
(
++
i
nde
x
>=
obsize
)
else
if
(
++
i
d
x
>=
obsize
)
break
;
else
{
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
nde
x
];
bucket
=
XVECTOR
(
collection
)
->
contents
[
i
d
x
];
continue
;
}
}
else
/* if (type == 3) */
{
while
(
i
nde
x
<
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
))
&&
NILP
(
HASH_HASH
(
XHASH_TABLE
(
collection
),
i
nde
x
)))
i
nde
x
++
;
if
(
i
nde
x
>=
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
)))
while
(
i
d
x
<
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
))
&&
NILP
(
HASH_HASH
(
XHASH_TABLE
(
collection
),
i
d
x
)))
i
d
x
++
;
if
(
i
d
x
>=
HASH_TABLE_SIZE
(
XHASH_TABLE
(
collection
)))
break
;
else
elt
=
eltstring
=
HASH_KEY
(
XHASH_TABLE
(
collection
),
i
nde
x
++
);
elt
=
eltstring
=
HASH_KEY
(
XHASH_TABLE
(
collection
),
i
d
x
++
);
}
/* Is this element a possible completion? */
...
...
@@ -1566,8 +1566,6 @@ with a space are ignored unless STRING itself starts with a space. */)
{
/* Yes. */
Lisp_Object
regexps
;
Lisp_Object
zero
;
XSETFASTINT
(
zero
,
0
);
/* Ignore this element if it fails to match all the regexps. */
{
...
...
@@ -1603,7 +1601,7 @@ with a space are ignored unless STRING itself starts with a space. */)
GCPRO4
(
tail
,
eltstring
,
allmatches
,
string
);
tem
=
type
==
3
?
call2
(
predicate
,
elt
,
HASH_VALUE
(
XHASH_TABLE
(
collection
),
i
nde
x
-
1
))
HASH_VALUE
(
XHASH_TABLE
(
collection
),
i
d
x
-
1
))
:
call1
(
predicate
,
elt
);
UNGCPRO
;
}
...
...
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