* fontset.c (free_realized_fontset): Now static.

* xrdb.c: Include "xterm.h", to check x_load_resources's interface.

* xselect.c (x_own_selection, Fx_disown_selection_internal): Rename locals

to avoid shadowing.
(x_handle_dnd_message): Remove local to avoid shadowing.

* xselect.c (TRACE3) [!defined TRACE_SELECTION]: Remove; not used.

* xselect.c (x_disown_buffer_selections): Remove; not used.

* lisp.h (GCPRO1_VAR, UNGCPRO_VAR): New macros,

so that the caller can use some name other than gcpro1.
(GCPRO1, UNGCPRO): Reimplement in terms of the new macros.
(Fx_create_frame, x_create_tip_frame, Fx_show_tip):
(Fx_backspace_delete_keys_p): Rename locals to avoid shadowing.
Some of these renamings use the new GCPRO1_VAR and UNGCPRO_VAR
macros.

* xfns.c: (x_real_positions, xg_set_icon_from_xpm_data, x_create_tip_frame):

Remove unused locals.

* xfns.c (Fx_file_dialog, Fx_select_font): Fix pointer signedness.

* xfns.c (Fx_create_frame): Add braces to silence GCC warning.

* xfns.c (x_decode_color, x_set_name, x_window): Now static.

* xterm.c (x_connection_closed): Tell GCC not to suggest NO_RETURN.

* xterm.c (x_delete_glyphs, x_ins_del_lines): Mark with NO_RETURN.

* xterm.c: (x_draw_image_foreground, redo_mouse_highlight, XTmouse_position):

(x_scroll_bar_report_motion, handle_one_xevent, x_draw_bar_cursor):
(x_error_catcher, x_connection_closed, x_error_handler):
(x_error_quitter, xembed_send_message, x_iconify_frame):
(my_log_handler): Rename locals to avoid shadowing.

* xterm.c (XEMBED_VERSION, xembed_set_info): Don't define unless needed.

(x_fatal_error_signal): Remove; not used.

* xterm.c (x_iconify_frame, x_free_frame_resources): Don't declare locals

unless they are used.

* xterm.c: Don't declare local "event" unless it's used.

* xterm.c (XTread_socket): Don't define label "out" unless it's used.

* xterm.c: (x_shift_glyphs_for_insert, XTflash, XTring_bell):

(x_calc_absolute_position): Now static.

* xterm.h (x_mouse_leave): New decl.

* xterm.c (x_copy_dpy_color, x_focus_on_frame, x_unfocus_frame):

Remove unused functions.

* xfaces.c (STRDUPA, LSTRDUPA, FONT_POINT_SIZE_QUANTUM): Remove; not used.

(LFACEP): Define only if XASSERTS, as it's not needed otherwise.

* xfaces.c (Fx_list_fonts): Mark variable that gcc -Wuninitialized

does not deduce is never used uninitialized.

* xfaces.c (free_realized_faces_for_fontset): Remove; not used.

* xfaces.c (tty_defined_color, merge_face_heights): Now static.

* term.c (encode_terminal_code): Mark vars for gcc -Wuninitialized.

* xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename

or move locals to avoid shadowing.

* terminal.c (store_terminal_param): Now static.

* term.c, tparam.h (tgetflag, tgetnum, tgetstr): Move the const to the .h file

* alloc.c (mark_ttys): Move decl from here ...

* lisp.h (mark_ttys): ... to here, so that it's checked against defn.

* term.c (term_mouse_position): Rename local to avoid shadowing.

* cm.c (calccost, cmgoto): Use const pointers where appropriate.

* cm.h (struct cm): Likewise.
* dispextern.h (do_line_insertion_deletion_costs): Likewise.
* scroll.c (ins_del_costs, do_line_insertion_deletion_costs): Likewise.
* term.c (tty_ins_del_lines, calculate_costs, struct fkey_table):
(term_get_fkeys_1, append_glyphless_glyph, produce_glyphless_glyph):
(turn_on_face, init_tty): Likewise.
* termchar.h (struct tty_display_info): Likewise.
* term.c (tgetflag, tgetnum, tgetstr): Redefine to use const pointers.

* tparam.h: New file.

