Skip to content

Commit

Permalink
el-get-merge-properties-into-status: no defun*
Browse files Browse the repository at this point in the history
Use defun instead of defun* to interpret keyword args. This let's us be
a bit more forgiving about accepting badly formatted keyword arg
lists (e.g. calls using the signature from before package-status-alist
was removed).
  • Loading branch information
npostavs committed Feb 18, 2015
1 parent 84bbac1 commit efaa866
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions el-get-status.el
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ properties, respectively."
(error "Package %s is nowhere to be found in el-get status file."
package))))

(defun* el-get-merge-properties-into-status (package-or-source
&key noerror)
(defun el-get-merge-properties-into-status (package-or-source
&rest keys)
"Merge updatable properties for package into package status alist (or status file).
The first argument is either a package source or a package name,
Expand All @@ -318,11 +318,14 @@ file.
If any non-whitelisted properties differ from the cached values,
then an error is raise. With optional keyword argument `:noerror
t', this error is suppressed (but nothing is updated)."
t', this error is suppressed (but nothing is updated).
\(fn PACKAGE-OR-SOURCE &key NOERROR)"
(interactive
(list (el-get-read-package-with-status "Update cached recipe" "installed")
:noerror current-prefix-arg))
(let* ((source (el-get-package-or-source package-or-source))
(let* ((noerror (cadr (memq :noerror keys)))
(source (el-get-package-or-source package-or-source))
(package (el-get-as-symbol (el-get-source-name source)))
(cached-recipe
(el-get-read-cached-recipe package source)))
Expand Down

0 comments on commit efaa866

Please sign in to comment.