aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/editfns.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 9d9593b182f..c3d3eedccc0 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1127,7 +1127,7 @@ the data it can't find.")
1127 return Fcons (make_number (offset), Fcons (build_string (s), Qnil)); 1127 return Fcons (make_number (offset), Fcons (build_string (s), Qnil));
1128 } 1128 }
1129 else 1129 else
1130 return Fmake_list (2, Qnil); 1130 return Fmake_list (make_number (2), Qnil);
1131} 1131}
1132 1132
1133/* This holds the value of `environ' produced by the previous 1133/* This holds the value of `environ' produced by the previous
@@ -2500,7 +2500,8 @@ Transposing beyond buffer boundaries is an error.")
2500#ifdef USE_TEXT_PROPERTIES 2500#ifdef USE_TEXT_PROPERTIES
2501 tmp_interval1 = copy_intervals (cur_intv, start1, len1); 2501 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
2502 tmp_interval2 = copy_intervals (cur_intv, start2, len2); 2502 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
2503 Fset_text_properties (start1, end2, Qnil, Qnil); 2503 Fset_text_properties (make_number (start1), make_number (end2),
2504 Qnil, Qnil);
2504#endif /* USE_TEXT_PROPERTIES */ 2505#endif /* USE_TEXT_PROPERTIES */
2505 2506
2506 /* First region smaller than second. */ 2507 /* First region smaller than second. */
@@ -2560,8 +2561,10 @@ Transposing beyond buffer boundaries is an error.")
2560#ifdef USE_TEXT_PROPERTIES 2561#ifdef USE_TEXT_PROPERTIES
2561 tmp_interval1 = copy_intervals (cur_intv, start1, len1); 2562 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
2562 tmp_interval2 = copy_intervals (cur_intv, start2, len2); 2563 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
2563 Fset_text_properties (start1, end1, Qnil, Qnil); 2564 Fset_text_properties (make_number (start1), make_number (end1),
2564 Fset_text_properties (start2, end2, Qnil, Qnil); 2565 Qnil, Qnil);
2566 Fset_text_properties (make_number (start2), make_number (end2),
2567 Qnil, Qnil);
2565#endif /* USE_TEXT_PROPERTIES */ 2568#endif /* USE_TEXT_PROPERTIES */
2566 2569
2567 if (len1 > 20000) 2570 if (len1 > 20000)
@@ -2593,7 +2596,8 @@ Transposing beyond buffer boundaries is an error.")
2593 tmp_interval1 = copy_intervals (cur_intv, start1, len1); 2596 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
2594 tmp_interval_mid = copy_intervals (cur_intv, end1, len_mid); 2597 tmp_interval_mid = copy_intervals (cur_intv, end1, len_mid);
2595 tmp_interval2 = copy_intervals (cur_intv, start2, len2); 2598 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
2596 Fset_text_properties (start1, end2, Qnil, Qnil); 2599 Fset_text_properties (make_number (start1), make_number (end2),
2600 Qnil, Qnil);
2597#endif /* USE_TEXT_PROPERTIES */ 2601#endif /* USE_TEXT_PROPERTIES */
2598 2602
2599 /* holds region 2 */ 2603 /* holds region 2 */
@@ -2629,7 +2633,8 @@ Transposing beyond buffer boundaries is an error.")
2629 tmp_interval1 = copy_intervals (cur_intv, start1, len1); 2633 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
2630 tmp_interval_mid = copy_intervals (cur_intv, end1, len_mid); 2634 tmp_interval_mid = copy_intervals (cur_intv, end1, len_mid);
2631 tmp_interval2 = copy_intervals (cur_intv, start2, len2); 2635 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
2632 Fset_text_properties (start1, end2, Qnil, Qnil); 2636 Fset_text_properties (make_number (start1), make_number (end2),
2637 Qnil, Qnil);
2633#endif /* USE_TEXT_PROPERTIES */ 2638#endif /* USE_TEXT_PROPERTIES */
2634 2639
2635 /* holds region 1 */ 2640 /* holds region 1 */