Mercurial > emacs
comparison src/buffer.c @ 108890:d9257436d2b1
Remove obsolete macro BASE_LEADING_CODE_P.
* character.h (BASE_LEADING_CODE_P): Remove.
* regex.c [!emacs] (BASE_LEADING_CODE_P): Remove.
* buffer.c (Fset_buffer_multibyte):
* indent.c (scan_for_column, compute_motion):
* insdel.c (count_combining_before, count_combining_after):
Use LEADING_CODE_P instead of BASE_LEADING_CODE_P.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 05 Jun 2010 02:41:32 +0200 |
parents | f4a583b69ffa |
children | 2bc9a0c04c87 |
comparison
equal
deleted
inserted
replaced
108889:e7c6230ab85d | 108890:d9257436d2b1 |
---|---|
2187 struct buffer *other_buffer; | 2187 struct buffer *other_buffer; |
2188 CHECK_BUFFER (buffer); | 2188 CHECK_BUFFER (buffer); |
2189 other_buffer = XBUFFER (buffer); | 2189 other_buffer = XBUFFER (buffer); |
2190 | 2190 |
2191 if (NILP (other_buffer->name)) | 2191 if (NILP (other_buffer->name)) |
2192 error ("Cannot swap a dead buffer's text"); | 2192 error ("Cannot swap a dead buffer's text"); |
2193 | 2193 |
2194 /* Actually, it probably works just fine. | 2194 /* Actually, it probably works just fine. |
2195 * if (other_buffer == current_buffer) | 2195 * if (other_buffer == current_buffer) |
2196 * error ("Cannot swap a buffer's text with itself"); */ | 2196 * error ("Cannot swap a buffer's text with itself"); */ |
2197 | 2197 |
2434 && ! CHAR_HEAD_P (*(GAP_END_ADDR))) | 2434 && ! CHAR_HEAD_P (*(GAP_END_ADDR))) |
2435 { | 2435 { |
2436 unsigned char *p = GPT_ADDR - 1; | 2436 unsigned char *p = GPT_ADDR - 1; |
2437 | 2437 |
2438 while (! CHAR_HEAD_P (*p) && p > BEG_ADDR) p--; | 2438 while (! CHAR_HEAD_P (*p) && p > BEG_ADDR) p--; |
2439 if (BASE_LEADING_CODE_P (*p)) | 2439 if (LEADING_CODE_P (*p)) |
2440 { | 2440 { |
2441 int new_gpt = GPT_BYTE - (GPT_ADDR - p); | 2441 int new_gpt = GPT_BYTE - (GPT_ADDR - p); |
2442 | 2442 |
2443 move_gap_both (new_gpt, new_gpt); | 2443 move_gap_both (new_gpt, new_gpt); |
2444 } | 2444 } |
4337 Lisp_Object functionlist, overlay; | 4337 Lisp_Object functionlist, overlay; |
4338 { | 4338 { |
4339 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; | 4339 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; |
4340 | 4340 |
4341 if (last_overlay_modification_hooks_used == oldsize) | 4341 if (last_overlay_modification_hooks_used == oldsize) |
4342 last_overlay_modification_hooks = larger_vector | 4342 last_overlay_modification_hooks = larger_vector |
4343 (last_overlay_modification_hooks, oldsize * 2, Qnil); | 4343 (last_overlay_modification_hooks, oldsize * 2, Qnil); |
4344 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used, | 4344 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used, |
4345 functionlist); last_overlay_modification_hooks_used++; | 4345 functionlist); last_overlay_modification_hooks_used++; |
4346 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used, | 4346 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used, |
4347 overlay); last_overlay_modification_hooks_used++; | 4347 overlay); last_overlay_modification_hooks_used++; |