diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-16 13:07:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-16 13:07:17 -0700 |
| commit | 91a3e27bb7ee79474b8b470b3b8d755f92e5721f (patch) | |
| tree | c970bc82b26b0de234c6b60be7db7f95e17199b9 | |
| parent | 7a3fb1252cb12c742b395fd53a6ce6a9e473704f (diff) | |
| download | emacs-91a3e27bb7ee79474b8b470b3b8d755f92e5721f.tar.gz | |
* xfns.c (Fx_file_dialog): Rename local to avoid shadowing.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfns.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d1343b246ee..6cfb8bd3ed9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> + * xfns.c (Fx_file_dialog): Rename local to avoid shadowing. + * xdisp.c (x_produce_glyphs): Avoid possibly-uninitialized var. * xfns.c (x_real_positions): Mark locals as initialized. diff --git a/src/xfns.c b/src/xfns.c index 846ba16d1ba..51aca3e9670 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5462,12 +5462,12 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */) /* Get the result. */ if (result == XmCR_OK) { - XmString text; + XmString text_string; String data; - XtVaGetValues (dialog, XmNtextString, &text, NULL); - XmStringGetLtoR (text, XmFONTLIST_DEFAULT_TAG, &data); - XmStringFree (text); + XtVaGetValues (dialog, XmNtextString, &text_string, NULL); + XmStringGetLtoR (text_string, XmFONTLIST_DEFAULT_TAG, &data); + XmStringFree (text_string); file = build_string (data); XtFree (data); } |