HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk
[bpt/emacs.git]
/
src
/
insdel.c
diff --git
a/src/insdel.c
b/src/insdel.c
index
abe6f35
..
db76f77
100644
(file)
--- a/
src/insdel.c
+++ b/
src/insdel.c
@@
-1,6
+1,5
@@
/* Buffer insertion/deletion and gap motion for GNU Emacs.
/* Buffer insertion/deletion and gap motion for GNU Emacs.
- Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Copyright (C) 1985-1986, 1993-1995, 1997-2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@
-53,10
+52,6
@@
static void adjust_point (EMACS_INT nchars, EMACS_INT nbytes);
Lisp_Object Fcombine_after_change_execute (void);
Lisp_Object Fcombine_after_change_execute (void);
-/* Non-nil means don't call the after-change-functions right away,
- just record an element in combine_after_change_list. */
-Lisp_Object Vcombine_after_change_calls;
-
/* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
describing changes which happened while combine_after_change_calls
was nonzero. We use this to decide how to call them
/* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
describing changes which happened while combine_after_change_calls
was nonzero. We use this to decide how to call them
@@
-73,14
+68,7
@@
Lisp_Object combine_after_change_list;
Lisp_Object combine_after_change_buffer;
Lisp_Object Qinhibit_modification_hooks;
Lisp_Object combine_after_change_buffer;
Lisp_Object Qinhibit_modification_hooks;
-
-extern Lisp_Object Vselect_active_regions, Vsaved_region_selection, Qonly;
-
\f
\f
-/* Check all markers in the current buffer, looking for something invalid. */
-
-static int check_markers_debug_flag;
-
#define CHECK_MARKERS() \
if (check_markers_debug_flag) \
check_markers (); \
#define CHECK_MARKERS() \
if (check_markers_debug_flag) \
check_markers (); \
@@
-680,11
+668,11
@@
count_size_as_multibyte (const unsigned char *ptr, EMACS_INT nbytes)
prepare_to_modify_buffer could relocate the text. */
void
prepare_to_modify_buffer could relocate the text. */
void
-insert (const
unsigned
char *string, EMACS_INT nbytes)
+insert (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text (
(unsigned char *)
string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
insert_1_both (string, len, nbytes, 0, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@
-695,11
+683,11
@@
insert (const unsigned char *string, EMACS_INT nbytes)
/* Likewise, but inherit text properties from neighboring characters. */
void
/* Likewise, but inherit text properties from neighboring characters. */
void
-insert_and_inherit (const
unsigned
char *string, EMACS_INT nbytes)
+insert_and_inherit (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text (
(unsigned char *)
string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
insert_1_both (string, len, nbytes, 1, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@
-723,7
+711,7
@@
insert_char (int c)
str[0] = c;
}
str[0] = c;
}
- insert (str, len);
+ insert (
(char *)
str, len);
}
/* Insert the null-terminated string S before point. */
}
/* Insert the null-terminated string S before point. */
@@
-740,11
+728,11
@@
insert_string (const char *s)
since gc could happen and relocate it. */
void
since gc could happen and relocate it. */
void
-insert_before_markers (const
unsigned
char *string, EMACS_INT nbytes)
+insert_before_markers (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text (
(unsigned char *)
string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
insert_1_both (string, len, nbytes, 0, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@
-755,12
+743,12
@@
insert_before_markers (const unsigned char *string, EMACS_INT nbytes)
/* Likewise, but inherit text properties from neighboring characters. */
void
/* Likewise, but inherit text properties from neighboring characters. */
void
-insert_before_markers_and_inherit (const
unsigned
char *string,
+insert_before_markers_and_inherit (const char *string,
EMACS_INT nbytes)
{
if (nbytes > 0)
{
EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text (
(unsigned char *)
string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
insert_1_both (string, len, nbytes, 1, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@
-771,11
+759,11
@@
insert_before_markers_and_inherit (const unsigned char *string,
/* Subroutine used by the insert functions above. */
void
/* Subroutine used by the insert functions above. */
void
-insert_1 (const
unsigned
char *string, EMACS_INT nbytes,
+insert_1 (const char *string, EMACS_INT nbytes,
int inherit, int prepare, int before_markers)
{
int inherit, int prepare, int before_markers)
{
- insert_1_both (string, chars_in_text (
string, nbytes), nbytes
,
- inherit, prepare, before_markers);
+ insert_1_both (string, chars_in_text (
(unsigned char *) string, nbytes)
,
+
nbytes,
inherit, prepare, before_markers);
}
\f
}
\f
@@
-896,7
+884,7
@@
count_combining_after (const unsigned char *string,
are the same as in insert_1. */
void
are the same as in insert_1. */
void
-insert_1_both (const
unsigned
char *string,
+insert_1_both (const char *string,
EMACS_INT nchars, EMACS_INT nbytes,
int inherit, int prepare, int before_markers)
{
EMACS_INT nchars, EMACS_INT nbytes,
int inherit, int prepare, int before_markers)
{
@@
-2051,6
+2039,7
@@
prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end,
/* If `select-active-regions' is non-nil, save the region text. */
if (!NILP (current_buffer->mark_active)
/* If `select-active-regions' is non-nil, save the region text. */
if (!NILP (current_buffer->mark_active)
+ && !inhibit_modification_hooks
&& XMARKER (current_buffer->mark)->buffer
&& NILP (Vsaved_region_selection)
&& (EQ (Vselect_active_regions, Qonly)
&& XMARKER (current_buffer->mark)->buffer
&& NILP (Vsaved_region_selection)
&& (EQ (Vselect_active_regions, Qonly)
@@
-2376,14
+2365,14
@@
syms_of_insdel (void)
combine_after_change_list = Qnil;
combine_after_change_buffer = Qnil;
combine_after_change_list = Qnil;
combine_after_change_buffer = Qnil;
- DEFVAR_BOOL ("check-markers-debug-flag",
&
check_markers_debug_flag,
+ DEFVAR_BOOL ("check-markers-debug-flag", check_markers_debug_flag,
doc: /* Non-nil means enable debugging checks for invalid marker positions. */);
check_markers_debug_flag = 0;
doc: /* Non-nil means enable debugging checks for invalid marker positions. */);
check_markers_debug_flag = 0;
- DEFVAR_LISP ("combine-after-change-calls",
&
Vcombine_after_change_calls,
+ DEFVAR_LISP ("combine-after-change-calls", Vcombine_after_change_calls,
doc: /* Used internally by the `combine-after-change-calls' macro. */);
Vcombine_after_change_calls = Qnil;
doc: /* Used internally by the `combine-after-change-calls' macro. */);
Vcombine_after_change_calls = Qnil;
- DEFVAR_BOOL ("inhibit-modification-hooks",
&
inhibit_modification_hooks,
+ DEFVAR_BOOL ("inhibit-modification-hooks", inhibit_modification_hooks,
doc: /* Non-nil means don't run any of the hooks that respond to buffer changes.
This affects `before-change-functions' and `after-change-functions',
as well as hooks attached to text properties and overlays. */);
doc: /* Non-nil means don't run any of the hooks that respond to buffer changes.
This affects `before-change-functions' and `after-change-functions',
as well as hooks attached to text properties and overlays. */);
@@
-2393,6
+2382,3
@@
as well as hooks attached to text properties and overlays. */);
defsubr (&Scombine_after_change_execute);
}
defsubr (&Scombine_after_change_execute);
}
-
-/* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d
- (do not change this comment) */