Mercurial > hg > xemacs-beta
view lisp/version.el @ 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 | 91b3aa59f49b |
| children | bbe4146603db |
line wrap: on
line source
;; version.el --- Record version number of Emacs. ;; Copyright (C) 1985, 1991-1994, 1997 Free Software Foundation, Inc. ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: FSF 19.34. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: (defconst xemacs-betaname (and emacs-beta-version (format "(beta%d)" emacs-beta-version)) "Non-nil when this is a test (beta) version of XEmacs. Warning, this variable did not exist in XEmacs versions prior to 20.3. Its value is derived from `emacs-beta-version'. It is mutually exclusive with `emacs-patch-level'.") (defconst emacs-version (format "%d.%d %s%s%s%s%s" emacs-major-version emacs-minor-version (if emacs-patch-level (format "(patch %d)" emacs-patch-level) "") (if xemacs-betaname (concat " " xemacs-betaname) "") (if xemacs-codename (concat " \"" xemacs-codename "\"") "") (if xemacs-extra-name (concat " " xemacs-extra-name) "") " XEmacs Lucid") "Version numbers of this version of XEmacs.") ;; Moved to C code as of XEmacs 20.3 ;(defconst emacs-major-version ; (progn (or (string-match "^[0-9]+" emacs-version) ; (error "emacs-version unparsable")) ; (string-to-int (match-string 0 emacs-version))) ; "Major version number of this version of Emacs, as an integer. ;Warning, this variable did not exist in Emacs versions earlier than: ; FSF Emacs: 19.23 ; XEmacs: 19.10") ;; Moved to C code as of XEmacs 20.3 ;(defconst emacs-minor-version ; (progn (or (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) ; (error "emacs-version unparsable")) ; (string-to-int (match-string 1 emacs-version))) ; "Minor version number of this version of Emacs, as an integer. ;Warning, this variable did not exist in Emacs versions earlier than: ; FSF Emacs: 19.23 ; XEmacs: 19.10") (defconst emacs-build-time (current-time-string) "Time at which Emacs was dumped out.") (defconst emacs-build-system (system-name)) (defun emacs-version (&optional arg) "Return string describing the version of Emacs that is running. When called interactively with a prefix argument, insert string at point. Don't use this function in programs to choose actions according to the system configuration; look at `system-configuration' instead." (interactive "p") (save-match-data (let ((version-string (format "XEmacs %s %s(%s%s) of %s %s on %s" (substring emacs-version 0 (string-match " XEmacs" emacs-version)) "[Lucid] " system-configuration (cond ((or (and (fboundp 'featurep) (featurep 'mule)) (memq 'mule features)) ", Mule") (t "")) (substring emacs-build-time 0 (string-match " *[0-9]*:" emacs-build-time)) (substring emacs-build-time (string-match "[0-9]*$" emacs-build-time)) emacs-build-system))) (cond ((null arg) version-string) ((eq arg 1) (message "%s" version-string)) (t (insert version-string)))))) ;; from emacs-vers.el (defun emacs-version>= (major &optional minor patch) "Return true if the Emacs version is >= to the given MAJOR, MINOR, and PATCH numbers. The MAJOR version number argument is required, but the other arguments argument are optional. Only the Non-nil arguments are used in the test." (let ((emacs-patch (or emacs-patch-level emacs-beta-version -1))) (cond ((> emacs-major-version major)) ((< emacs-major-version major) nil) ((null minor)) ((> emacs-minor-version minor)) ((< emacs-minor-version minor) nil) ((null patch)) ((>= emacs-patch patch))))) ;;; We hope that this alias is easier for people to find. (define-function 'version 'emacs-version) (defvar Installation-file-coding-system (eval-when-compile `,(coding-system-name (find-coding-system 'native))) "The coding system used to create the `Installation' file. The `Installation' file is created by configure, and the `Installation-string' variable reflects its contents. This is initialized to reflect the native coding system at the time version.el was byte-compiled; ideally it would reflect the native coding system of the environment when XEmacs was dumped, but the locale initialization code isn't called at dump time, and the appropriate value at byte-compile time should be close enough. Note that this means that the value of `Installation-string' during dump time thus reflects loading the file using the `binary' coding system. ") (defvar Installation-string ;; Initialize Installation-string. We do it before loading ;; anything so that dumped code can make use of its value. (save-current-buffer (set-buffer (get-buffer-create (generate-new-buffer-name " *temp*"))) (insert-file-contents-internal (expand-file-name "Installation" build-directory) ;; Relies on our working out the system coding system ;; correctly at startup. nil nil nil nil ;; Installation-file-coding-system is actually respected in ;; mule/general-late.el, after all the dumped coding systems have been ;; loaded. 'binary) (prog1 (buffer-substring) (kill-buffer (current-buffer)))) "Description of XEmacs installation. This reflects the values that the configure script worked out at build time, including things like the C code features included at compile time and the installation prefix. Normally used when submitting a bug report; occasionally used, in a way the XEmacs developers don't endorse, to work out version information. ") ;;; version.el ends here
