Mercurial > hg > xemacs-beta
annotate modules/sample/internal/Makefile.in.in @ 5776:65d65b52d608
Pass character count from coding systems to buffer insertion code.
src/ChangeLog addition:
2014-01-16 Aidan Kehoe <kehoea@parhasard.net>
Pass character count information from the no-conversion and
unicode coding systems to the buffer insertion code, making
#'find-file on large buffers a little snappier (if
ERROR_CHECK_TEXT is not defined).
* file-coding.c:
* file-coding.c (coding_character_tell): New.
* file-coding.c (conversion_coding_stream_description): New.
* file-coding.c (no_conversion_convert):
Update characters_seen when decoding.
* file-coding.c (no_conversion_character_tell): New.
* file-coding.c (lstream_type_create_file_coding): Create the
no_conversion type with data.
* file-coding.c (coding_system_type_create):
Make the character_tell method available here.
* file-coding.h:
* file-coding.h (struct coding_system_methods):
Add a new character_tell() method, passing charcount information
from the coding systems to the buffer code, avoiding duplicate
bytecount-to-charcount work especially with large buffers.
* fileio.c (Finsert_file_contents_internal):
Update this to pass charcount information to
buffer_insert_string_1(), if that is available from the lstream code.
* insdel.c:
* insdel.c (buffer_insert_string_1):
Add a new CCLEN argument, giving the character count of the string
to insert. It can be -1 to indicate that te function should work
it out itself using bytecount_to_charcount(), as it used to.
* insdel.c (buffer_insert_raw_string_1):
* insdel.c (buffer_insert_lisp_string_1):
* insdel.c (buffer_insert_ascstring_1):
* insdel.c (buffer_insert_emacs_char_1):
* insdel.c (buffer_insert_from_buffer_1):
* insdel.c (buffer_replace_char):
Update these functions to use the new calling convention.
* insdel.h:
* insdel.h (buffer_insert_string):
Update this header to reflect the new buffer_insert_string_1()
argument.
* lstream.c (Lstream_character_tell): New.
Return the number of characters *read* and seen by the consumer so
far, taking into account the unget buffer, and buffered reading.
* lstream.c (Lstream_unread):
Update unget_character_count here as appropriate.
* lstream.c (Lstream_rewind):
Reset unget_character_count here too.
* lstream.h:
* lstream.h (struct lstream):
Provide the character_tell method, add a new field,
unget_character_count, giving the number of characters ever passed
to Lstream_unread().
Declare Lstream_character_tell().
Make Lstream_ungetc(), which happens to be unused, an inline
function rather than a macro, in the course of updating it to
modify unget_character_count.
* print.c (output_string):
Use the new argument to buffer_insert_string_1().
* tests.c:
* tests.c (Ftest_character_tell):
New test function.
* tests.c (syms_of_tests):
Make it available.
* unicode.c:
* unicode.c (struct unicode_coding_stream):
* unicode.c (unicode_character_tell):
New method.
* unicode.c (unicode_convert):
Update the character counter as appropriate.
* unicode.c (coding_system_type_create_unicode):
Make the character_tell method available.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 16 Jan 2014 16:27:52 +0000 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 996 | 1 ## Makefile for the sample module in XEmacs. |
| 2 ## Copyright (C) 2002 Jerry James. | |
| 3 | |
| 4 ## This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1490
diff
changeset
|
6 ## XEmacs is free software: you can redistribute it and/or modify it |
| 996 | 7 ## under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1490
diff
changeset
|
8 ## Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1490
diff
changeset
|
9 ## option) any later version. |
| 996 | 10 |
| 11 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 ## for more details. | |
| 15 | |
| 16 ## You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1490
diff
changeset
|
17 ## along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 996 | 18 |
| 19 ## Synched up with: Not synched with FSF. | |
| 20 | |
| 21 ## This is more complicated than would normally be the case, as this makefile | |
| 22 ## has been tailored to work both inside and independently of the XEmacs | |
| 23 ## source tree, and to support both module and non-module building inside the | |
| 24 ## source tree. | |
| 25 | |
| 26 ### Specialize this part for your module | |
| 27 MODNAME=sample | |
| 28 MODVER=0.0.1 | |
| 29 MODTITLE="Sample module for XEmacs" | |
| 30 LDFLAGS=@LDFLAGS@ @sample_libs@ | |
| 31 SRCS=sample.c | |
| 32 | |
| 33 ### You should not need to modify anything below this line | |
| 34 SHELL=/bin/sh | |
| 35 RM=rm -f | |
| 36 PROGNAME=@PROGNAME@ | |
| 37 CFLAGS=@CFLAGS@ | |
| 38 INSTALL=@INSTALL@ | |
| 39 version=@version@ | |
| 40 prefix=@prefix@ | |
| 41 exec_prefix=@exec_prefix@ | |
| 42 libdir=@libdir@ | |
| 43 instvardir=@instvardir@ | |
| 44 configuration=@configuration@ | |
| 45 moduledir=@moduledir@ | |
| 46 with_modules=@with_modules@ | |
| 47 | |
| 48 srcdir=@srcdir@ | |
| 49 VPATH=@srcdir@ | |
| 50 | |
| 1490 | 51 SRC_SRCS=$(SRCS:%=$(srcdir)/%) |
| 52 OBJS=$(SRCS:.c=.o) | |
| 53 | |
| 996 | 54 CC=@MOD_CC@ |
| 55 MODARCHDIR=@MODARCHDIR@ | |
| 56 MAKE_DOCFILE=@MAKE_DOCFILE@ | |
| 57 MODCFLAGS=@MODCFLAGS@ | |
| 58 INSTALLPATH=@INSTALLPATH@ | |
| 59 INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@ | |
| 60 OBJECT_TO_BUILD=@OBJECT_TO_BUILD@ | |
| 61 | |
| 62 .PHONY: clean distclean install | |
| 63 all: $(OBJECT_TO_BUILD) | |
| 64 | |
| 65 .c.o: | |
| 66 $(CC) $(MODCFLAGS) -c $< | |
| 67 | |
| 68 $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o | |
| 1489 | 69 $(CC) --mode=link --mod-output=$@ $(OBJS) $(MODNAME)_i.o $(LDFLAGS) |
| 996 | 70 |
| 71 $(MODNAME)_i.c: $(SRCS) | |
| 72 ELLMAKEDOC=$(MAKE_DOCFILE) $(CC) --mode=init --mod-output=$@ \ | |
| 73 --mod-name=$(MODNAME) --mod-version=$(MODVER) \ | |
| 74 --mod-title=$(MODTITLE) $(SRC_SRCS) | |
| 75 | |
| 76 clean: | |
| 77 $(RM) $(MODNAME).ell $(OBJS) $(MODNAME)_i.* *~ | |
| 78 | |
| 79 distclean: clean | |
| 80 $(RM) Makefile config.* configure | |
| 81 | |
| 82 install: $(OBJECT_TO_BUILD) | |
| 83 $(INSTALL_PROGRAM) $< $(INSTALLPATH) |