[elpa] master fa30e18 2/2: Merge commit '68cc63682a66513c0968352f15e9b37fd245e636'

[Artur Malabarba]

branch: master
commit fa30e182cb9621e109df0525f9abafc7f6bc6028
Merge: 3a2d33c 68cc636
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge commit '68cc63682a66513c0968352f15e9b37fd245e636'
---
 packages/names/names.el |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/names/names.el b/packages/names/names.el
index 54b97ee..6f5a58c 100644
--- a/packages/names/names.el
+++ b/packages/names/names.el
@@ -5,7 +5,7 @@
 ;; Author: Artur Malabarba <address@hidden>
 ;; Maintainer: Artur Malabarba <address@hidden>
 ;; URL: http://github.com/Bruce-Connor/names
-;; Version: 20150114
+;; Version: 20150115
 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
 ;; Keywords: extensions lisp
 ;; Prefix: names
@@ -120,7 +120,7 @@ it will set PROP."
 
 ;;; ---------------------------------------------------------------
 ;;; Variables
-(defconst names-version "20141119" "Version of the names.el package.")
+(defconst names-version "20150115" "Version of the names.el package.")
 
 (defvar names--name nil
   "Name of the current namespace inside the `define-namespace' macro.")
@@ -183,12 +183,12 @@ Is only non-nil if the :group keyword is passed to 
`define-namespace'.")
 Used to define a constant and a command.")
 
 (defconst names--keyword-list
-  '((:group
-     1 (lambda (x)
-         (if (or (symbolp x) (listp x))
-             (setq names--group-parent x)
-           (names--warn
-            "Argument given to :group is not a symbol: %s" x)))
+  `((:group
+     1 ,(lambda (x)
+          (if (or (symbolp x) (listp x))
+              (setq names--group-parent x)
+            (names--warn
+             "Argument given to :group is not a symbol: %s" x)))
      "Indicate `define-namespace' should make a `defgroup' for you.
 The name of the group is the package name (see :package keyword).
 This keyword should be given one argument, the name of the PARENT
@@ -204,11 +204,11 @@ similar forms) that don't already contain one.")
 
     (:version
      1
-     (lambda (x)
-       (if (stringp x)
-           (setq names--version x)
-         (names--warn
-          "Argument given to :version is not a string: %s" x)))
+     ,(lambda (x)
+        (if (stringp x)
+            (setq names--version x)
+          (names--warn
+           "Argument given to :version is not a string: %s" x)))
      "Indicate `define-namespace' should define the version number.
 This keyword should be given one argument, a string describing
 the package's version number.
@@ -219,11 +219,11 @@ and returns the version number. See the :package 
keyword.")
 
     (:package
      1
-     (lambda (x)
-       (if (symbolp x)
-           (setq names--package x)
-         (names--warn
-          "Argument given to :package is not a symbol: %s" x)))
+     ,(lambda (x)
+        (if (symbolp x)
+            (setq names--package x)
+          (names--warn
+           "Argument given to :package is not a symbol: %s" x)))
      "Set the name of this package to the given symbol.
 This keyword should be given one argument, a symbol corresponding
 to the name of this package.
@@ -234,10 +234,10 @@ needed by the :version and :group keywords.")
 
     (:protection
      1
-     (lambda (x)
-       (let ((val (symbol-name x)))
-         (setq names--protection
-               (format "\\`%s" (regexp-quote val)))))
+     ,(lambda (x)
+        (let ((val (symbol-name x)))
+          (setq names--protection
+                (format "\\`%s" (regexp-quote val)))))
      "Change the value of the `names--protection' variable.")
 
     (:no-let-vars