diff options
| author | Dmitry Antipov | 2012-07-27 11:51:52 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-07-27 11:51:52 +0400 |
| commit | eeaea515623db982d4e7d453711e6f0fad9c08d8 (patch) | |
| tree | 6c4f5398509d735e85151d480c8ba4756c1e5ec5 /src/marker.c | |
| parent | 073c88c22c0064b60ec57b6dadef9d3a4736e6b5 (diff) | |
| download | emacs-eeaea515623db982d4e7d453711e6f0fad9c08d8.tar.gz emacs-eeaea515623db982d4e7d453711e6f0fad9c08d8.zip | |
Revert last save_excursion_save and save_excursion_restore changes.
* alloc.c, editfns.c, marker.c, lisp.h: Revert.
Lots of crashes reported by Chong Yidong <cyd@gnu.org>.
Diffstat (limited to 'src/marker.c')
| -rw-r--r-- | src/marker.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/marker.c b/src/marker.c index d63947d8c31..0a93f4c180f 100644 --- a/src/marker.c +++ b/src/marker.c | |||
| @@ -425,28 +425,9 @@ Returns nil if MARKER points nowhere. */) | |||
| 425 | return Qnil; | 425 | return Qnil; |
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | /* Initialize just allocated Lisp_Marker. */ | ||
| 429 | |||
| 430 | void | ||
| 431 | init_marker (struct Lisp_Marker *m, struct buffer *b, | ||
| 432 | ptrdiff_t charpos, ptrdiff_t bytepos, int type) | ||
| 433 | { | ||
| 434 | m->buffer = b; | ||
| 435 | m->charpos = charpos; | ||
| 436 | m->bytepos = bytepos; | ||
| 437 | m->insertion_type = type; | ||
| 438 | if (b) | ||
| 439 | { | ||
| 440 | m->next = BUF_MARKERS (b); | ||
| 441 | BUF_MARKERS (b) = m; | ||
| 442 | } | ||
| 443 | else | ||
| 444 | m->next = NULL; | ||
| 445 | } | ||
| 446 | |||
| 447 | /* Change M so it points to B at CHARPOS and BYTEPOS. */ | 428 | /* Change M so it points to B at CHARPOS and BYTEPOS. */ |
| 448 | 429 | ||
| 449 | void | 430 | static inline void |
| 450 | attach_marker (struct Lisp_Marker *m, struct buffer *b, | 431 | attach_marker (struct Lisp_Marker *m, struct buffer *b, |
| 451 | ptrdiff_t charpos, ptrdiff_t bytepos) | 432 | ptrdiff_t charpos, ptrdiff_t bytepos) |
| 452 | { | 433 | { |