* term.c, tparam.h: Include it.
* deps.mk (term.o, tparam.o): Depend on tparam.h.
* term.c (tputs, tgetent, tgetflag, tgetnum, tparam, tgetstr):
Move these decls to tparam.h, and make them agree with what
is actually in tparam.c.  The previous trick of using incompatible
decls in different modules does not conform to the C standard.
All callers of tparam changed to use tparam's actual API.
* tparam.c (tparam1, tparam, tgoto):
Use const pointers where appropriate.

* term.c (encode_terminal_code): Remove unused local

* term.c (encode_terminal_code): Now static.

* cm.c (cmgoto): Mark variables that gcc -Wuninitialized does not

deduce are never used uninitialized.

* bidi.c (BIDI_BOB): Remove unused macro.

* dispextern.h (bidi_dump_cached_states): Likewise.

* bidi.c (bidi_check_type): Now static, since it's not used elsewhere.

* chartab.c (ASET_RANGE, GET_SUB_CHAR_TABLE): Remove unused macros.

* chartab.c: (sub_char_table_ref_and_range, char_table_ref_and_range):

Rename locals to avoid shadowing.

* chartab.c (copy_sub_char_table): Now static, since it's not used

elsewhere.

* character.c (string_count_byte8): Likewise.

* ccl.c (CCL_WRITE_STRING, CCL_ENCODE_CHAR, Fccl_execute_on_string):

(Fregister_code_conversion_map): Rename locals to avoid shadowing.

* category.c (copy_category_table): Now static, since it's not used elsewhere.

* category.c (hash_get_category_set): Remove unused local var.

* coding.c (detect_coding_iso_2022): Initialize a local variable that might

be used uninitialized.  Leave a FIXME because it's not clear that
this initialization is needed.

* coding.c (decode_coding_emacs_mule): Mark variables that gcc

-Wuninitialized does not deduce are never used uninitialized.

* coding.c: (ISO_CODE_LF, ISO_CODE_CR, CODING_ISO_FLAG_EUC_TW_SHIFT):

(ONE_MORE_BYTE_NO_CHECK, UTF_BOM, UTF_16_INVALID_P):
(SHIFT_OUT_OK, ENCODE_CONTROL_SEQUENCE_INTRODUCER):
(ENCODE_DIRECTION_R2L, ENCODE_DIRECTION_L2R):
Remove unused macros.

* coding.c: (decode_coding_object, encode_coding_object, detect_coding_system):

Mark variables that gcc -Wuninitialized does not deduce are never
used uninitialized.

* coding.c (decode_coding_iso_2022): Add "default: abort ();" as a safety check.

* coding.c (emacs_mule_char, encode_invocation_designation):

Now static, since they're not used elsewhere.

* coding.c (Fdefine_coding_system_internal): Don't redeclare 'i' inside

a block, when the outer 'i' will do.
(decode_coding_utf_8, decode_coding_utf_16, detect_coding_emacs_mule):
(emacs_mule_char, decode_coding_emacs_mule, detect_coding_iso_2022):
(decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5):
(decode_coding_raw_text, decode_coding_charset, get_translation_table):
(Fdecode_sjis_char, Fdefine_coding_system_internal):
Rename locals to avoid shadowing.
* character.h (FETCH_STRING_CHAR_ADVANCE): Likewise.

* coding.c (coding_set_source, coding_set_destination):

Use "else { /* comment */ }" rather than "else /* comment */;"
for clarity, and to avoid gcc -Wempty-body warning.

* charset.c (load_charset): Abort instead of using uninitialized var.

* charset.c (load_charset_map): Mark variables that gcc -Wuninitialized

does not deduce are never used uninitialized.

* charset.c: Include <limits.h>.

(Fsort_charsets): Redo min/max calculation to shorten the code a bit
and to avoid gcc -Wuninitialized warning.

* charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid

shadowing.
* charset.c (map_charset_for_dump, Fchar_charset): Likewise.

2011-03-08  Paul Eggert  <eggert@cs.ucla.edu>

* window.c (size_window): Mark variables that gcc -Wuninitialized
does not deduce are never used uninitialized.

* window.h (check_all_windows): New decl, to forestall

gcc -Wmissing-prototypes diagnostic.

