aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-11-27 10:17:40 -0800
committerPaul Eggert2011-11-27 10:17:40 -0800
commite9a452d9cd08b5e09fa7ee51d1f57bbc4a9509c0 (patch)
treef5010e7da454fad010da146863fdf54ff7bfa153 /src
parentc3f1c606c9818ca0b5eaa7929ef3b7a60dbf6088 (diff)
downloademacs-e9a452d9cd08b5e09fa7ee51d1f57bbc4a9509c0.tar.gz
emacs-e9a452d9cd08b5e09fa7ee51d1f57bbc4a9509c0.zip
Spelling fixes (mostly "inactive" vs "deactivate").
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.102
-rw-r--r--src/search.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 42af99ccc58..7d2f48a03ea 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -12087,7 +12087,7 @@
12087 (merge_face_heights): Eliminate GCPRO arg. All callers changed. 12087 (merge_face_heights): Eliminate GCPRO arg. All callers changed.
12088 12088
12089 * keyboard.c (command_loop_1): Change Vtransient_mark_mode 12089 * keyboard.c (command_loop_1): Change Vtransient_mark_mode
12090 before deciding whether to inactivate mark. 12090 before deciding whether to deactivate mark.
12091 12091
120922004-11-06 Lars Brinkhoff <lars@nocrew.org> 120922004-11-06 Lars Brinkhoff <lars@nocrew.org>
12093 12093
diff --git a/src/search.c b/src/search.c
index a6a0fddb137..fe4ce534b0b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3132,7 +3132,7 @@ record_unwind_save_match_data (void)
3132 Fmatch_data (Qnil, Qnil, Qnil)); 3132 Fmatch_data (Qnil, Qnil, Qnil));
3133} 3133}
3134 3134
3135/* Quote a string to inactivate reg-expr chars */ 3135/* Quote a string to deactivate reg-expr chars */
3136 3136
3137DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0, 3137DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0,
3138 doc: /* Return a regexp string which matches exactly STRING and nothing else. */) 3138 doc: /* Return a regexp string which matches exactly STRING and nothing else. */)