[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/edebug.el

[Lute Kamstra]

Index: emacs/lisp/emacs-lisp/edebug.el
diff -c emacs/lisp/emacs-lisp/edebug.el:3.72 
emacs/lisp/emacs-lisp/edebug.el:3.73
*** emacs/lisp/emacs-lisp/edebug.el:3.72        Sun Nov 28 07:56:25 2004
--- emacs/lisp/emacs-lisp/edebug.el     Sat Jun 11 08:39:39 2005
***************
*** 4014,4033 ****
  (defvar edebug-eval-mode-map nil
    "Keymap for Edebug Eval mode.  Superset of Lisp Interaction mode.")
  
! (if edebug-eval-mode-map
!     nil
!   (setq edebug-eval-mode-map (copy-keymap lisp-interaction-mode-map))
  
    (define-key edebug-eval-mode-map "\C-c\C-w" 'edebug-where)
    (define-key edebug-eval-mode-map "\C-c\C-d" 'edebug-delete-eval-item)
    (define-key edebug-eval-mode-map "\C-c\C-u" 'edebug-update-eval-list)
    (define-key edebug-eval-mode-map "\C-x\C-e" 'edebug-eval-last-sexp)
!   (define-key edebug-eval-mode-map "\C-j" 'edebug-eval-print-last-sexp)
!   )
  
  (put 'edebug-eval-mode 'mode-class 'special)
  
! (defun edebug-eval-mode ()
    "Mode for evaluation list buffer while in Edebug.
  
  In addition to all Interactive Emacs Lisp commands there are local and
--- 4014,4032 ----
  (defvar edebug-eval-mode-map nil
    "Keymap for Edebug Eval mode.  Superset of Lisp Interaction mode.")
  
! (unless edebug-eval-mode-map
!   (setq edebug-eval-mode-map (make-sparse-keymap))
!   (set-keymap-parent edebug-eval-mode-map lisp-interaction-mode-map)
  
    (define-key edebug-eval-mode-map "\C-c\C-w" 'edebug-where)
    (define-key edebug-eval-mode-map "\C-c\C-d" 'edebug-delete-eval-item)
    (define-key edebug-eval-mode-map "\C-c\C-u" 'edebug-update-eval-list)
    (define-key edebug-eval-mode-map "\C-x\C-e" 'edebug-eval-last-sexp)
!   (define-key edebug-eval-mode-map "\C-j" 'edebug-eval-print-last-sexp))
  
  (put 'edebug-eval-mode 'mode-class 'special)
  
! (define-derived-mode edebug-eval-mode lisp-interaction-mode "Edebug Eval"
    "Mode for evaluation list buffer while in Edebug.
  
  In addition to all Interactive Emacs Lisp commands there are local and
***************
*** 4039,4050 ****
  \\{edebug-eval-mode-map}
  
  Global commands prefixed by global-edebug-prefix:
! \\{global-edebug-map}
! "
!   (lisp-interaction-mode)
!   (setq major-mode 'edebug-eval-mode)
!   (setq mode-name "Edebug Eval")
!   (use-local-map edebug-eval-mode-map))
  
  ;;; Interface with standard debugger.
  
--- 4038,4044 ----
  \\{edebug-eval-mode-map}
  
  Global commands prefixed by global-edebug-prefix:
! \\{global-edebug-map}")
  
  ;;; Interface with standard debugger.