mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-06 03:40:56 -08:00
Misc minor simplifications in C code.
* src/buffer.c (Fset_buffer_multibyte): Signal an error instead of widening. (Fmake_overlay): Remove redundant tests. * src/coding.h (ENCODE_FILE, DECODE_FILE, DECODE_SYSTEM): Remove special case for the special 0 coding-system. * src/frame.c (Fmake_terminal_frame): Prefer safer CONSP over !NILP.
This commit is contained in:
parent
9f7b98f812
commit
090cf9dbb0
5 changed files with 19 additions and 14 deletions
13
src/buffer.c
13
src/buffer.c
|
|
@ -2464,7 +2464,7 @@ current buffer is cleared. */)
|
|||
begv = BEGV, zv = ZV;
|
||||
|
||||
if (narrowed)
|
||||
Fwiden ();
|
||||
error ("Changing multibyteness in a narrowed buffer");
|
||||
|
||||
if (NILP (flag))
|
||||
{
|
||||
|
|
@ -3847,17 +3847,16 @@ for the rear of the overlay advance when text is inserted there
|
|||
end = OVERLAY_END (overlay);
|
||||
if (OVERLAY_POSITION (end) < b->overlay_center)
|
||||
{
|
||||
if (b->overlays_after)
|
||||
XOVERLAY (overlay)->next = b->overlays_after;
|
||||
eassert (b->overlays_after);
|
||||
XOVERLAY (overlay)->next = b->overlays_after;
|
||||
set_buffer_overlays_after (b, XOVERLAY (overlay));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (b->overlays_before)
|
||||
XOVERLAY (overlay)->next = b->overlays_before;
|
||||
eassert (b->overlays_before);
|
||||
XOVERLAY (overlay)->next = b->overlays_before;
|
||||
set_buffer_overlays_before (b, XOVERLAY (overlay));
|
||||
}
|
||||
|
||||
/* This puts it in the right list, and in the right order. */
|
||||
recenter_overlay_lists (b, b->overlay_center);
|
||||
|
||||
|
|
@ -4141,7 +4140,7 @@ DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
|
|||
/* Put all the overlays we want in a vector in overlay_vec.
|
||||
Store the length in len. */
|
||||
noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
|
||||
0, 0, 0);
|
||||
NULL, NULL, 0);
|
||||
|
||||
/* Make a list of them all. */
|
||||
result = Flist (noverlays, overlay_vec);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue