Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 5470:0af042a0c116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 07 Feb 2011 21:22:17 +0100
parents 8d29f1c4bb98 94bbd4792049
children 4dee0387b9de
comparison
equal deleted inserted replaced
5469:2a8a04f73c15 5470:0af042a0c116
127 Lisp_Object Qexcl; 127 Lisp_Object Qexcl;
128 128
129 Lisp_Object Qauto_save_hook; 129 Lisp_Object Qauto_save_hook;
130 Lisp_Object Qauto_save_error; 130 Lisp_Object Qauto_save_error;
131 Lisp_Object Qauto_saving; 131 Lisp_Object Qauto_saving;
132
133 Lisp_Object Qcar_less_than_car;
134 132
135 Lisp_Object Qcompute_buffer_file_truename; 133 Lisp_Object Qcompute_buffer_file_truename;
136 134
137 Lisp_Object QSin_expand_file_name; 135 Lisp_Object QSin_expand_file_name;
138 136
3673 start = make_int (BUF_BEGV (current_buffer)); 3671 start = make_int (BUF_BEGV (current_buffer));
3674 end = make_int (BUF_ZV (current_buffer)); 3672 end = make_int (BUF_ZV (current_buffer));
3675 annotations = Qnil; 3673 annotations = Qnil;
3676 } 3674 }
3677 Flength (res); /* Check basic validity of return value */ 3675 Flength (res); /* Check basic validity of return value */
3678 annotations = list_merge (annotations, res, NULL, Qlss, Qcar); 3676 annotations = list_merge (annotations, res, check_lss_key_car, Qnil,
3677 Qnil);
3679 p = Fcdr (p); 3678 p = Fcdr (p);
3680 } 3679 }
3681 3680
3682 /* Now do the same for annotation functions implied by the file-format */ 3681 /* Now do the same for annotation functions implied by the file-format */
3683 if (UNBOUNDP (XSYMBOL_FUNCTION (Qformat_annotate_function))) 3682 if (UNBOUNDP (XSYMBOL_FUNCTION (Qformat_annotate_function)))
3704 start = make_int (BUF_BEGV (current_buffer)); 3703 start = make_int (BUF_BEGV (current_buffer));
3705 end = make_int (BUF_ZV (current_buffer)); 3704 end = make_int (BUF_ZV (current_buffer));
3706 annotations = Qnil; 3705 annotations = Qnil;
3707 } 3706 }
3708 Flength (res); 3707 Flength (res);
3709 annotations = list_merge (annotations, res, NULL, Qlss, Qcar); 3708 annotations = list_merge (annotations, res, check_lss_key_car, Qnil,
3709 Qnil);
3710 p = Fcdr (p); 3710 p = Fcdr (p);
3711 } 3711 }
3712 3712
3713 UNGCPRO; 3713 UNGCPRO;
3714 return annotations; 3714 return annotations;
4377 DEFSYMBOL (Qfile_newer_than_file_p); 4377 DEFSYMBOL (Qfile_newer_than_file_p);
4378 DEFSYMBOL (Qinsert_file_contents); 4378 DEFSYMBOL (Qinsert_file_contents);
4379 DEFSYMBOL (Qwrite_region); 4379 DEFSYMBOL (Qwrite_region);
4380 DEFSYMBOL (Qverify_visited_file_modtime); 4380 DEFSYMBOL (Qverify_visited_file_modtime);
4381 DEFSYMBOL (Qset_visited_file_modtime); 4381 DEFSYMBOL (Qset_visited_file_modtime);
4382 DEFSYMBOL (Qcar_less_than_car); /* Vomitous! */
4383 DEFSYMBOL (Qexcl); 4382 DEFSYMBOL (Qexcl);
4384 4383
4385 DEFSYMBOL (Qauto_save_hook); 4384 DEFSYMBOL (Qauto_save_hook);
4386 DEFSYMBOL (Qauto_save_error); 4385 DEFSYMBOL (Qauto_save_error);
4387 DEFSYMBOL (Qauto_saving); 4386 DEFSYMBOL (Qauto_saving);