[elpa] externals/names abe24c3 23/44: Merge branch 'elpa' into dev

[Stefan Monnier]

branch: externals/names
commit abe24c3a1730940d84a9bf2f28fb82fce5b7e291
Merge: 3ed0901 e59dc58
Author: Artur Malabarba <bruce.connor.am@gmail.com>
Commit: Artur Malabarba <bruce.connor.am@gmail.com>

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

diff --git a/names.el b/names.el
index b5f403e..33f41a2 100644
--- a/names.el
+++ b/names.el
@@ -48,8 +48,9 @@
   (setq edebug-inhibit-emacs-lisp-mode-bindings t)
   ;; And the `C-xX' binds.
   (defvar global-edebug-prefix)
-  (when (or (null (boundp 'global-edebug-prefix))
-            (eq ?\C-x (elt global-edebug-prefix 0)))
+  (when (ignore-errors
+          (or (null (boundp 'global-edebug-prefix))
+              (eq ?\C-x (elt global-edebug-prefix 0))))
     (setq global-edebug-prefix "")))
 (require 'edebug)
 (require 'bytecomp)