[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111606: * insdel.c (insert_1): Remov
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111606: * insdel.c (insert_1): Remove. |
Date: |
Fri, 25 Jan 2013 21:13:31 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111606
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-01-25 21:13:31 +0400
message:
* insdel.c (insert_1): Remove.
* lisp.h (insert_1): Remove prototype.
* xdisp.c (message_dolog): Adjust users to call insert_1_both.
modified:
src/ChangeLog
src/insdel.c
src/lisp.h
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-01-25 14:38:21 +0000
+++ b/src/ChangeLog 2013-01-25 17:13:31 +0000
@@ -6,6 +6,9 @@
* font.c (num_fonts): Remove the leftover from old
debugging code. Adjust comment style here and there.
+ * insdel.c (insert_1): Remove.
+ * lisp.h (insert_1): Remove prototype.
+ * xdisp.c (message_dolog): Adjust users to call insert_1_both.
2013-01-25 Eli Zaretskii <address@hidden>
=== modified file 'src/insdel.c'
--- a/src/insdel.c 2013-01-24 03:34:20 +0000
+++ b/src/insdel.c 2013-01-25 17:13:31 +0000
@@ -658,17 +658,6 @@
}
}
-/* Subroutine used by the insert functions above. */
-
-void
-insert_1 (const char *string, ptrdiff_t nbytes,
- bool inherit, bool prepare, bool before_markers)
-{
- insert_1_both (string, chars_in_text ((unsigned char *) string, nbytes),
- nbytes, inherit, prepare, before_markers);
-}
-
-
#ifdef BYTE_COMBINING_DEBUG
/* See if the bytes before POS/POS_BYTE combine with bytes
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2013-01-23 20:07:28 +0000
+++ b/src/lisp.h 2013-01-25 17:13:31 +0000
@@ -2874,7 +2874,6 @@
ptrdiff_t, ptrdiff_t, ptrdiff_t);
extern void insert (const char *, ptrdiff_t);
extern void insert_and_inherit (const char *, ptrdiff_t);
-extern void insert_1 (const char *, ptrdiff_t, bool, bool, bool);
extern void insert_1_both (const char *, ptrdiff_t, ptrdiff_t,
bool, bool, bool);
extern void insert_from_gap (ptrdiff_t, ptrdiff_t);
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-01-24 05:41:28 +0000
+++ b/src/xdisp.c 2013-01-25 17:13:31 +0000
@@ -9462,13 +9462,14 @@
}
}
else if (nbytes)
- insert_1 (m, nbytes, 1, 0, 0);
+ insert_1_both (m, chars_in_text (msg, nbytes), nbytes, 1, 0, 0);
if (nlflag)
{
ptrdiff_t this_bol, this_bol_byte, prev_bol, prev_bol_byte;
printmax_t dups;
- insert_1 ("\n", 1, 1, 0, 0);
+
+ insert_1_both ("\n", 1, 1, 1, 0, 0);
scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
this_bol = PT;
@@ -9497,7 +9498,7 @@
change message_log_check_duplicate. */
int duplen = sprintf (dupstr, " [%"pMd" times]", dups);
TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
- insert_1 (dupstr, duplen, 1, 0, 1);
+ insert_1_both (dupstr, duplen, duplen, 1, 0, 1);
}
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111606: * insdel.c (insert_1): Remove.,
Dmitry Antipov <=