aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-03-14 18:22:56 -0700
committerPaul Eggert2011-03-14 18:22:56 -0700
commit85876d07948fa6dba29b987c20eadd1b4c7aad1a (patch)
treeb9293b44fcd207ed7290483f9cf0f9f5d6e7561e
parentb3dd38aba98f3521d164ef698d6b77b80d867fb8 (diff)
downloademacs-85876d07948fa6dba29b987c20eadd1b4c7aad1a.tar.gz
emacs-85876d07948fa6dba29b987c20eadd1b4c7aad1a.zip
* insdel.c (check_markers, make_gap_larger, make_gap_smaller):
(reset_var_on_error, Fcombine_after_change_execute_1): Now static.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/insdel.c10
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0f6bd3dab9c..6717ce1489e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-03-15 Paul Eggert <eggert@cs.ucla.edu> 12011-03-15 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * insdel.c (check_markers, make_gap_larger, make_gap_smaller):
4 (reset_var_on_error, Fcombine_after_change_execute_1): Now static.
5
3 * filelock.c (within_one_second): Now static. 6 * filelock.c (within_one_second): Now static.
4 (lock_file_1): Rename local to avoid shadowing. 7 (lock_file_1): Rename local to avoid shadowing.
5 8
diff --git a/src/insdel.c b/src/insdel.c
index bdf6aff1717..a429ae6a1e3 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -74,7 +74,7 @@ Lisp_Object Qinhibit_modification_hooks;
74 check_markers (); \ 74 check_markers (); \
75 else 75 else
76 76
77void 77static void
78check_markers (void) 78check_markers (void)
79{ 79{
80 register struct Lisp_Marker *tail; 80 register struct Lisp_Marker *tail;
@@ -451,7 +451,7 @@ adjust_markers_for_replace (EMACS_INT from, EMACS_INT from_byte,
451 451
452/* Make the gap NBYTES_ADDED bytes longer. */ 452/* Make the gap NBYTES_ADDED bytes longer. */
453 453
454void 454static void
455make_gap_larger (EMACS_INT nbytes_added) 455make_gap_larger (EMACS_INT nbytes_added)
456{ 456{
457 Lisp_Object tem; 457 Lisp_Object tem;
@@ -506,7 +506,7 @@ make_gap_larger (EMACS_INT nbytes_added)
506 506
507/* Make the gap NBYTES_REMOVED bytes shorter. */ 507/* Make the gap NBYTES_REMOVED bytes shorter. */
508 508
509void 509static void
510make_gap_smaller (EMACS_INT nbytes_removed) 510make_gap_smaller (EMACS_INT nbytes_removed)
511{ 511{
512 Lisp_Object tem; 512 Lisp_Object tem;
@@ -2099,7 +2099,7 @@ prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end,
2099 VARIABLE is the variable to maybe set to nil. 2099 VARIABLE is the variable to maybe set to nil.
2100 NO-ERROR-FLAG is nil if there was an error, 2100 NO-ERROR-FLAG is nil if there was an error,
2101 anything else meaning no error (so this function does nothing). */ 2101 anything else meaning no error (so this function does nothing). */
2102Lisp_Object 2102static Lisp_Object
2103reset_var_on_error (Lisp_Object val) 2103reset_var_on_error (Lisp_Object val)
2104{ 2104{
2105 if (NILP (XCDR (val))) 2105 if (NILP (XCDR (val)))
@@ -2263,7 +2263,7 @@ signal_after_change (EMACS_INT charpos, EMACS_INT lendel, EMACS_INT lenins)
2263 unbind_to (count, Qnil); 2263 unbind_to (count, Qnil);
2264} 2264}
2265 2265
2266Lisp_Object 2266static Lisp_Object
2267Fcombine_after_change_execute_1 (Lisp_Object val) 2267Fcombine_after_change_execute_1 (Lisp_Object val)
2268{ 2268{
2269 Vcombine_after_change_calls = val; 2269 Vcombine_after_change_calls = val;