Mercurial > emacs
comparison src/buffer.c @ 90143:146c086df160
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 241-257)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 59-65)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- (mm-string-to-multibyte): Use Gnus trunk definition.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 14 Apr 2005 05:03:52 +0000 |
| parents | 30ad2795fdab 9ee6093ffeaf |
| children | 08185296b491 |
comparison
equal
deleted
inserted
replaced
| 90142:627771f44771 | 90143:146c086df160 |
|---|---|
| 629 b->zv_marker = Fmake_marker (); | 629 b->zv_marker = Fmake_marker (); |
| 630 set_marker_both (b->zv_marker, buf, BUF_ZV (b), BUF_ZV_BYTE (b)); | 630 set_marker_both (b->zv_marker, buf, BUF_ZV (b), BUF_ZV_BYTE (b)); |
| 631 XMARKER (b->zv_marker)->insertion_type = 1; | 631 XMARKER (b->zv_marker)->insertion_type = 1; |
| 632 } | 632 } |
| 633 else | 633 else |
| 634 clone_per_buffer_values (b->base_buffer, b); | 634 { |
| 635 struct buffer *old_b = current_buffer; | |
| 636 | |
| 637 clone_per_buffer_values (b->base_buffer, b); | |
| 638 b->filename = Qnil; | |
| 639 b->file_truename = Qnil; | |
| 640 b->display_count = make_number (0); | |
| 641 b->backed_up = Qnil; | |
| 642 b->auto_save_file_name = Qnil; | |
| 643 set_buffer_internal_1 (b); | |
| 644 Fset (intern ("buffer-save-without-query"), Qnil); | |
| 645 Fset (intern ("buffer-file-number"), Qnil); | |
| 646 Fset (intern ("buffer-stale-function"), Qnil); | |
| 647 set_buffer_internal_1 (old_b); | |
| 648 } | |
| 635 | 649 |
| 636 return buf; | 650 return buf; |
| 637 } | 651 } |
| 638 | 652 |
| 639 void | 653 void |
| 930 | 944 |
| 931 return result; | 945 return result; |
| 932 } | 946 } |
| 933 | 947 |
| 934 /* Return an alist of the Lisp-level buffer-local bindings of | 948 /* Return an alist of the Lisp-level buffer-local bindings of |
| 935 buffer BUF. That is, do't include the variables maintained | 949 buffer BUF. That is, don't include the variables maintained |
| 936 in special slots in the buffer object. */ | 950 in special slots in the buffer object. */ |
| 937 | 951 |
| 938 static Lisp_Object | 952 static Lisp_Object |
| 939 buffer_lisp_local_variables (buf) | 953 buffer_lisp_local_variables (buf) |
| 940 struct buffer *buf; | 954 struct buffer *buf; |