* window.c (display_buffer): Now static.

* window.c (window_loop, size_window):
(run_window_configuration_change_hook, enlarge_window):
Rename locals to avoid shadowing.

* xmenu.c (next_menubar_widget_id): Declare only if USE_X_TOOLKIT,

since it's unused otherwise.

* xmenu.c (xmenu_show, xdialog_show, xmenu_show): Make local pointers "const"

since they might point to immutable storage.

* xdisp.c (redisplay_window): Rename local to avoid shadowing.

Merge from mainline.

* xmenu.c (xmenu_show): Rename parameter to avoid shadowing.

Revert incorrect logic in 2011-03-06T07:50:01Z!eggert@cs.ucla.edu.

* src/xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 change.

* xmenu.c (set_frame_menubar): Remove unused local.

* xmenu.c (menu_highlight_callback): Now static.

xdisp.c (draw_glyphs):
Mark variables that gcc -Wuninitialized cannot deduce are never
used uninitialized.

xdisp.c (draw_glyphs):
Mark variables that gcc -Wuninitialized cannot deduce are never
used uninitialized.

xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Mark variables that
gcc -Wuninitialized cannot deduce are never used uninitialized.

Document package archives in the Lisp manual.

* doc/lispref/package.texi: Update index keywords.
(Package Archives): New node contents.  Document package-x.el.

* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function):
Don't change the syntax of a \n that closes a comment.

Fixes: debbugs:8169

Usability improvements to commands in package-x.el.

* lisp/emacs-lisp/package-x.el (package-archive-upload-base): Make it a
defcustom.
(package--update-file): Doc fix.  Accept relative file names.
(package--archive-contents-from-file): Remove the argument, since
it's necessarily always "archive-contents".
(package-maint-add-news-item): Pass relative file name args to
package--update-file.
(package-upload-buffer-internal): Prompt for a destination if
package-archive-upload-base is invalid.  Create the directory if
it does not exist.
(package-upload-buffer, package-upload-file): Doc fix.

* xdisp.c (display_line): Mark variables that gcc -Wuninitialized cannot

deduce are never used uninitialized.
* lisp.h (IF_LINT): New macro, copied from ../lib-src/emacsclient.c
which in turn is copied from coreutils.

doc/lispref/makefile.w32-in (srcs): Add package.texi.

* xdisp.c (Fcurrent_bidi_paragraph_direction): Simplify slightly; this

avoids a gcc -Wuninitialized diagnostic.

* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.

Add a FIXME comment, since the code still doesn't look right.

Bind C-y in Isearch to isearch-yank-kill.

* lisp/isearch.el (isearch-mode-map): Bind C-y to isearch-yank-kill,
and move isearch-yank-line to M-s C-e.

* doc/emacs/search.texi (Isearch Yank): C-y now bound to isearch-yank-kill.

(c-guess-basic-syntax): Move CASE 19 to a different place, correctly to
process template-args-cont lines.

progmodes/cc-engine.el (c-guess-basic-syntax): Reindent.

Improve packaging documentation.

* package.texi (Packaging, Packaging Basics, Simple Packages)
(Multi-file Packages): Expand and clarify.
(Package Archives): Temporary placeholder node.

* elisp.texi (Top): Update node listing.

Merge: current_column: Now returns EMACS_INT, fixing some iftc
that was introduced in the 2002-06-02 change "temporarily"; see
<http://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
* bytecode.c (Fbyte_code): Don't cast current_column () to int.
* cmds.c (internal_self_insert): Likewise.
* indent.c (Fcurrent_column): Likewise.
* keymap.c (describe_command): Likewise.
* minibuf.c (read_minibuf): Likewise.
* indent.c (Fcurrent_indentation): Don't cast position_indentation ()
to int.
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
Likewise.
* cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
not int or double, if they might contain a column number.
* indent.c (current_column, Findent_to, indented_beyond_p):
(compute_motion, vmotion): Likewise.
* keymap.c (describe_command): Likewise.
* xdisp.c (pint2str): Likewise.
* indent.c (last_known_column): Now EMACS_INT, not int.
* minibuf.c (minibuf_prompt_width): Likewise.
* indent.c (current_column, current_column_1, position_indentation):
Return EMACS_INT, not double.
* lisp.h (current_column): Likewise.
* indent.c (indented_beyond_p): Last arg is now EMACS_INT, not double.
All callers changed.
* lisp.h (indented_beyond_p): Likewise.

* minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here
from xdisp.c, and make static, since these are used only here.
* window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
Remove decls.
* xdisp.c (redisplay_window): Reindent to match Emacs style.

current_column: Now returns EMACS_INT, fixing some iftc.

* bytecode.c (Fbyte_code): Don't cast current_column () to int.
* cmds.c (internal_self_insert): Likewise.
* indent.c (Fcurrent_column): Likewise.
* keymap.c (describe_command): Likewise.
* minibuf.c (read_minibuf): Likewise.
* indent.c (Fcurrent_indentation): Don't cast position_indentation ()
to int.
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
Likewise.
* cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
not int or double, if they might contain a column number.
* indent.c (current_column, Findent_to, indented_beyond_p):
(compute_motion, vmotion): Likewise.
* keymap.c (describe_command): Likewise.
* xdisp.c (pint2str): Likewise.
* indent.c (last_known_column): Now EMACS_INT, not int.
* minibuf.c (minibuf_prompt_width): Likewise.
* indent.c (current_column, current_column_1, position_indentation):
Return EMACS_INT, not double.
* lisp.h (current_column): Likewise.
* indent.c (indented_beyond_p): Last arg is now EMACS_INT, not double.
All callers changed.
* lisp.h (indented_beyond_p): Likewise.

* xdisp.c (redisplay_window): Likewise.

* minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here

from xdisp.c, and make static, since these are used only here.
* window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
Remove decls.

* cmds.c (internal_self_insert): Reindent to match Emacs style.

* xdisp.c (SKIP_GLYPHS): Removed unused macro.

* xdisp.c (update_window_cursor):  Now static, since it's not used elsewhere.

* xdisp.c (produce_glyphless_glyph): Make a pointer "const"

since it might point to immutable storage.

* xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var.

Merge from mainline.

* xdisp.c: Rename or move local decls to avoid shadowing.

(init_iterator, handle_fontified_prop, handle_single_display_spec):
(message_dolog, message_with_string, redisplay_internal):
(redisplay_window, try_window_reusing_current_matrix, try_window_id):
(compute_line_metrics, highlight_trailing_whitespace, cursor_row_p):
(display_line, display_string, rows_from_pos_range):
(mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
Rename or move local decls.

Add package.texi to doc/lispref/Makefile.in.

* calc/calc-units.el (math-midi-round): Translate calc-note-threshold
  to an appropriate fraction.

* calc/calc-units.el (math-midi-round, math-freqp, math-midip)
  (math-spnp, math-spn-to-midi, math-midi-to-spn, math-freq-to-spn)
  (math-midi-to-freq, math-spn-to-freq, calcFunc-spn, calcFunc-midi)
  (calcFunc-freq, calc-freq, calc-midi, calc-spn): New functions.
  (math-notes): New variable.

* calc/calc.el (calc-note-threshold): New variable.

* calc/calc-ext.el (calc-init-extensions): Add keybindings for
  calc-spn, calc-midi, calc-freq.  Add autoloads for calcFunc-spn,
  calcFunc-midi, calcFunc-freq, calc-spn, calc-midi and calc-freq.

* doc/misc/calc.tex (Musical Notes): New section.
  (Customizing Calc): Mention calc-note-threshold.

* doc/misc/calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-ext.el (calc-init-extensions): Rename calc-logunits-dblevel
  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-units.el (calc-dblevel): Rename from calc-logunits-dblevel.
  (calc-nplevel): Rename from calc-logunits-nplevel.

Allow specifying local ELPA mirrors in package-archives.

* emacs-lisp/package.el (package-archives): Accept either ordinary
directory names, in addition to HTTP URLs.
(package--with-work-buffer): New macro.   Handle normal directories.
(package-handle-response): Don't display the failing buffer.
(package-download-single, package-download-tar)
(package--download-one-archive): Use package--with-work-buffer.
(package-archive-base): Rename from package-archive-url.

Mention xmodmap-generic-mode in NEWS.