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
14b511d4
Commit
14b511d4
authored
Sep 03, 2013
by
Stefan Monnier
Browse files
* lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing
<pkg>-autoloads.el file stop us.
parent
9d3f707c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
lisp/ChangeLog
lisp/ChangeLog
+4
-1
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+2
-1
No files found.
lisp/ChangeLog
View file @
14b511d4
2013-09-03 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/package.el (package-activate-1): Don't let a missing
<pkg>-autoloads.el file stop us.
* net/tramp.el (with-parsed-tramp-file-name): Silence compiler
warnings, and factor ou
r
common code.
warnings, and factor ou
t
common code.
2013-09-03 Dmitry Gutov <dgutov@yandex.ru>
...
...
lisp/emacs-lisp/package.el
View file @
14b511d4
...
...
@@ -464,7 +464,8 @@ Return the max version (as a string) if the package is held at a lower version."
(
package-desc-full-name
pkg-desc
)))
;; Add to load path, add autoloads, and activate the package.
(
let
((
old-lp
load-path
))
(
load
(
expand-file-name
(
format
"%s-autoloads"
name
)
pkg-dir
)
nil
t
)
(
with-demoted-errors
(
load
(
expand-file-name
(
format
"%s-autoloads"
name
)
pkg-dir
)
nil
t
))
(
when
(
and
(
eq
old-lp
load-path
)
(
not
(
or
(
member
pkg-dir
load-path
)
(
member
pkg-dir-dir
load-path
))))
...
...
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