* edebug.el (edebug-display): Call the `mark' function with the

	FORCE argument non-nil, so that we don't get an error if the mark
	isn't set yet.

	* edebug.el (global-edebug-prefix, global-edebug-map): Add
	autoload cookies for these, so they are present when Emacs starts
	up.

	* edebug.el (global-edebug-map): Bind `C-x X d' to edebug-defun in
	this map; we can't bind it to `C-x x', as the installation
	instructions suggest, because that conflicts with
	copy-to-register.

1 files changed, 6 insertions, 3 deletions

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 61961f68251..678090f2ef2 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1297,7 +1297,7 @@ This is to avoid spurious recentering.")
         (edebug-outside-window (selected-window))
         (edebug-outside-buffer (current-buffer))
         (edebug-outside-point (point))
-        (edebug-outside-mark (mark))
+        (edebug-outside-mark (mark t))
         edebug-outside-windows          ; window or screen configuration
         edebug-outside-edebug-point     ; old point in edebug buffer
         edebug-outside-edebug-mark
@@ -1340,7 +1340,7 @@ This is to avoid spurious recentering.")
       (if edebug-save-point
           (progn
             (setq edebug-outside-edebug-point (point))
-            (setq edebug-outside-edebug-mark (mark))))
+            (setq edebug-outside-edebug-mark (mark t))))
 
       (edebug-save-restriction
        (setq edebug-outside-point-min (point-min))
@@ -2209,13 +2209,15 @@ print value into current buffer."
     (define-key edebug-mode-map "-" 'negative-argument)
     ))
 
-
+;;;###autoload
 (defvar global-edebug-prefix "\^XX"
   "Prefix key for global edebug commands, available from any buffer.")
 
+;;;###autoload
 (defvar global-edebug-map nil
   "Global map of edebug commands, available from any buffer.")
 
+;;;###autoload
 (if global-edebug-map
     nil
   (setq global-edebug-map (make-sparse-keymap))
@@ -2224,6 +2226,7 @@ print value into current buffer."
   (global-set-key global-edebug-prefix global-edebug-map)
 
 ;;  (define-key global-edebug-map "X" 'edebug-step-through)
+  (define-key global-edebug-map "d" 'edebug-defun)
   (define-key global-edebug-map " " 'edebug-step-through)
   (define-key global-edebug-map "g" 'edebug-go)
   (define-key global-edebug-map "G" 'edebug-Go-nonstop)