Commit ca239fcf authored by Rüdiger Sonderfeld's avatar Rüdiger Sonderfeld

Only accept strings for :builtin.

Signed-off-by: 's avatarRüdiger Sonderfeld <ruediger@c-plusplus.de>
parent 7470b508
......@@ -87,9 +87,9 @@ definition provided by `el-get' recipes locally.
:builtin
Emacs major version (see `emacs-major-version' variable) from
which Emacs includes the recipe as a builtin. For example,
`package.el' (the implementation of ELPA) is part fo Emacs24
A string containing the Emacs version (see `emacs-version' variable)
from which Emacs includes the recipe as a builtin. For example,
`package.el' (the implementation of ELPA) is part of Emacs 24
but needs an external recipe for previous major versions.
:pkgname
......
......@@ -177,8 +177,7 @@ return 'builtin."
package-or-source))
(builtin (plist-get def :builtin)))
(if (or (and (integerp builtin) (<= builtin emacs-major-version))
(and (stringp builtin) (version<= builtin emacs-version)))
(if (and builtin (version<= builtin emacs-version))
'builtin
(plist-get def :type))))
......
......@@ -720,10 +720,10 @@ provided by `el-get' recipes locally.
before the package is installed.
`:builtin'
Emacs major version (see EMACS-MAJOR-VERSION) from which Emacs
includes the recipe as a builtin. For example, `package.el' (the
implementation of ELPA) is part fo Emacs24 but needs an external
recipe for previous major versions.
A string containing the Emacs version (see EMACS-MAJOR-VERSION
variable) from which Emacs includes the recipe as a builtin. For
example, `package.el' (the implementation of ELPA) is part of
Emacs 24 but needs an external recipe for previous major versions.
`:pkgname'
The name of the package for the underlying package management
......@@ -1045,10 +1045,10 @@ Node: Getting more recipes22690
Node: Overriding package files23388
Node: Authoring Recipes23771
Node: Recipe format24386
Node: Dependencies34045
Node: Byte Compilation34391
Node: Autoloads34957
Node: Build36083
Node: Recipe checker37055
Node: Dependencies34073
Node: Byte Compilation34419
Node: Autoloads34985
Node: Build36111
Node: Recipe checker37083

End Tag Table
......@@ -713,10 +713,10 @@ package depends. All of a packages dependencies will be installed
before the package is installed.
@item :builtin
Emacs major version (see @var{emacs-major-version}) from which Emacs
includes the recipe as a builtin. For example, @file{package.el} (the
implementation of ELPA) is part fo Emacs24 but needs an external
recipe for previous major versions.
A string containing the Emacs version (see @var{emacs-major-version}
variable) from which Emacs includes the recipe as a builtin. For
example, @file{package.el} (the implementation of ELPA) is part of
Emacs 24 but needs an external recipe for previous major versions.
@item :pkgname
The name of the package for the underlying package management system
......
;; Same as "package" except that it takes the version from Emacs 24
(:name package
:description "ELPA implementation (\"package.el\") from Emacs 24"
:builtin 24
:builtin "24"
:type http
:url "http://repo.or.cz/w/emacs.git/blob_plain/1a0a666f941c99882093d7bd08ced15033bc3f0c:/lisp/emacs-lisp/package.el"
:shallow nil
......
(:name ruby-mode
:builtin 24
:builtin "24"
:type http
:description "Major mode for editing Ruby files."
:url "http://bugs.ruby-lang.org/projects/ruby-trunk/repository/raw/misc/ruby-mode.el")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment