diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-22 10:43:21 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-22 10:45:14 -0700 |
commit | 2f600e97e7ca43965f55f019759582d93d8bca73 (patch) | |
tree | d885dcef77f04a60da6cec56a2750b19a8e64192 /src/insdel.c | |
parent | dddff96a585531608d5e8d27375a6363679a9fb5 (diff) | |
download | emacs-2f600e97e7ca43965f55f019759582d93d8bca73.tar.gz |
Avoid crashes when casifying noncontiguous regions
This is a followon fix for Bug#37477.
* lisp/simple.el (region-extract-function):
Use setq here, since the var is now defined in C code.
* src/casefiddle.c (casify_pnc_region): New function.
(Fupcase_region, Fdowncase_region, Fcapitalize_region)
(Fupcase_initials_region): Use it.
(Fupcase_initials_region): Add region-noncontiguous-p flag
for consistency with the others. All uses changed.
(syms_of_casefiddle): Define Qbounds, Vregion_extract_function.
* src/insdel.c (prepare_to_modify_buffer_1):
* src/keyboard.c (command_loop_1):
Use Vregion_extraction_function.
* src/insdel.c (syms_of_insdel): No need to define
Qregion_extract_function.
* test/src/casefiddle-tests.el (casefiddle-oldfunc): New var.
(casefiddle-loopfunc, casefiddle-badfunc): New functions.
(casefiddle-invalid-region-extract-function): New test.
Diffstat (limited to 'src/insdel.c')
-rw-r--r-- | src/insdel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/insdel.c b/src/insdel.c index 093b841d6d6..ebfd022ac6b 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -2002,7 +2002,7 @@ prepare_to_modify_buffer_1 (ptrdiff_t start, ptrdiff_t end, : (!NILP (Vselect_active_regions) && !NILP (Vtransient_mark_mode)))) Vsaved_region_selection - = call1 (Fsymbol_value (Qregion_extract_function), Qnil); + = call1 (Vregion_extract_function, Qnil); signal_before_change (start, end, preserve_ptr); Fset (Qdeactivate_mark, Qt); @@ -2401,7 +2401,5 @@ handling of the active region per `select-active-regions'. */); inhibit_modification_hooks = 0; DEFSYM (Qinhibit_modification_hooks, "inhibit-modification-hooks"); - DEFSYM (Qregion_extract_function, "region-extract-function"); - defsubr (&Scombine_after_change_execute); } |