Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b32bb3f2
Commit
b32bb3f2
authored
Apr 04, 2015
by
Artur Malabarba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(package--with-work-buffer-async): Protect macro arguments.
parent
f674de6f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
17 deletions
+22
-17
lisp/ChangeLog
lisp/ChangeLog
+1
-0
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+21
-17
No files found.
lisp/ChangeLog
View file @
b32bb3f2
...
...
@@ -3,6 +3,7 @@
* emacs-lisp/package.el (package--download-and-read-archives): Add
`package-archives' to `package--downloads-in-progress' instead of
overwriting it.
(package--with-work-buffer-async): Protect macro arguments.
2015-04-04 Michael Albinus <michael.albinus@gmx.de>
...
...
lisp/emacs-lisp/package.el
View file @
b32bb3f2
...
...
@@ -1090,23 +1090,27 @@ function, call it with no arguments (instead of executing BODY),
otherwise propagate the error. For description of the other
arguments see `package--with-work-buffer'."
(
declare
(
indent
3
)
(
debug
t
))
`
(
if
(
or
(
not
,
async
)
(
not
(
string-match-p
"\\`https?:"
,
location
)))
(
package--with-work-buffer
,
location
,
file
,@
body
)
(
url-retrieve
(
concat
,
location
,
file
)
(
lambda
(
status
)
(
if
(
eq
(
car
status
)
:error
)
(
if
(
functionp
,
async
)
(
funcall
,
async
)
(
signal
(
cdar
status
)
(
cddr
status
)))
(
goto-char
(
point-min
))
(
unless
(
search-forward
"\n\n"
nil
'noerror
)
(
error
"Invalid url response"
))
(
delete-region
(
point-min
)
(
point
))
,@
body
)
(
kill-buffer
(
current-buffer
)))
nil
'silent
)))
(
macroexp-let2*
macroexp-copyable-p
((
async-1
async
)
(
file-1
file
)
(
location-1
location
))
`
(
if
(
or
(
not
,
async-1
)
(
not
(
string-match-p
"\\`https?:"
,
location-1
)))
(
package--with-work-buffer
,
location-1
,
file-1
,@
body
)
(
url-retrieve
(
concat
,
location-1
,
file-1
)
(
lambda
(
status
)
(
if
(
eq
(
car
status
)
:error
)
(
if
(
functionp
,
async-1
)
(
funcall
,
async-1
)
(
signal
(
cdar
status
)
(
cddr
status
)))
(
goto-char
(
point-min
))
(
unless
(
search-forward
"\n\n"
nil
'noerror
)
(
error
"Invalid url response"
))
(
delete-region
(
point-min
)
(
point
))
,@
body
)
(
kill-buffer
(
current-buffer
)))
nil
'silent
))))
(
defun
package--check-signature-content
(
content
string
&optional
sig-file
)
"Check signature CONTENT against STRING.
...
...
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