Mercurial > emacs

comparison src/editfns.c @ 18745:192b3ebd108e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fcurrent_time_zone): Convert Fmake_list argument to Lisp_Integer. (Ftranspose_regions): Convert Fset_text_properties arguments to Lisp_Integer.
author Richard M. Stallman <rms@gnu.org>
date Sat, 12 Jul 1997 06:43:44 +0000
parents 537522d5e6d8
children 751f531e5a20
comparison
equal deleted inserted replaced
18744:1718bdf566fd 18745:192b3ebd108e
1125 s = buf; 1125 s = buf;
1126 } 1126 }
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
1134 call to Fset_time_zone_rule, or 0 if Fset_time_zone_rule 1134 call to Fset_time_zone_rule, or 0 if Fset_time_zone_rule
1135 has never been called. */ 1135 has never been called. */
2498 record_change (start1, len1 + len2); 2498 record_change (start1, len1 + len2);
2499 2499
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. */
2507 if (len1 < len2) 2508 if (len1 < len2)
2508 { 2509 {
2558 record_change (start1, len1); 2559 record_change (start1, len1);
2559 record_change (start2, len2); 2560 record_change (start2, len2);
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)
2568 temp = (unsigned char *) xmalloc (len1); 2571 temp = (unsigned char *) xmalloc (len1);
2569 else 2572 else
2591 record_change (start1, (end2 - start1)); 2594 record_change (start1, (end2 - start1));
2592 #ifdef USE_TEXT_PROPERTIES 2595 #ifdef USE_TEXT_PROPERTIES
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 */
2600 if (len2 > 20000) 2604 if (len2 > 20000)
2601 temp = (unsigned char *) xmalloc (len2); 2605 temp = (unsigned char *) xmalloc (len2);
2627 2631
2628 #ifdef USE_TEXT_PROPERTIES 2632 #ifdef USE_TEXT_PROPERTIES
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 */
2636 if (len1 > 20000) 2641 if (len1 > 20000)
2637 temp = (unsigned char *) xmalloc (len1); 2642 temp = (unsigned char *) xmalloc (len1);