Mercurial > hg > xemacs-beta
annotate lisp/version.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Feb 2010 20:51:18 -0600 |
| parents | 6a3006b37260 |
| children | 788c38f20376 |
| rev | line source |
|---|---|
| 428 | 1 ;; version.el --- Record version number of Emacs. |
| 2 | |
| 3 ;; Copyright (C) 1985, 1991-1994, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: XEmacs Development Team | |
| 6 ;; Keywords: internal, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify | |
| 11 ;; it under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, | |
| 16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 ;; GNU General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 613 | 21 ;; along with XEmacs; see the file COPYING. If not, write to the |
| 428 | 22 ;; Free Software Foundation Inc., 59 Temple Place - Suite 330, |
| 23 ;; Boston, MA 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: FSF 19.34. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This file is dumped with XEmacs. | |
| 30 | |
| 31 ;;; Code: | |
| 32 | |
| 33 (defconst xemacs-betaname | |
| 34 (and emacs-beta-version (format "(beta%d)" emacs-beta-version)) | |
| 35 "Non-nil when this is a test (beta) version of XEmacs. | |
|
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
36 Warning, this variable did not exist in XEmacs versions prior to 20.3. |
|
4523
6a3006b37260
Fix docstring typo (and commit only this fix).
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4522
diff
changeset
|
37 Its value is derived from `emacs-beta-version'. It is mutually exclusive |
|
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
38 with `emacs-patch-level'.") |
| 428 | 39 |
| 40 (defconst emacs-version | |
| 975 | 41 (format "%d.%d %s%s%s%s%s" |
| 444 | 42 emacs-major-version |
| 43 emacs-minor-version | |
| 44 (if emacs-patch-level | |
| 45 (format "(patch %d)" emacs-patch-level) | |
| 46 "") | |
| 47 (if xemacs-betaname | |
| 48 (concat " " xemacs-betaname) | |
| 49 "") | |
| 50 (if xemacs-codename | |
| 51 (concat " \"" xemacs-codename "\"") | |
| 52 "") | |
| 975 | 53 (if xemacs-extra-name |
| 54 (concat " " xemacs-extra-name) | |
| 55 "") | |
| 444 | 56 " XEmacs Lucid") |
| 428 | 57 "Version numbers of this version of XEmacs.") |
| 58 | |
| 59 (if (featurep 'infodock) | |
| 60 (require 'id-vers)) | |
| 61 | |
| 62 ;; Moved to C code as of XEmacs 20.3 | |
| 63 ;(defconst emacs-major-version | |
| 64 ; (progn (or (string-match "^[0-9]+" emacs-version) | |
| 65 ; (error "emacs-version unparsable")) | |
| 66 ; (string-to-int (match-string 0 emacs-version))) | |
| 67 ; "Major version number of this version of Emacs, as an integer. | |
| 68 ;Warning, this variable did not exist in Emacs versions earlier than: | |
| 69 ; FSF Emacs: 19.23 | |
| 70 ; XEmacs: 19.10") | |
| 71 | |
| 72 ;; Moved to C code as of XEmacs 20.3 | |
| 73 ;(defconst emacs-minor-version | |
| 74 ; (progn (or (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) | |
| 75 ; (error "emacs-version unparsable")) | |
| 76 ; (string-to-int (match-string 1 emacs-version))) | |
| 77 ; "Minor version number of this version of Emacs, as an integer. | |
| 78 ;Warning, this variable did not exist in Emacs versions earlier than: | |
| 79 ; FSF Emacs: 19.23 | |
| 80 ; XEmacs: 19.10") | |
| 81 | |
| 82 (defconst emacs-build-time (current-time-string) | |
| 83 "Time at which Emacs was dumped out.") | |
| 84 | |
| 85 (defconst emacs-build-system (system-name)) | |
| 86 | |
| 87 (defun emacs-version (&optional arg) | |
| 88 "Return string describing the version of Emacs that is running. | |
| 89 When called interactively with a prefix argument, insert string at point. | |
| 90 Don't use this function in programs to choose actions according | |
| 91 to the system configuration; look at `system-configuration' instead." | |
| 92 (interactive "p") | |
| 93 (save-match-data | |
| 94 (let ((version-string | |
| 95 (format | |
| 96 "XEmacs %s %s(%s%s) of %s %s on %s" | |
| 97 (substring emacs-version 0 (string-match " XEmacs" emacs-version)) | |
| 98 (if (not (featurep 'infodock)) | |
| 99 "[Lucid] " | |
| 100 "") | |
| 101 system-configuration | |
| 102 (cond ((or (and (fboundp 'featurep) | |
| 103 (featurep 'mule)) | |
| 104 (memq 'mule features)) ", Mule") | |
| 105 (t "")) | |
| 106 (substring emacs-build-time 0 | |
| 107 (string-match " *[0-9]*:" emacs-build-time)) | |
| 108 (substring emacs-build-time | |
| 109 (string-match "[0-9]*$" emacs-build-time)) | |
| 110 emacs-build-system))) | |
| 111 (cond | |
| 112 ((null arg) version-string) | |
| 113 ((eq arg 1) (message "%s" version-string)) | |
| 114 (t (insert version-string)))))) | |
| 115 | |
| 116 ;; from emacs-vers.el | |
| 117 (defun emacs-version>= (major &optional minor patch) | |
| 118 "Return true if the Emacs version is >= to the given MAJOR, MINOR, | |
| 119 and PATCH numbers. | |
| 120 The MAJOR version number argument is required, but the other arguments | |
| 121 argument are optional. Only the Non-nil arguments are used in the test." | |
| 122 (let ((emacs-patch (or emacs-patch-level emacs-beta-version -1))) | |
| 123 (cond ((> emacs-major-version major)) | |
| 124 ((< emacs-major-version major) nil) | |
| 125 ((null minor)) | |
| 126 ((> emacs-minor-version minor)) | |
| 127 ((< emacs-minor-version minor) nil) | |
| 128 ((null patch)) | |
| 129 ((>= emacs-patch patch))))) | |
| 130 | |
| 131 ;;; We hope that this alias is easier for people to find. | |
| 132 (define-function 'version 'emacs-version) | |
| 133 | |
| 4246 | 134 (defvar Installation-file-coding-system |
| 135 (eval-when-compile `,(coding-system-name (find-coding-system 'native))) | |
| 136 "The coding system used to create the `Installation' file. | |
| 137 | |
| 138 The `Installation' file is created by configure, and the | |
| 139 `Installation-string' variable reflects its contents. | |
| 140 | |
| 141 This is initialized to reflect the native coding system at the time | |
| 142 version.el was byte-compiled; ideally it would reflect the native coding | |
| 143 system of the environment when XEmacs was dumped, but the locale | |
| 144 initialization code isn't called at dump time, and the appropriate value | |
| 145 at byte-compile time should be close enough. Note that this means that the | |
| 146 value of `Installation-string' during dump time thus reflects loading the | |
| 147 file using the `binary' coding system. ") | |
| 428 | 148 |
| 4246 | 149 (defvar Installation-string |
| 150 ;; Initialize Installation-string. We do it before loading | |
| 151 ;; anything so that dumped code can make use of its value. | |
| 152 (save-current-buffer | |
| 153 (set-buffer (get-buffer-create (generate-new-buffer-name | |
| 154 " *temp*"))) | |
| 155 ;; insert-file-contents-internal bogusly calls | |
| 156 ;; format-decode without checking if it's defined. | |
| 157 (fset 'format-decode #'(lambda (f l &optional v) l)) | |
| 158 (insert-file-contents-internal | |
| 159 (expand-file-name "Installation" build-directory) | |
| 160 ;; Relies on our working out the system coding system | |
| 161 ;; correctly at startup. | |
| 162 nil nil nil nil | |
| 163 ;; Installation-file-coding-system is actually respected in | |
| 164 ;; mule/general-late.el, after all the dumped coding systems have been | |
| 165 ;; loaded. | |
| 166 'binary) | |
| 167 (fmakunbound 'format-decode) | |
| 168 (prog1 (buffer-substring) | |
| 169 (kill-buffer (current-buffer)))) | |
| 170 "Description of XEmacs installation. | |
| 428 | 171 |
| 4246 | 172 This reflects the values that the configure script worked out at build time, |
| 173 including things like the C code features included at compile time and the | |
| 174 installation prefix. Normally used when submitting a bug report; | |
| 175 occasionally used, in a way the XEmacs developers don't endorse, to work out | |
| 176 version information. ") | |
| 177 | |
| 178 ;;; version.el ends here |