summaryrefslogtreecommitdiff
path: root/src/composite.h
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-09-11 20:14:50 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-09-11 20:14:50 -0400
commit45b82ad0ebedaa1b7094912e218bea1510c33feb (patch)
tree278e50931ea92f8f3201fcb855d454f2202b2f66 /src/composite.h
parent50f2e553ce21a2901e9f935650018289c11fcc39 (diff)
downloademacs-45b82ad0ebedaa1b7094912e218bea1510c33feb.tar.gz
* 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.h2
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;
&& (end - start) == COMPOSITION_LENGTH (prop))
/* Return the Nth glyph of composition specified by CMP. CMP is a
- pointer to `struct composition'. */
+ pointer to `struct composition'. */
#define COMPOSITION_GLYPH(cmp, n) \
XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \
->key_and_value) \