diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-06-12 13:47:14 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-06-12 13:47:14 +0800 |
| commit | f1a4e679f3b0696089b4fd73717307ba5d23e1cf (patch) | |
| tree | dc44016b20723e38247300b6c6eaec3cd4e98761 /lisp/emacs-lisp/edebug.el | |
| parent | bf67e61f291a82a9e90a7918f5188714853f0094 (diff) | |
| download | emacs-f1a4e679f3b0696089b4fd73717307ba5d23e1cf.tar.gz emacs-f1a4e679f3b0696089b4fd73717307ba5d23e1cf.tar.bz2 emacs-f1a4e679f3b0696089b4fd73717307ba5d23e1cf.zip | |
Various minor variable/hook cleanups.
* lisp/emacs-lisp/edebug.el (edebug-inhibit-emacs-lisp-mode-bindings):
Rename from gud-inhibit-global-bindings.
* lisp/emacs-lisp/eieio.el (eieio-pre-method-execution-hooks): Doc fix.
* lisp/erc/erc-dcc.el (erc-dcc-chat-filter-functions): Rename from
erc-dcc-chat-filter-hook, since this is an abnormal hook.
* lisp/nxml/nxml-glyph.el (nxml-glyph-set-functions): Rename abnormal
hook from nxml-glyph-set-hook.
* lisp/progmodes/cwarn.el (cwarn-mode): Remove redundant variable
declaration.
* lisp/progmodes/pascal.el (pascal-toggle-completions): Doc fix.
* lisp/textmodes/bibtex.el (bibtex-string-file-path, bibtex-file-path):
Convert to defcustom.
* lisp/url/url-handlers.el (url-handler-regexp):
* lisp/url/url-nfs.el (url-nfs-automounter-directory-spec):
* lisp/url/url-vars.el (url-load-hook): Convert to defcustom.
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 8c6738ca6a9..28b768a14b3 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -3055,7 +3055,6 @@ Otherwise, toggle for all windows." (edebug-toggle-save-selected-window) (edebug-toggle-save-all-windows))) - (defun edebug-where () "Show the debug windows and where we stopped in the program." (interactive) @@ -3735,12 +3734,16 @@ This prints the value into current buffer." ;;; Edebug Minor Mode -;; FIXME eh? -(defvar gud-inhibit-global-bindings - "Non-nil means don't do global rebindings of C-x C-a subcommands.") +(defvar edebug-inhibit-emacs-lisp-mode-bindings nil + "If non-nil, inhibit Edebug bindings on the C-x C-a key. +By default, loading the `edebug' library causes these bindings to +be installed in `emacs-lisp-mode-map'.") + +(define-obsolete-variable-alias 'gud-inhibit-global-bindings + 'edebug-inhibit-emacs-lisp-mode-bindings "24.2") ;; Global GUD bindings for all emacs-lisp-mode buffers. -(unless gud-inhibit-global-bindings +(unless edebug-inhibit-emacs-lisp-mode-bindings (define-key emacs-lisp-mode-map "\C-x\C-a\C-s" 'edebug-step-mode) (define-key emacs-lisp-mode-map "\C-x\C-a\C-n" 'edebug-next-mode) (define-key emacs-lisp-mode-map "\C-x\C-a\C-c" 'edebug-go-mode) |