(edebug-read-function): Fix handling of

#:, #x, #o, and similar constructs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8d66ce469a9045ab437ff94fe4231714768c5a6..dd16b459da7222ba2a25d6b007760e6decfa32ca 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-08  Gerd Moellmann  <gerd@gnu.org>
+
+       * emacs-lisp/edebug.el (edebug-read-function): Fix handling of
+       #:, #x, #o, and similar constructs.
+
 2001-08-07  Gerd Moellmann  <gerd@gnu.org>
 
        * vc.el (vc-transfer-file): Fix malformed autoload cookie.

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 60bfa9952d637dee321d416e3b9c57f00b7244b5..70f76e96f32a5fe68ed00821b8a46f77a258cecb 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1,6 +1,6 @@
 ;;; edebug.el --- a source-level debugger for Emacs Lisp
 
-;; Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 97, 1999, 2000
+;; Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 97, 1999, 2000, 2001
 ;;       Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
@@ -909,10 +909,9 @@ This controls how we read comma constructs.")
          (edebug-storing-offsets (point)  
            (if (featurep 'cl) 'function* 'function))
          (edebug-read-storing-offsets stream)))
-       ((memq (char-after)
-              ;; Other # read forms than these probably shouldn't be
-              ;; in source.
-              '(?: ?B ?O ?X ?b ?o ?x))
+       ((memq (following-char) '(?: ?B ?O ?X ?b ?o ?x ?1 ?2 ?3 ?4 ?5 ?6
+                                   ?7 ?8 ?9 ?0))
+        (backward-char 1)
         (edebug-original-read stream))
        (t (edebug-syntax-error "Bad char after #"))))