Mercurial > emacs
view src/=environ.c @ 4872:628cbf7e7005
(comint-after-partial-file-name-command):
Renamed from comint-after-partial-pathname-command.
(comint-match-partial-file-name, comint-after-partial-file-name):
Renamed from comint-match-partial-pathname, etc.
(comint-last-output-start): New variable to record
where most recent process output started from.
(comint-mode): Initialise it.
(comint-output-filter): Set it.
(comint-previous-matching-input-string): Moved to
comint-previous-matching-input-position.
(comint-previous-matching-input-string): Use it.
(comint-search-arg, comint-search-start,
comint-previous-input-string): New subroutines.
(comint-previous-input, comint-next-input,
comint-previous-matching-input, comint-next-matching-input,
comint-previous-matching-input-from-input,
comint-next-matching-input-from-input): Use them.
(comint-mode-map): Added signal menu-bar. Moved
comint-backward/forward-matching-input to output menu-bar, since
they move within the buffer rather than do input.
(comint-send-input, comint-after-pmark-p,
comint-kill-input, comint-proc-query): Removed serialisation of
obtaining the process mark's marker-position.
Commented out comint-load-hooks.
(comint-dynamic-simple-complete): New subroutine.
(comint-dynamic-complete-filename-command): New variable.
(comint-after-partial-pathname-command): New variable.
(comint-after-partial-pathname): New subroutine.
(comint-dynamic-complete): Use them.
(comint-mode): Make them local.
Renamed comint-dynamic-complete-command to
comint-dynamic-complete-command-command for consistency.
Renamed comint-file-name-addsuffix/autolist/recexact to
comint-completion-addsuffix/autolist/recexact for consistency.
(comint-replace-by-expanded-history): Check if input
ring size is not big enough for relative reference.
(comint-read-input-ring, comint-input-ring-file-name):
From shell.el.
(shell-write-input-ring): New subroutine.
(comint-file-name-prefix): New variable.
(comint-directory): New inline subroutine.
(comint-dynamic-complete-filename, comint-dynamic-complete-variable,
comint-dynamic-list-filename-completions): Use it.
(comint-dynamic-complete-filename,
comint-dynamic-complete-variable,
comint-dynamic-list-filename-completions): Make sure local
completion-ignore-case is nil.
(comint-next-prompt, comint-previous-prompt): Use
paragraph-start and paragraph motion commands rather than
re-search-forward and re-search-backward commands.
(comint-dynamic-list-input-ring,
comint-previous-matching-input-string): Use ring-empty-p rather
than zerop and ring-length.
(comint-input-ignoredups): New variable.
(comint-send-input, shell-read-input-ring): Use it.
(comint-mode): Make comint-input-ignoredups local. Doc fix.
(comint-scroll-to-bottom-on-input): New variable.
(comint-scroll-to-bottom-on-output): New variable.
(comint-scroll-show-maximum-output): New variable.
(comint-output-filter-hook): New variable, defaults to
comint-postoutput-scroll-to-bottom.
(comint-output-filter): Renamed from comint-filter
for consistency. Now calls comint-output-filter-hook.
(comint-preinput-scroll-to-bottom): New subroutine.
(comint-postoutput-scroll-to-bottom): New subroutine.
(comint-show-maximum-output): New command.
(comint-copy-old-input): New command.
(comint-send-input): Run comint-output-filter-hook if
necessary as a kludge to prevent messy redisplays.
(comint-mode-map): Added comint-show-maximum-output to
C-c C-e and menu-bar output, and comint-copy-old-input to C-c C-i
and menu-bar input.
(comint-mode): Make local variables
comint-scroll-to-bottom-on-input, before-change-function,
comint-scroll-to-bottom-on-output, comint-scroll-show-maximum-output,
and comint-output-filter-hook.
(comint-version): Deleted--no need for separate version.
(comint-input-ring-index): Make this a permanent local.
(comint-mode): Don't alter comint-input-ring-index or comint-input-ring
if already set meaningfully.
(comint-mode-map): Added keys M-R/S for
comint-previous/next-matching-input-from-input and to completion
menu-bar. Added comint-forward/backward-matching-input and
comint-previous/next-matching-input to completion menu-bar.
(comint-mode): Doc fix for functionality.
(comint-exec-1): Uses setenv.
(comint-update-env): Removed.
(comint-input-ring-size): Incremented to 32, as with
command history.
(comint-dynamic-list-input-ring): Check for zero
length ring. Use ring length, not ring size, when generating
list. Use buffer " *Input History*".
(comint-previous-matching-input-string): Check for zero-length ring.
Check last item in case at end of cycle and it's a match.
(comint-searching-input-ring): New subroutine.
(comint-regexp-arg): New subroutine.
(comint-previous-matching-input-from-input): New command.
(comint-next-matching-input-from-input): New command.
(comint-replace-by-expanded-history): Fix for matching
inside quotes. Fix to allow argument subrange specifiers. Fix to
identify and reject absolute input number references.
(comint-within-quotes): New subroutine.
(comint-how-many-region): New subroutine.
(comint-args): New subroutine.
(comint-delim-arg): New subroutine.
(comint-arguments): New subroutine.
(comint-delimiter-argument-list): New variable.
(comint-send-input): Inserts input arguments into ring
separated by single spaces.
(comint-filter): Checks the buffer's process to make
sure it's still there. Otherwise, set-buffer will fail.
(comint-backward-matching-input): New command.
(comint-forward-matching-input): New command.
(comint-next-prompt, comint-previous-prompt):
Error if reach beg/end of buffer.
(comint-dynamic-complete): Fix for absolute input
number references.
(comint-dynamic-complete-filename): Changed listings
function to comint-dynamic-list-filename-completions. Uses
file-directory-p rather than string-match to test for directories.
(comint-dynamic-list-completions): Changed to list the
list of completions supplied as the function argument. Use buffer
" *Completions*".
(comint-match-partial-pathname): New subroutine.
(comint-dynamic-complete-variable): New command.
(comint-dynamic-list-filename-completions): New function.
(comint-previous-input):
Don't use replace-match; just insert before deleting.
(comint-magic-space): Use self-insert command.
(comint-history-file-name): New variable.
(comint-mode): Initialize comint-input-ring before
running comint-mode-hook.
(comint-input-autoexpand): New variable.
(comint-dynamic-complete-command): New variable.
(comint-get-current-command): New variable.
(comint-read-input-ring): New function.
(comint-send-input): Handle history expansion.
(comint-input-sentinel): Doc fix.
(comint-mode-map): Added key binding for C-c C-h.
Added menu bars for completion, input and output.
(comint-dynamic-list-input-ring): New function.
(comint-previous-input-string): New subroutine.
(comint-previous-input): Use it.
(comint-previous-matching-input-string): New subroutine.
(comint-previous-matching-input): Use it.
(comint-replace-by-expanded-history): New command.
(comint-magic-space): New command.
(comint-replace-by-expanded-filename): Now replaces
expanded match for a filename, and then calls filename completion
comint-dynamic-complete-filename to do file name completion.
(comint-kill-output): Don't kill prompt.
(comint-show-output): Don't move point if it's
visible where it is, and if point is moved, put it after prompt.
(comint-dynamic-complete): Totally new definition.
(comint-dynamic-complete-filename): New name for old
function comint-dynamic-complete, completes files and lists
candidates, souped up for configurability.
(comint-dynamic-complete-variable): New command.
(comint-file-name-autolist): New variable.
(comint-file-name-addsuffix): New variable,
(comint-file-name-recexact): New variable.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 22 Oct 1993 02:57:36 +0000 |
parents | c7c930b84dbb |
children |
line wrap: on
line source
/* Environment-hacking for GNU Emacs subprocess Copyright (C) 1986 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 1, 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "config.h" #include "lisp.h" #ifdef MAINTAIN_ENVIRONMENT #ifdef VMS you lose -- this is un*x-only #endif /* alist of (name-string . value-string) */ Lisp_Object Venvironment_alist; extern char **environ; void set_environment_alist (str, val) register Lisp_Object str, val; { register Lisp_Object tem; tem = Fassoc (str, Venvironment_alist); if (NULL (tem)) if (NULL (val)) ; else Venvironment_alist = Fcons (Fcons (str, val), Venvironment_alist); else if (NULL (val)) Venvironment_alist = Fdelq (tem, Venvironment_alist); else XCONS (tem)->cdr = val; } static void initialize_environment_alist () { register unsigned char **e, *s; extern char *index (); for (e = (unsigned char **) environ; *e; e++) { s = (unsigned char *) index (*e, '='); if (s) set_environment_alist (make_string (*e, s - *e), build_string (s + 1)); } } unsigned char * getenv_1 (str, ephemeral) register unsigned char *str; int ephemeral; /* if ephmeral, don't need to gc-proof */ { register Lisp_Object env; int len = strlen (str); for (env = Venvironment_alist; CONSP (env); env = XCONS (env)->cdr) { register Lisp_Object car = XCONS (env)->car; register Lisp_Object tem = XCONS (car)->car; if ((len == XSTRING (tem)->size) && (!bcmp (str, XSTRING (tem)->data, len))) { /* Found it in the lisp environment */ tem = XCONS (car)->cdr; if (ephemeral) /* Caller promises that gc won't make him lose */ return XSTRING (tem)->data; else { register unsigned char **e; unsigned char *s; int ll = XSTRING (tem)->size; /* Look for element in the original unix environment */ for (e = (unsigned char **) environ; *e; e++) if (!bcmp (str, *e, len) && *(*e + len) == '=') { s = *e + len + 1; if (strlen (s) >= ll) /* User hasn't either hasn't munged it or has set it to something shorter -- we don't have to cons */ goto copy; else goto cons; }; cons: /* User has setenv'ed it to a diferent value, and our caller isn't guaranteeing that he won't stash it away somewhere. We can't just return a pointer to the lisp string, as that will be corrupted when gc happens. So, we cons (in such a way that it can't be freed -- though this isn't such a problem since the only callers of getenv (as opposed to those of egetenv) are very early, before the user -could- have frobbed the environment. */ s = (unsigned char *) xmalloc (ll + 1); copy: bcopy (XSTRING (tem)->data, s, ll + 1); return (s); } } } return ((unsigned char *) 0); } /* unsigned -- stupid delcaration in lisp.h */ char * getenv (str) register unsigned char *str; { return ((char *) getenv_1 (str, 0)); } unsigned char * egetenv (str) register unsigned char *str; { return (getenv_1 (str, 1)); } #if (1 == 1) /* use caller-alloca versions, rather than callee-malloc */ int size_of_current_environ () { register int size; Lisp_Object tem; tem = Flength (Venvironment_alist); size = (XINT (tem) + 1) * sizeof (unsigned char *); /* + 1 for environment-terminating 0 */ for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { register Lisp_Object str, val; str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; size += (XSTRING (str)->size + XSTRING (val)->size + 2); /* 1 for '=', 1 for '\000' */ } return size; } void get_current_environ (memory_block) unsigned char **memory_block; { register unsigned char **e, *s; register int len; register Lisp_Object tem; e = memory_block; tem = Flength (Venvironment_alist); s = (unsigned char *) memory_block + (XINT (tem) + 1) * sizeof (unsigned char *); for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { register Lisp_Object str, val; str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; *e++ = s; len = XSTRING (str)->size; bcopy (XSTRING (str)->data, s, len); s += len; *s++ = '='; len = XSTRING (val)->size; bcopy (XSTRING (val)->data, s, len); s += len; *s++ = '\000'; } *e = 0; } #else /* dead code (this function mallocs, caller frees) superseded by above (which allows caller to use alloca) */ unsigned char ** current_environ () { unsigned char **env; register unsigned char **e, *s; register int len, env_len; Lisp_Object tem; Lisp_Object str, val; tem = Flength (Venvironment_alist); env_len = (XINT (tem) + 1) * sizeof (char *); /* + 1 for terminating 0 */ len = 0; for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; len += (XSTRING (str)->size + XSTRING (val)->size + 2); } e = env = (unsigned char **) xmalloc (env_len + len); s = (unsigned char *) env + env_len; for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; *e++ = s; len = XSTRING (str)->size; bcopy (XSTRING (str)->data, s, len); s += len; *s++ = '='; len = XSTRING (val)->size; bcopy (XSTRING (val)->data, s, len); s += len; *s++ = '\000'; } *e = 0; return env; } #endif /* dead code */ DEFUN ("getenv", Fgetenv, Sgetenv, 1, 2, "sEnvironment variable: \np", "Return the value of environment variable VAR, as a string.\n\ When invoked interactively, print the value in the echo area.\n\ VAR is a string, the name of the variable,\n\ or the symbol t, meaning to return an alist representing the\n\ current environment.") (str, interactivep) Lisp_Object str, interactivep; { Lisp_Object val; if (str == Qt) /* If arg is t, return whole environment */ return (Fcopy_alist (Venvironment_alist)); CHECK_STRING (str, 0); val = Fcdr (Fassoc (str, Venvironment_alist)); if (!NULL (interactivep)) { if (NULL (val)) message ("%s not defined in environment", XSTRING (str)->data); else message ("\"%s\"", XSTRING (val)->data); } return val; } DEFUN ("setenv", Fsetenv, Ssetenv, 1, 2, "sEnvironment variable: \nsSet %s to value: ", "Set the value of environment variable VAR to VALUE.\n\ Both args must be strings. Returns VALUE.") (str, val) Lisp_Object str; Lisp_Object val; { Lisp_Object tem; CHECK_STRING (str, 0); if (!NULL (val)) CHECK_STRING (val, 0); set_environment_alist (str, val); return val; } syms_of_environ () { staticpro (&Venvironment_alist); defsubr (&Ssetenv); defsubr (&Sgetenv); } init_environ () { Venvironment_alist = Qnil; initialize_environment_alist (); } #endif /* MAINTAIN_ENVIRONMENT */