projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create branch 'utf-2000'.
[chise/xemacs-chise.git-]
/
src
/
buffer.c
diff --git
a/src/buffer.c
b/src/buffer.c
index
e3c219e
..
2f2123f
100644
(file)
--- a/
src/buffer.c
+++ b/
src/buffer.c
@@
-195,7
+195,6
@@
Lisp_Object QSscratch; /* "*scratch*" */
Lisp_Object Qdefault_directory;
Lisp_Object Qkill_buffer_hook;
Lisp_Object Qdefault_directory;
Lisp_Object Qkill_buffer_hook;
-Lisp_Object Qrecord_buffer_hook;
Lisp_Object Qrename_auto_save_file;
Lisp_Object Qrename_auto_save_file;
@@
-1027,12
+1026,6
@@
This does not change the name of the visited file (if any).
/* The aconses in the Vbuffer_alist are shared with frame->buffer_alist,
so this will change it in the per-frame ordering as well. */
Fsetcar (Frassq (buf, Vbuffer_alist), newname);
/* The aconses in the Vbuffer_alist are shared with frame->buffer_alist,
so this will change it in the per-frame ordering as well. */
Fsetcar (Frassq (buf, Vbuffer_alist), newname);
- /* If the buffer is the selected one then this is equivalent to
- recording the buffer. */
- if (EQ (Fwindow_buffer (Fselected_window (Qnil)), buf))
- {
- va_run_hook_with_args (Qrecord_buffer_hook, 1, buf);
- }
if (NILP (current_buffer->filename)
&& !NILP (current_buffer->auto_save_file_name))
if (NILP (current_buffer->filename)
&& !NILP (current_buffer->auto_save_file_name))
@@
-1420,8
+1413,6
@@
buffer. See `other-buffer' for more information.
XCDR (lynk) = f->buffer_alist;
f->buffer_alist = lynk;
XCDR (lynk) = f->buffer_alist;
f->buffer_alist = lynk;
- va_run_hook_with_args (Qrecord_buffer_hook, 1, buffer);
-
return Qnil;
}
return Qnil;
}
@@
-1920,11
+1911,17
@@
dfc_convert_to_external_format (dfc_conversion_type source_type,
const Bufbyte *end;
for (end = ptr + len; ptr < end;)
{
const Bufbyte *end;
for (end = ptr + len; ptr < end;)
{
+#ifdef UTF2000
+ Bufbyte c =
+ (*ptr < 0xc0) ? *ptr :
+ ((*ptr & 0x1f) << 6) | (*(ptr+1) & 0x3f);
+#else
Bufbyte c =
(BYTE_ASCII_P (*ptr)) ? *ptr :
(*ptr == LEADING_BYTE_CONTROL_1) ? (*(ptr+1) - 0x20) :
(*ptr == LEADING_BYTE_LATIN_ISO8859_1) ? (*(ptr+1)) :
'~';
Bufbyte c =
(BYTE_ASCII_P (*ptr)) ? *ptr :
(*ptr == LEADING_BYTE_CONTROL_1) ? (*(ptr+1) - 0x20) :
(*ptr == LEADING_BYTE_LATIN_ISO8859_1) ? (*(ptr+1)) :
'~';
+#endif
Dynarr_add (conversion_out_dynarr, (Extbyte) c);
INC_CHARPTR (ptr);
Dynarr_add (conversion_out_dynarr, (Extbyte) c);
INC_CHARPTR (ptr);
@@
-2059,6
+2056,15
@@
dfc_convert_to_internal_format (dfc_conversion_type source_type,
{
Extbyte c = *ptr;
{
Extbyte c = *ptr;
+#ifdef UTF2000
+ if (BYTE_ASCII_P (c))
+ Dynarr_add (conversion_in_dynarr, c);
+ else
+ {
+ Dynarr_add (conversion_in_dynarr, (c >> 6) | 0xC0);
+ Dynarr_add (conversion_in_dynarr, (c & 0x3F) | 0x80);
+ }
+#else
if (BYTE_ASCII_P (c))
Dynarr_add (conversion_in_dynarr, c);
else if (BYTE_C1_P (c))
if (BYTE_ASCII_P (c))
Dynarr_add (conversion_in_dynarr, c);
else if (BYTE_C1_P (c))
@@
-2071,6
+2077,7
@@
dfc_convert_to_internal_format (dfc_conversion_type source_type,
Dynarr_add (conversion_in_dynarr, LEADING_BYTE_LATIN_ISO8859_1);
Dynarr_add (conversion_in_dynarr, c);
}
Dynarr_add (conversion_in_dynarr, LEADING_BYTE_LATIN_ISO8859_1);
Dynarr_add (conversion_in_dynarr, c);
}
+#endif
}
#else
Dynarr_add_many (conversion_in_dynarr, source->data.ptr, source->data.len);
}
#else
Dynarr_add_many (conversion_in_dynarr, source->data.ptr, source->data.len);
@@
-2162,7
+2169,6
@@
syms_of_buffer (void)
defsymbol (&Qmode_class, "mode-class");
defsymbol (&Qrename_auto_save_file, "rename-auto-save-file");
defsymbol (&Qkill_buffer_hook, "kill-buffer-hook");
defsymbol (&Qmode_class, "mode-class");
defsymbol (&Qrename_auto_save_file, "rename-auto-save-file");
defsymbol (&Qkill_buffer_hook, "kill-buffer-hook");
- defsymbol (&Qrecord_buffer_hook, "record-buffer-hook");
defsymbol (&Qpermanent_local, "permanent-local");
defsymbol (&Qfirst_change_hook, "first-change-hook");
defsymbol (&Qpermanent_local, "permanent-local");
defsymbol (&Qfirst_change_hook, "first-change-hook");