Mercurial > hg > xemacs-beta
annotate lisp/paths.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 | aa5ed11f473b |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; paths.el --- define pathnames for use by various Emacs commands. |
| 2 | |
| 3 ;; Copyright (C) 1986, 1988, 1993, 1994, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: FSF | |
| 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 it | |
| 11 ;; 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, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 22 ;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 23 | |
| 24 ;;; Synched up with: FSF 19.30. | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;; This file is dumped with XEmacs. | |
| 29 | |
| 30 ;; These are default settings for names of certain files and directories | |
| 31 ;; that Emacs needs to refer to from time to time. | |
| 32 | |
| 33 ;; If these settings are not right, override them with `setq' | |
| 34 ;; in site-start.el. Do not change this file. | |
| 35 | |
| 36 ;;; Code: | |
| 37 | |
| 38 ;Note: FSF's version is: | |
| 39 ;(defvar Info-default-directory-list | |
| 40 ; (let ((start (list "/usr/local/lib/info/" | |
| 41 ; ;; This comes second so that, if it is the same | |
| 42 ; ;; as configure-info-directory (which is usually true) | |
| 43 ; ;; and Emacs has been installed (also usually true) | |
| 44 ; ;; then the list will end with two copies of this; | |
| 45 ; ;; which means that the last dir file Info-insert-dir | |
| 46 ; ;; finds will be the one in this directory. | |
| 47 ; "/usr/local/info/")) | |
| 48 ; (configdir (file-name-as-directory configure-info-directory))) | |
| 49 ; (setq start (nconc start (list configdir))) | |
| 50 ; start) | |
| 51 ; "List of directories to search for Info documentation files. | |
| 52 ;They are searched in the order they are given in this list. | |
| 53 ;Therefore, the directory of Info files that come with Emacs | |
| 54 ;normally should come last (so that local files override standard ones).") | |
| 55 | |
| 56 ;Our commented-out version is: | |
| 57 ;(defvar Info-default-directory-list | |
| 58 ; (let ((start (list "/usr/local/info/" | |
| 59 ; "/usr/local/lib/info/")) | |
| 60 ; (configdir (file-name-as-directory configure-info-directory))) | |
| 61 ; (or (member configdir start) | |
| 62 ; (setq start (nconc start (list configdir)))) | |
| 63 ; (or (member (expand-file-name "../info/" data-directory) start) | |
| 64 ; (setq start | |
| 65 ; (nconc start | |
| 66 ; (list (expand-file-name "../info/" data-directory))))) | |
| 67 ; start) | |
| 68 ; "List of directories to search for Info documentation files.") | |
| 69 | |
| 70 (defvar news-path "/usr/spool/news/" | |
| 71 "The root directory below which all news files are stored.") | |
| 72 | |
| 73 (defvar news-inews-program nil | |
| 74 "Program to post news.") | |
| 75 | |
| 76 ;(defvar gnus-default-nntp-server "" | |
| 77 ; ;; set this to your local server | |
| 78 ; "The name of the host running an NNTP server. | |
| 79 ;If it is a string such as \":DIRECTORY\", then ~/DIRECTORY | |
| 80 ;is used as a news spool. `gnus-nntp-server' is initialized from NNTPSERVER | |
| 81 ;environment variable or, if none, this value.") | |
| 82 | |
| 83 ;(defvar gnus-nntp-service "nntp" | |
| 84 ; "NNTP service name, usually \"nntp\" or 119). | |
| 85 ;Go to a local news spool if its value is nil, in which case `gnus-nntp-server' | |
| 86 ;should be set to `(system-name)'.") | |
| 87 | |
| 88 (defvar mh-progs nil | |
| 89 "Directory containing MH commands.") | |
| 90 | |
| 91 (defvar mh-lib nil | |
| 92 "Directory of MH library.") | |
| 93 | |
| 444 | 94 (defvar rmail-file-name "~/RMAIL" |
| 428 | 95 "Name of user's primary mail file.") |
| 96 | |
| 97 (defconst rmail-spool-directory nil | |
| 98 "Name of directory used by system mailer for delivering new mail. | |
| 99 Its name should end with a slash.") | |
| 100 | |
| 101 (defconst sendmail-program nil | |
| 102 "Program used to send messages.") | |
| 103 | |
| 104 (defconst remote-shell-program nil | |
| 105 "Program used to execute shell commands on a remote machine.") | |
| 106 | |
| 444 | 107 (defconst term-file-prefix "term/" |
| 428 | 108 "If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))) |
| 109 You may set this variable to nil in your `.emacs' file if you do not wish | |
| 110 the terminal-initialization file to be loaded.") | |
| 111 | |
| 112 (defconst manual-program nil | |
| 113 "Program to run to print man pages.") | |
| 114 | |
| 444 | 115 (defconst abbrev-file-name "~/.abbrev_defs" |
| 428 | 116 "*Default name of file to read abbrevs from.") |
| 117 | |
| 118 (defconst directory-abbrev-alist nil) | |
| 119 | |
| 120 ;; Formerly, the values of these variables were computed once | |
| 121 ;; (at dump time). However, with the advent of pre-compiled binaries | |
| 122 ;; and homebrewed systems such as Linux where who knows where the | |
| 123 ;; hell the various programs may be located (if they even exist at all), | |
| 124 ;; it's clear that we need to recompute these values at run time. | |
| 125 ;; In typical short-sightedness, site administrators have been told up | |
| 126 ;; till now to do `setq's in site-init.el, which is run only once -- | |
| 127 ;; at dump time. So we have to do contortions to make sure we don't | |
| 128 ;; override values set in site-init.el. | |
| 129 | |
| 130 (defun initialize-xemacs-paths () | |
| 131 "Initialize the XEmacs path variables from the environment. | |
| 132 Called automatically at dump time and run time. Do not call this. | |
| 133 Will not override settings in site-init.el or site-run.el." | |
| 134 (let ((l #'(lambda (var value) | |
| 135 (let ((origsym (intern (concat "paths-el-original-" | |
| 136 (symbol-name var))))) | |
| 137 (if (running-temacs-p) | |
| 138 (progn | |
| 139 (set var value) | |
| 140 (set origsym value)) | |
| 141 (and (eq (symbol-value var) (symbol-value origsym)) | |
| 142 (set var value))))))) | |
| 143 (funcall | |
| 144 l 'news-inews-program | |
| 145 (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews") | |
| 146 ((file-exists-p "/usr/local/inews") "/usr/local/inews") | |
| 147 ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews") | |
| 148 ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews") | |
| 149 (t "inews"))) | |
| 150 | |
| 151 (funcall | |
| 152 l 'mh-progs | |
|
4759
aa5ed11f473b
Remove support for obsolete systems. See xemacs-patches message with ID
Jerry James <james@xemacs.org>
parents:
444
diff
changeset
|
153 (cond ((file-directory-p "/usr/bin/mh") "/usr/bin/mh/") |
| 428 | 154 ((file-directory-p "/usr/local/bin/mh") "/usr/local/bin/mh/") |
| 155 ((file-directory-p "/usr/local/mh") "/usr/local/mh/") | |
| 156 (t "/usr/local/bin/"))) | |
| 157 | |
| 158 (funcall | |
| 159 l 'mh-libs | |
|
4759
aa5ed11f473b
Remove support for obsolete systems. See xemacs-patches message with ID
Jerry James <james@xemacs.org>
parents:
444
diff
changeset
|
160 (cond ((file-directory-p "/usr/lib/mh") "/usr/lib/mh/") |
| 428 | 161 ((file-directory-p "/usr/local/lib/mh") "/usr/local/lib/mh/") |
| 162 (t "/usr/local/bin/mh/"))) | |
| 163 | |
| 164 (funcall | |
| 165 l 'rmail-spool-directory | |
|
4759
aa5ed11f473b
Remove support for obsolete systems. See xemacs-patches message with ID
Jerry James <james@xemacs.org>
parents:
444
diff
changeset
|
166 (cond ;; SVR4 and recent BSD are said to use this. |
| 428 | 167 ;; Rather than trying to know precisely which systems use it, |
| 168 ;; let's assume this dir is never used for anything else. | |
| 169 ((file-exists-p "/var/mail") | |
| 170 "/var/mail/") | |
|
4759
aa5ed11f473b
Remove support for obsolete systems. See xemacs-patches message with ID
Jerry James <james@xemacs.org>
parents:
444
diff
changeset
|
171 ((memq system-type '(hpux usg-unix-v irix)) |
| 428 | 172 "/usr/mail/") |
| 173 ((memq system-type '(linux)) | |
| 174 "/var/spool/mail/") | |
| 175 (t "/usr/spool/mail/"))) | |
| 176 | |
| 177 (funcall | |
| 178 l 'sendmail-program | |
| 179 (cond | |
| 180 ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") | |
| 181 ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") | |
| 182 ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") | |
| 183 (t "fakemail"))) ;In ../etc, to interface to /bin/mail. | |
| 184 | |
| 185 (funcall | |
| 186 l 'remote-shell-program | |
| 187 (cond | |
| 188 ;; Some systems use rsh for the remote shell; others use that | |
| 189 ;; name for the restricted shell and use remsh for the remote | |
| 190 ;; shell. Let's try to guess based on what we actually find | |
| 191 ;; out there. The restricted shell is almost certainly in | |
| 192 ;; /bin or /usr/bin, so it's probably safe to assume that an | |
| 193 ;; rsh found elsewhere is the remote shell program. The | |
| 194 ;; converse is not true: /usr/bin/rsh could be either one, so | |
| 195 ;; check that last. | |
| 196 ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh") | |
| 197 ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh") | |
| 198 ((file-exists-p "/bin/remsh") "/bin/remsh") | |
| 199 ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh") | |
| 200 ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh") | |
| 201 ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh") | |
| 202 ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh") | |
| 203 ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh") | |
| 204 ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd") | |
| 205 ((file-exists-p "/bin/rcmd") "/bin/rcmd") | |
| 206 ((file-exists-p "/bin/rsh") "/bin/rsh") | |
| 207 ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh") | |
| 208 (t "rsh"))) | |
| 209 | |
| 210 (funcall | |
| 211 l 'manual-program | |
| 212 ;; Solaris 2 has both of these files; prefer /usr/ucb/man | |
| 213 ;; because the other has nonstandard argument conventions. | |
| 214 (if (file-exists-p "/usr/ucb/man") | |
| 215 "/usr/ucb/man" "/usr/bin/man")) | |
| 216 | |
| 217 (funcall | |
| 218 l 'directory-abbrev-alist | |
| 219 ;; Try to match various conventions for automounter temporary | |
| 220 ;; mount points. These temporary mount points may go away, so | |
| 221 ;; it's important that we only try to read files under the | |
| 222 ;; "advertised" mount point, rather than the temporary one, or it | |
| 223 ;; will look like files have been deleted on us. Whoever came up | |
| 224 ;; with this design is clearly a moron of the first order, but | |
| 225 ;; now we're stuck with it, no doubt until the end of time. | |
| 226 ;; | |
| 227 ;; For best results, automounter junk should go near the front of this | |
| 228 ;; list, and other user translations should come after it. | |
| 229 ;; | |
| 230 ;; Our code handles the following empirically observed conventions: | |
| 231 ;; /net is an actual directory! (some systems are not broken!) | |
| 232 ;; /net/HOST -> /tmp_mnt/net/HOST (`standard' old Sun automounter) | |
| 233 ;; /net/HOST -> /tmp_mnt/HOST (BSDI 4.0) | |
| 234 ;; /net/HOST -> /a/HOST (Freebsd 2.2.x) | |
| 235 ;; /net/HOST -> /amd/HOST (seen in amd sample config files) | |
| 236 ;; | |
| 237 ;; If your system has a different convention, you may have to change this. | |
| 238 ;; Don't forget to send in a patch! | |
| 239 (when (file-directory-p "/net") | |
| 240 (append | |
| 241 (when (file-directory-p "/tmp_mnt") | |
| 242 (if (file-directory-p "/tmp_mnt/net") | |
| 243 '(("\\`/tmp_mnt/net/" . "/net/")) | |
| 244 '(("\\`/tmp_mnt/" . "/net/")))) | |
| 245 (when (file-directory-p "/a") | |
| 246 '(("\\`/a/" . "/net/"))) | |
| 247 (when (file-directory-p "/amd") | |
| 248 '(("\\`/amd/" . "/net/"))) | |
| 249 ))) | |
| 250 )) | |
| 251 | |
| 252 (if (running-temacs-p) | |
| 253 (initialize-xemacs-paths)) | |
| 254 | |
| 255 ;;; paths.el ends here |