summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorVibhav Pant <vibhavp@gmail.com>2017-02-11 19:54:37 +0530
committerVibhav Pant <vibhavp@gmail.com>2017-02-11 19:54:37 +0530
commitc1a9b5db0e2985e7c46fb3b1e50e9d17785f7fa3 (patch)
treea33cb8c57d628541baee88bef5b0907327056e88 /lisp/emacs-lisp
parenta75d080b17a6b6c6296ff4e24d8129d77bb3bb6b (diff)
parentac83b2dfe4504babfbafc5efb37dbde4bed34fed (diff)
downloademacs-c1a9b5db0e2985e7c46fb3b1e50e9d17785f7fa3.tar.gz
emacs-c1a9b5db0e2985e7c46fb3b1e50e9d17785f7fa3.tar.bz2
emacs-c1a9b5db0e2985e7c46fb3b1e50e9d17785f7fa3.zip
Merge branch 'master' into feature/byte-switch
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/edebug.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ec0f08de356..a8838046a4d 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -880,11 +880,9 @@ Maybe clear the markers and delete the symbol's edebug property?"
(list
(edebug-storing-offsets (- (point) 2) 'function)
(edebug-read-storing-offsets stream)))
- ((memq (following-char) '(?: ?B ?O ?X ?b ?o ?x ?1 ?2 ?3 ?4 ?5 ?6
- ?7 ?8 ?9 ?0))
+ (t
(backward-char 1)
- (read stream))
- (t (edebug-syntax-error "Bad char after #"))))
+ (read stream))))
(defun edebug-read-list (stream)
(forward-char 1) ; skip \(