[elpa] externals/names 7a6692a 04/44: Merge branch 'elpa' into dev

[Stefan Monnier]

branch: externals/names
commit 7a6692a6b7f85e6af1bf3c97b0c5877e6c39a56d
Merge: 48ed6aa ed44aa9
Author: Artur Malabarba <bruce.connor.am@gmail.com>
Commit: Artur Malabarba <bruce.connor.am@gmail.com>

    Merge branch 'elpa' into dev
---
 names-dev.el |  1 +
 names.el     | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/names-dev.el b/names-dev.el
index 5684394..5457f72 100644
--- a/names-dev.el
+++ b/names-dev.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2014 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
+;; Maintainer: Artur Malabarba <bruce.connor.am@gmail.com>
 ;; URL: http://github.com/Bruce-Connor/names
 ;; Prefix: names
 ;; Separator: -
diff --git a/names.el b/names.el
index ef10254..b019231 100644
--- a/names.el
+++ b/names.el
@@ -3,8 +3,9 @@
 ;; Copyright (C) 2014 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
+;; Maintainer: Artur Malabarba <bruce.connor.am@gmail.com>
 ;; URL: http://github.com/Bruce-Connor/names
-;; Version: 0
+;; Version: 20141119
 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
 ;; Keywords: extensions lisp
 ;; Prefix: names
@@ -34,11 +35,20 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; Change Log:
+;;; News:
 ;;; Code:
 
 
 (require 'cl-lib)
+;;; This is a patch because edebug binds under `C-x'.
+;; If `C-x' is not a prefix.
+(unless (consp (key-binding "\C-x"))
+  ;; Disable the `C-xC-a' binds.
+  (setq edebug-inhibit-emacs-lisp-mode-bindings t)
+  ;; And the `C-xX' binds.
+  (when (or (null (boundp 'global-edebug-prefix))
+            (eq 24 (elt global-edebug-prefix 0)))
+    (setq global-edebug-prefix "")))
 (require 'edebug)
 (require 'bytecomp)
 (require 'advice)
@@ -110,7 +120,7 @@ it will set PROP."
 
 ;;; ---------------------------------------------------------------
 ;;; Variables
-(defconst names-version "0.5.5" "Version of the names.el package.")
+(defconst names-version "20141119" "Version of the names.el package.")
 
 (defvar names--name nil
   "Name of the current namespace inside the `define-namespace' macro.")