Merge commit 'ed44aa9bcebcc055551a2d018db9080ee0e9866f'

[gnu-emacs-elpa] / packages / names / names.el

diff --git a/packages/names/names.el b/packages/names/names.el
index 1acc3a1d2540addf4d6a9d477997dfad726396d5..b019231e32e57f9bcc3468277ea0981096933384 100644 (file)
--- a/packages/names/names.el
+++ b/packages/names/names.el
@@ -5,7 +5,7 @@
 ;; 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
@@ -40,6 +40,15 @@
 \f
 
 (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)
@@ -111,7 +120,7 @@ it will set PROP."
 \f
 ;;; ---------------------------------------------------------------
 ;;; 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.")