mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-03 20:24:29 +00:00
Code Issues Releases Activity

(Fdefvaralias): Rename arguments SYMBOL and ALIASED to NEW-ALIAS and

Browse Source 
BASE-VARIABLE, respectively.
This commit is contained in:
Juanma Barranquero 2005-06-14 00:39:32 +00:00
parent 922a9de306
commit 4a9308b8e2
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-06-14 Juanma Barranquero <lekktu@gmail.com>
* eval.c (Fdefvaralias): Rename arguments SYMBOL and ALIASED to
NEW-ALIAS and BASE-VARIABLE, respectively.
2005-06-13 Stefan Monnier <monnier@iro.umontreal.ca>
* xdisp.c (note_mode_line_or_margin_highlight): Lisp_Object/int mixup.

39
src/eval.c
View File

@ -722,35 +722,36 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...) */)
DEFUN ("defvaralias", Fdefvaralias, Sdefvaralias, 2, 3, 0,
doc: /* Make SYMBOL a variable alias for symbol ALIASED.
Setting the value of SYMBOL will subsequently set the value of ALIASED,
and getting the value of SYMBOL will return the value ALIASED has.
Third arg DOCSTRING, if non-nil, is documentation for SYMBOL. If it is
omitted or nil, SYMBOL gets the documentation string of ALIASED, or of the
variable at the end of the chain of aliases, if ALIASED is itself an alias.
The return value is ALIASED. */)
(symbol, aliased, docstring)
Lisp_Object symbol, aliased, docstring;
doc: /* Make NEW-ALIAS a variable alias for symbol BASE-VARIABLE.
Setting the value of NEW-ALIAS will subsequently set the value of BASE-VARIABLE,
and getting the value of NEW-ALIAS will return the value BASE-VARIABLE has.
Third arg DOCSTRING, if non-nil, is documentation for NEW-ALIAS. If it is
omitted or nil, NEW-ALIAS gets the documentation string of BASE-VARIABLE,
or of the variable at the end of the chain of aliases, if BASE-VARIABLE is
itself an alias.
The return value is BASE-VARIABLE. */)
(new_alias, base_variable, docstring)
Lisp_Object new_alias, base_variable, docstring;
{
struct Lisp_Symbol *sym;
CHECK_SYMBOL (symbol);
CHECK_SYMBOL (aliased);
CHECK_SYMBOL (new_alias);
CHECK_SYMBOL (base_variable);
if (SYMBOL_CONSTANT_P (symbol))
if (SYMBOL_CONSTANT_P (new_alias))
error ("Cannot make a constant an alias");
sym = XSYMBOL (symbol);
sym = XSYMBOL (new_alias);
sym->indirect_variable = 1;
sym->value = aliased;
sym->constant = SYMBOL_CONSTANT_P (aliased);
LOADHIST_ATTACH (symbol);
sym->value = base_variable;
sym->constant = SYMBOL_CONSTANT_P (base_variable);
LOADHIST_ATTACH (new_alias);
if (!NILP (docstring))
Fput (symbol, Qvariable_documentation, docstring);
Fput (new_alias, Qvariable_documentation, docstring);
else
Fput (symbol, Qvariable_documentation, Qnil);
Fput (new_alias, Qvariable_documentation, Qnil);
return aliased;
return base_variable;
}