Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Slime
Commits
49a4e85d
Commit
49a4e85d
authored
10 years ago
by
Luís Oliveira
Browse files
Options
Download
Email Patches
Plain Diff
Fix compilation errors in the slime-c-p-c contrib
parent
ab5991d4
master
origin/master
update-travis
v2.27
v2.26.1
v2.26
v2.25
v2.24
v2.23
v2.22
v2.21
v2.20
v2.19
v2.18
v2.17
v2.16
v2.15
v2.14
v2.13
v2.12
v2.11
v2.10.1
v2.10
v2.9
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/ChangeLog
+5
-0
contrib/ChangeLog
contrib/slime-c-p-c.el
+9
-9
contrib/slime-c-p-c.el
with
14 additions
and
9 deletions
+14
-9
contrib/ChangeLog
+
5
-
0
View file @
49a4e85d
2014
-
08
-
04
Lu
í
s
Oliveira
<
loliveira
@
common
-
lisp
.
net
>
*
slime
-
c
-
p
-
c
.
el
:
fix
compilation
errors
due
to
missing
cl
-
prefixes
for
some
functions
/
macros
.
2014
-
07
-
29
Helmut
Eller
<
heller
@
common
-
lisp
.
net
>
Avoid
some
compiler
warnings
.
...
...
This diff is collapsed.
Click to expand it.
contrib/slime-c-p-c.el
+
9
-
9
View file @
49a4e85d
...
...
@@ -55,8 +55,8 @@ If false, move point to the end of the inserted text."
(
beg
(
move-marker
(
make-marker
)
(
slime-symbol-start-pos
)))
(
prefix
(
buffer-substring-no-properties
beg
end
))
(
completion-result
(
slime-contextual-completions
beg
end
))
(
completion-set
(
first
completion-result
))
(
completed-prefix
(
second
completion-result
)))
(
completion-set
(
cl-
first
completion-result
))
(
completed-prefix
(
cl-
second
completion-result
)))
(
if
(
null
completion-set
)
(
progn
(
slime-minibuffer-respecting-message
"Can't find completion for \"%s\""
prefix
)
...
...
@@ -82,9 +82,9 @@ If false, move point to the end of the inserted text."
"Complete but not unique"
))
(
when
slime-c-p-c-unambiguous-prefix-p
(
let
((
unambiguous-completion-length
(
loop
for
c
in
completion-set
minimizing
(
or
(
cl-mismatch
completed-prefix
c
)
(
length
completed-prefix
)))))
(
cl-
loop
for
c
in
completion-set
minimizing
(
or
(
cl-mismatch
completed-prefix
c
)
(
length
completed-prefix
)))))
(
goto-char
(
+
beg
unambiguous-completion-length
))))
(
slime-display-or-scroll-completions
completion-set
completed-prefix
))))))
...
...
@@ -110,7 +110,7 @@ If false, move point to the end of the inserted text."
(
not
(
minibuffer-window-active-p
(
minibuffer-window
))))
(
slime-echo-arglist
))))))))
(
defun
*
slime-contextual-completions
(
beg
end
)
(
cl-
defun
slime-contextual-completions
(
beg
end
)
"Return a list of completions of the token from BEG to END in the
current buffer."
(
let
((
token
(
buffer-substring-no-properties
beg
end
)))
...
...
@@ -123,15 +123,15 @@ current buffer."
(
save-excursion
(
goto-char
beg
)
(
slime-parse-form-upto-point
)))))
(
when
(
first
completions
)
(
return-from
slime-contextual-completions
completions
))
(
when
(
cl-
first
completions
)
(
cl-
return-from
slime-contextual-completions
completions
))
;; If no matching keyword was found, do regular symbol
;; completion.
))
((
and
(
>=
(
length
token
)
2
)
(
string=
(
cl-subseq
token
0
2
)
"#\\"
))
;; Character name completion
(
return-from
slime-contextual-completions
(
cl-
return-from
slime-contextual-completions
(
slime-completions-for-character
token
))))
;; Regular symbol completion
(
slime-completions
token
)))
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help