Commit 33568849 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(Fdefvar): Only record (defvar <var>) in the load-history

in <var> has no default value yet.
parent 940cf42e
2001-05-14 Stefan Monnier <monnier@cs.yale.edu> 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. * xfaces.c (try_alternative_families): First try the FAMILY.
And if nothing is found in the end, try again with scalable fonts. 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 (try_font_list): Let try_alternative_families do a bit more of
...@@ -10,7 +13,7 @@ ...@@ -10,7 +13,7 @@
* xterm.c (note_mouse_highlight): Avoid changing the mouse * xterm.c (note_mouse_highlight): Avoid changing the mouse
pointer shape when show_mouse_face has already done it. pointer shape when show_mouse_face has already done it.
* xterm.c (x_draw_glyphs): Fix computation of rightmost x for * xterm.c (x_draw_glyphs): Fix computation of rightmost x for
full-width rows. full-width rows.
......
...@@ -686,21 +686,28 @@ If INITVALUE is missing, SYMBOL's value is not set.") ...@@ -686,21 +686,28 @@ If INITVALUE is missing, SYMBOL's value is not set.")
if (!NILP (Fcdr (Fcdr (tail)))) if (!NILP (Fcdr (Fcdr (tail))))
error ("too many arguments"); error ("too many arguments");
tem = Fdefault_boundp (sym);
if (!NILP (tail)) if (!NILP (tail))
{ {
tem = Fdefault_boundp (sym);
if (NILP (tem)) if (NILP (tem))
Fset_default (sym, Feval (Fcar (Fcdr (args)))); Fset_default (sym, Feval (Fcar (tail)));
} tail = Fcdr (tail);
tail = Fcdr (Fcdr (args)); if (!NILP (Fcar (tail)))
if (!NILP (Fcar (tail))) {
{ tem = Fcar (tail);
tem = Fcar (tail); if (!NILP (Vpurify_flag))
if (!NILP (Vpurify_flag)) tem = Fpurecopy (tem);
tem = Fpurecopy (tem); Fput (sym, Qvariable_documentation, 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; return sym;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment