diff options
| author | Stefan Monnier | 2012-09-11 20:14:50 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-09-11 20:14:50 -0400 |
| commit | 45b82ad0ebedaa1b7094912e218bea1510c33feb (patch) | |
| tree | 278e50931ea92f8f3201fcb855d454f2202b2f66 /src/composite.h | |
| parent | 50f2e553ce21a2901e9f935650018289c11fcc39 (diff) | |
| download | emacs-45b82ad0ebedaa1b7094912e218bea1510c33feb.tar.gz emacs-45b82ad0ebedaa1b7094912e218bea1510c33feb.zip | |
* src/eval.c: Add `inhibit-debugger'.
(Qinhibit_debugger): New symbol.
(call_debugger): Bind it instead of Qdebug_on_error.
(maybe_call_debugger): Test Vinhibit_debugger.
(syms_of_eval): Define inhibit-debugger.
* src/xdisp.c (set_message): Don't bind Qinhibit_debug_on_message.
(syms_of_xdisp): Remove inhibit-debug-on-message.
* lisp/emacs-lisp/debug.el (debug): Don't bind debug-on-error since
inhibit-debugger is bound instead.
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.h b/src/composite.h index 68f5b27ee42..9462b932c66 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -113,7 +113,7 @@ extern Lisp_Object composition_temp; | |||
| 113 | && (end - start) == COMPOSITION_LENGTH (prop)) | 113 | && (end - start) == COMPOSITION_LENGTH (prop)) |
| 114 | 114 | ||
| 115 | /* Return the Nth glyph of composition specified by CMP. CMP is a | 115 | /* Return the Nth glyph of composition specified by CMP. CMP is a |
| 116 | pointer to `struct composition'. */ | 116 | pointer to `struct composition'. */ |
| 117 | #define COMPOSITION_GLYPH(cmp, n) \ | 117 | #define COMPOSITION_GLYPH(cmp, n) \ |
| 118 | XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \ | 118 | XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \ |
| 119 | ->key_and_value) \ | 119 | ->key_and_value) \ |