Mercurial > hg > xemacs-beta
diff src/fileio.c @ 5470:0af042a0c116
Merge with trunk.
| author | Mats Lidell <matsl@xemacs.org> |
|---|---|
| date | Mon, 07 Feb 2011 21:22:17 +0100 |
| parents | 8d29f1c4bb98 94bbd4792049 |
| children | 4dee0387b9de |
line wrap: on
line diff
--- a/src/fileio.c Sat Jan 22 00:59:20 2011 +0100 +++ b/src/fileio.c Mon Feb 07 21:22:17 2011 +0100 @@ -130,8 +130,6 @@ Lisp_Object Qauto_save_error; Lisp_Object Qauto_saving; -Lisp_Object Qcar_less_than_car; - Lisp_Object Qcompute_buffer_file_truename; Lisp_Object QSin_expand_file_name; @@ -3675,7 +3673,8 @@ annotations = Qnil; } Flength (res); /* Check basic validity of return value */ - annotations = list_merge (annotations, res, NULL, Qlss, Qcar); + annotations = list_merge (annotations, res, check_lss_key_car, Qnil, + Qnil); p = Fcdr (p); } @@ -3706,7 +3705,8 @@ annotations = Qnil; } Flength (res); - annotations = list_merge (annotations, res, NULL, Qlss, Qcar); + annotations = list_merge (annotations, res, check_lss_key_car, Qnil, + Qnil); p = Fcdr (p); } @@ -4379,7 +4379,6 @@ DEFSYMBOL (Qwrite_region); DEFSYMBOL (Qverify_visited_file_modtime); DEFSYMBOL (Qset_visited_file_modtime); - DEFSYMBOL (Qcar_less_than_car); /* Vomitous! */ DEFSYMBOL (Qexcl); DEFSYMBOL (Qauto_save_hook);