Mercurial > emacs
view src/disptab.h @ 83425:c82829d08b89
Fix semantics of let-binding `process-environment'.
* lisp/env.el: Require cl for byte compilation. (For `block' and `return'.)
(read-envvar-name): Update for rename. Include `process-environment'
as well.
(setenv): Update for rename also handle `process-environment'. Update doc.
(getenv): Update doc.
(environment): New function.
(let-environment): New macro.
* lisp/font-lock.el (lisp-font-lock-keywords-2): Add `let-environment'.
* src/callproc.c (Vglobal_environment): New variable, taking over the
previous role of `Vprocess_environment', which is now something else.
(add_env): New function.
(child_setup): Use it.
(child_setup, getenv_internal): Rename Vprocess_environment to
Vglobal_environment. Handle the new Vprocess_environment.
(Fgetenv_internal, egetenv): Update doc.
(set_process_environment): Rename to `set_global_environment'. Rename
Vprocess_environment to Vglobal_environment.
(syms_of_callproc): Rename process-environment to global-environment,
add new process-environment, update docs.
* src/emacs.c (main): Call set_global_environment instead of
set_process_environment.
* fileio.c (Fread_file_name): Update comment.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-465
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 29 Dec 2005 01:28:33 +0000 |
parents | a0d1312ede66 |
children | 3bd95f4f2941 2d92f5c9d6ae |
line wrap: on
line source
/* Things for GLYPHS and glyph tables. Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs 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 2, or (at your option) any later version. GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Access the slots of a display-table, according to their purpose. */ #define DISP_TABLE_P(obj) \ (CHAR_TABLE_P (obj) \ && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table) \ && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS) #define DISP_TABLE_EXTRA_SLOTS 6 #define DISP_TRUNC_GLYPH(dp) ((dp)->extras[0]) #define DISP_CONTINUE_GLYPH(dp) ((dp)->extras[1]) #define DISP_ESCAPE_GLYPH(dp) ((dp)->extras[2]) #define DISP_CTRL_GLYPH(dp) ((dp)->extras[3]) #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4]) #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5]) extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int)); #define DISP_CHAR_VECTOR(dp, c) \ (SINGLE_BYTE_CHAR_P(c) ? (dp)->contents[c] : disp_char_vector ((dp), (c))) /* Defined in window.c. */ extern struct Lisp_Char_Table *window_display_table P_ ((struct window *)); /* Defined in indent.c. */ extern struct Lisp_Char_Table *buffer_display_table P_ ((void)); /* Display table to use for vectors that don't specify their own. */ extern Lisp_Object Vstandard_display_table; /* This is the `purpose' slot of a display table. */ extern Lisp_Object Qdisplay_table; /* Vector of GLYPH definitions. Indexed by GLYPH number, the contents are a string which is how to output the GLYPH. */ extern Lisp_Object Vglyph_table; /* Return the current length of the GLYPH table, or 0 if the table isn't currently valid. */ #define GLYPH_TABLE_LENGTH \ ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0) /* Return the current base (for indexing) of the GLYPH table, or 0 if the table isn't currently valid. */ #define GLYPH_TABLE_BASE \ ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0) /* Given BASE and LEN returned by the two previous macros, return nonzero if the GLYPH code G should be output as a single character with code G. Return zero if G has a string in the table. */ #define GLYPH_SIMPLE_P(base,len,g) ((g) >= (len) || !STRINGP (base[g])) /* Given BASE and LEN returned by the two previous macros, return nonzero if GLYPH code G is aliased to a different code. */ #define GLYPH_ALIAS_P(base,len,g) ((g) < (len) && INTEGERP (base[g])) /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1, return the alias for G. */ #define GLYPH_ALIAS(base, g) XINT (base[g]) /* Follow all aliases for G in the glyph table given by (BASE, LENGTH), and set G to the final glyph. */ #define GLYPH_FOLLOW_ALIASES(base, length, g) \ do { \ while (GLYPH_ALIAS_P ((base), (length), (g))) \ (g) = GLYPH_ALIAS ((base), (g)); \ if (!GLYPH_CHAR_VALID_P (FAST_GLYPH_CHAR (g))) \ g = FAST_MAKE_GLYPH (' ', FAST_GLYPH_FACE (g)); \ } while (0) /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0, return the length and the address of the character-sequence used for outputting GLYPH G. */ #define GLYPH_LENGTH(base,g) SCHARS (base[g]) #define GLYPH_STRING(base,g) SDATA (base[g]) /* GLYPH for a space character. */ #define SPACEGLYPH 040 #define NULL_GLYPH 00 #define GLYPH_FROM_CHAR(c) (c) /* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349 (do not change this comment) */