diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/insdel.c | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/insdel.c')
| -rw-r--r-- | src/insdel.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/insdel.c b/src/insdel.c index 748e2d54109..148ba221940 100644 --- a/src/insdel.c +++ b/src/insdel.c | |||
| @@ -31,10 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 31 | #include "blockinput.h" | 31 | #include "blockinput.h" |
| 32 | #include "region-cache.h" | 32 | #include "region-cache.h" |
| 33 | 33 | ||
| 34 | #ifndef NULL | ||
| 35 | #define NULL 0 | ||
| 36 | #endif | ||
| 37 | |||
| 38 | static void insert_from_string_1 (Lisp_Object string, | 34 | static void insert_from_string_1 (Lisp_Object string, |
| 39 | ptrdiff_t pos, ptrdiff_t pos_byte, | 35 | ptrdiff_t pos, ptrdiff_t pos_byte, |
| 40 | ptrdiff_t nchars, ptrdiff_t nbytes, | 36 | ptrdiff_t nchars, ptrdiff_t nbytes, |