Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
33568849
Commit
33568849
authored
May 14, 2001
by
Stefan Monnier
Browse files
(Fdefvar): Only record (defvar <var>) in the load-history
in <var> has no default value yet.
parent
940cf42e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
12 deletions
+22
-12
src/ChangeLog
src/ChangeLog
+4
-1
src/eval.c
src/eval.c
+18
-11
No files found.
src/ChangeLog
View file @
33568849
2001-05-14 Stefan Monnier <monnier@cs.yale.edu>
* eval.c (Fdefvar): Only record (defvar <var>) in the load-history
in <var> has no default value yet.
* xfaces.c (try_alternative_families): First try the FAMILY.
And if nothing is found in the end, try again with scalable fonts.
(try_font_list): Let try_alternative_families do a bit more of
...
...
@@ -10,7 +13,7 @@
* xterm.c (note_mouse_highlight): Avoid changing the mouse
pointer shape when show_mouse_face has already done it.
* xterm.c (x_draw_glyphs): Fix computation of rightmost x for
full-width rows.
...
...
src/eval.c
View file @
33568849
...
...
@@ -686,21 +686,28 @@ If INITVALUE is missing, SYMBOL's value is not set.")
if
(
!
NILP
(
Fcdr
(
Fcdr
(
tail
))))
error
(
"too many arguments"
);
tem
=
Fdefault_boundp
(
sym
);
if
(
!
NILP
(
tail
))
{
tem
=
Fdefault_boundp
(
sym
);
if
(
NILP
(
tem
))
Fset_default
(
sym
,
Feval
(
Fcar
(
Fcdr
(
args
))));
}
tail
=
Fcdr
(
Fcdr
(
args
));
if
(
!
NILP
(
Fcar
(
tail
)))
{
tem
=
Fcar
(
tail
);
if
(
!
NILP
(
Vpurify_flag
))
tem
=
Fpurecopy
(
tem
);
Fput
(
sym
,
Qvariable_documentation
,
tem
);
Fset_default
(
sym
,
Feval
(
Fcar
(
tail
)));
tail
=
Fcdr
(
tail
);
if
(
!
NILP
(
Fcar
(
tail
)))
{
tem
=
Fcar
(
tail
);
if
(
!
NILP
(
Vpurify_flag
))
tem
=
Fpurecopy
(
tem
);
Fput
(
sym
,
Qvariable_documentation
,
tem
);
}
LOADHIST_ATTACH
(
sym
);
}
LOADHIST_ATTACH
(
sym
);
else
/* A (defvar <var>) should not take precedence in the load-history over
an earlier (defvar <var> <val>), so only add to history if the default
value is still unbound. */
if
(
NILP
(
tem
))
LOADHIST_ATTACH
(
sym
);
return
sym
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment