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
25f292cd
Commit
25f292cd
authored
May 06, 2012
by
Chong Yidong
Browse files
* emacs-lisp/package.el (package-built-in-p): Handle `emacs' package.
Fixes: debbugs:11410
parent
13a62996
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+5
-2
No files found.
lisp/ChangeLog
View file @
25f292cd
2012-05-06 Chong Yidong <cyd@gnu.org>
* emacs-lisp/package.el (package-built-in-p): Handle the `emacs'
package (Bug#11410).
2012-05-05 Chong Yidong <cyd@gnu.org>
* emacs-lisp/package.el (package-buffer-info): Avoid putting local
...
...
lisp/emacs-lisp/package.el
View file @
25f292cd
...
...
@@ -469,8 +469,11 @@ NAME and VERSION are both strings."
Optional arg MIN-VERSION, if non-nil, should be a version list
specifying the minimum acceptable version."
(
require
'finder-inf
nil
t
)
; For `package--builtins'.
(
let
((
elt
(
assq
package
package--builtins
)))
(
and
elt
(
version-list-<=
min-version
(
package-desc-vers
(
cdr
elt
))))))
(
if
(
eq
package
'emacs
)
(
version-list-<=
min-version
(
version-to-list
emacs-version
))
(
let
((
elt
(
assq
package
package--builtins
)))
(
and
elt
(
version-list-<=
min-version
(
package-desc-vers
(
cdr
elt
)))))))
;; This function goes ahead and activates a newer version of a package
;; if an older one was already activated. This is not ideal; we'd at
...
...
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