Fix menu bar activation with click for Motif/Lesstif.

* src/xdisp.c (pending_menu_activation): Remove extern declaration.
(prepare_menu_bars): Remove setting of pending_menu_activation.

* src/xmenu.c (pending_menu_activation): Remove.
(x_activate_menubar): Set popup_activated_flag for Xt also. Remove
setting of pending_menu_activation.
(set_frame_menubar): Remove check of pending_menu_activation.
Declare menubar_size before code.  Correct spelling in comment.

* src/xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype.
(SET_SAVED_KEY_EVENT): Remove (not used).
(SET_SAVED_MENU_EVENT): Rename to SET_SAVED_BUTTON_EVENT and
remove size parameter.
(handle_one_xevent): Check popup_activated () for menu for Xt also.
Remove #ifdef USE_GTK around finish = X_EVENT_DROP.
Remove #ifdef USE_MOTIF code that did SET_SAVED_BUTTON_EVENT for
ButtonRelease.

Fix previous conflict.

merge trunk

Do not record a font-entity in the property of font-object.

* lisp/bookmark.el (bookmark-show-annotation): Use `when' instead of `if'.
  This is also from Thierry Volpiatto's patch in bug #6444.  However,
  because it was extraneous to the functional change in that patch,
  and causes a re-indendation, I am committing it separately.

[[[
* lisp/bookmark.el (bookmark-bmenu-switch-other-window,
  bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override
  ambient binding of `bookmark-automatically-show-annotations'.  (Bug #6515)
]]]

=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el 2010-04-14 15:07:53 +0000
+++ lisp/bookmark.el 2010-06-27 03:40:14 +0000
@@ -1860,8 +1860,7 @@
         (pop-up-windows t))
     (delete-other-windows)
     (switch-to-buffer (other-buffer))
-    (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed?
-      (bookmark--jump-via bmrk 'pop-to-buffer))
+    (bookmark--jump-via bmrk 'pop-to-buffer)
     (bury-buffer menu)))

@@ -1875,8 +1874,7 @@
   "Select this line's bookmark in other window, leaving bookmark menu visible."
   (interactive)
   (let ((bookmark (bookmark-bmenu-bookmark)))
-    (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
-      (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))
+    (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))

 (defun bookmark-bmenu-switch-other-window ()
@@ -1887,8 +1885,7 @@
         (pop-up-windows t)
         same-window-buffer-names
         same-window-regexps)
-    (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
-      (bookmark--jump-via bookmark 'display-buffer))))
+    (bookmark--jump-via bookmark 'display-buffer)))

 (defun bookmark-bmenu-other-window-with-mouse (event)
   "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."

=== modified file 'lisp/saveplace.el'
--- lisp/saveplace.el 2010-01-13 08:35:10 +0000
+++ lisp/saveplace.el 2010-02-07 23:14:52 +0000
@@ -213,7 +213,7 @@
                       (symbol-name coding-system-for-write)))
       (let ((print-length nil)
             (print-level nil))
-        (print save-place-alist (current-buffer)))
+        (pp save-place-alist (current-buffer)))
       (let ((version-control
              (cond
               ((null save-place-version-control) nil)

Add regexp tests for cucumber and ruby.

* lisp/frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625).

Fix the MS-DOS build; remove more "#ifdef subprocesses".

 process.c <inhibit_sentinels>: Move to the common part.
 (Fwaiting_for_user_input_p): Move to the common part; return nil
 if async subprocesses aren't supported.
 sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
 MS-DOS.  Remove "#ifdef subprocesses".
 (sys_subshell, sys_select): Remove "#ifdef subprocesses".
 (gettimeofday): Remove "#ifdef subprocesses".
 (wait_without_blocking): Remove function.
 (flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
 Remove "#ifdef subprocesses".
 (child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
 compiled on MS-DOS.
 callproc.c (Fcall_process) [!MSDOS]: Don't call
 wait_for_termination on MS-DOS.
 emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
 initialization of inhibit_sentinels.
 keyboard.c (record_asynch_buffer_change): Remove "#ifdef
 subprocesses" conditional.
 callproc.c (Fcall_process) [!subprocesses]: Don't call
 wait_for_termination, since `buffer' cannot be an integer when
 async subprocesses are not supported
 xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
 for ifdefing away the call to Fprocess_status.
 process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
 away the entire body of the function.

Remove more "#ifdef subprocesses".

 process.c <inhibit_sentinels>: Move to the common part.
 (Fwaiting_for_user_input_p): Move to the common part; return nil
 if async subprocesses aren't supported.
 sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
 MS-DOS.  Remove "#ifdef subprocesses".
 (sys_subshell, sys_select): Remove "#ifdef subprocesses".
 (gettimeofday): Remove "#ifdef subprocesses".
 (wait_without_blocking): Remove function.
 (flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
 Remove "#ifdef subprocesses".
 (child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
 compiled on MS-DOS.
 callproc.c (Fcall_process) [!MSDOS]: Don't call
 wait_for_termination on MS-DOS.
 emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
 initialization of inhibit_sentinels.
 keyboard.c (record_asynch_buffer_change): Remove "#ifdef
 subprocesses" conditional.
 callproc.c (Fcall_process) [!subprocesses]: Don't call
 wait_for_termination, since `buffer' cannot be an integer when
 async subprocesses are not supported
 xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
 for ifdefing away the call to Fprocess_status.

term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew Dempsky; bug#5084).  Remove incorrect binding for S-tab. (ns-alternatives-map): Change S-tab binding to backtab (bug#6616).  * simple.el (normal-erase-is-backspace-setup-frame): Set mode on under ns.

Fix the MS-DOS build (fallout from 2010-07-13T04:54:28Z!dann@ics.uci.edu).

 process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
 away the entire body of the function.

Remove subprocesses #ifdefs from term.c.
* src/process.c (add_keyboard_wait_descriptor)
(delete_keyboard_wait_descriptor): Move to common section, do
nothing when subprocesses is not defined.
* src/term.c (Fsuspend_tty, Fresume_tty, init_tty): Remove subprocesses #ifdefs.

Convert maybe_fatal to standard C.
* src/lisp.h (verror): Declare.
* src/eval.c (verror): New function containing the code from ...
(error): ... this.  Call verror.
* src/term.c (vfatal): New function containing the code from ...
(fatal): ... this.  Call vfatal.
(maybe_fatal): Convert to standard C, use variable number of
arguments.  Declare as non-return.
(init_tty): Fix maybe_fatal call.

Convert function definitions to standard C.
* src/xterm.c (x_scroll_bar_set_handle, x_scroll_bar_expose)
(_scroll_bar_note_movement): Convert definitions to standard C.
* src/xmenu.c (menu_help_callback, pop_down_menu, xmenu_show):
* src/xfns.c (hack_wm_protocols, x_window, x_window): Likewise.

* oldXMenu/XMenu.h: Include <stdlib.h>.

Convert function definitions to standard C.
* src/xterm.c (x_frame_of_widget, x_alloc_nearest_color_for_widget)
(x_alloc_lighter_color_for_widget, cvt_string_to_pixel)
(cvt_pixel_dtor, x_window_to_menu_bar, xt_action_hook)
(xaw_jump_callback, xaw_scroll_callback)
(x_create_toolkit_scroll_bar, x_set_toolkit_scroll_bar_thumb)
(x_wm_set_size_hint, x_activate_timeout_atimer): Convert
definitions to standard C.
* src/xmenu.c (menubar_id_to_frame, popup_get_selection)
(popup_activate_callback, popup_deactivate_callback)
(menu_highlight_callback, menubar_selection_callback)
(apply_systemfont_to_dialog, apply_systemfont_to_menu)
(free_frame_menubar, popup_selection_callback, as)
(create_and_show_popup_menu, dialog_selection_callback)
(create_and_show_dialog):
* src/xfns.c (hack_wm_protocols, x_window):
* src/xfaces.c (x_update_menu_appearance):
* src/widget.c (get_default_char_pixel_size, pixel_to_char_size)
(char_to_pixel_size, round_size_to_char, get_wm_shell)
(set_frame_size, update_wm_hints, setup_frame_gcs)
(update_various_frame_slots, update_from_various_frame_slots)
(EmacsFrameInitialize, EmacsFrameRealize, EmacsFrameResize)
(EmacsFrameSetValues, EmacsFrameQueryGeometry)
(EmacsFrameSetCharSize, widget_store_internal_border): Likewise.

* dbusbind.c (xd_initialize): Don't compare boolean with a constant.

(wait_reading_process_output) [!subprocesses]: Convert arg list to ANSI C.

Fix the MS-DOS build (fallout from 2010-07-12T14:16:38Z!schwab@linux-m68k.org, 2010-07-12T17:04:38Z!dann@ics.uci.edu, 2010-07-12T17:21:11Z!dann@ics.uci.edu).

 src/process.c (setup_process_coding_systems): Move to the part
 shared by non-subprocesses systems, and make its body empty when
 subprocesses is not defined.
 (close_process_descs): Move to the part shared by non-subprocesses
 systems.
 msdos/sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 msdos/sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.

Fix the MS-DOS build (fallout from 2010-07-12T14:16:38Z!schwab@linux-m68k.org, 2010-07-12T17:04:38Z!dann@ics.uci.edu, 2010-07-12T17:21:11Z!dann@ics.uci.edu).

 msdos/sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 msdos/sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 src/process.c (setup_process_coding_systems): Move to the part
 shared by non-subprocesses systems, and make its body empty when
 subprocesses is not defined.
 (close_process_descs): Move to the part shared by non-subprocesses
 systems.

* nt/config.nt (volatile): Remove definition.

* language/tai-viet.el ("TaiViet"): Try to fix re-encoding bugs. (Bug#5806)

* language/tv-util.el (tai-viet-re): Remove format.

Convert old-style definitions

* editfns.c (transpose_markers): Convert old-style definition.
* emacs.c (abort, shut_down_emacs, fixup_locale)
(synchronize_system_time_locale)
(synchronize_system_messages_locale, syms_of_emacs): Likewise.
* floatfns.c (extract_float, matherr, init_floatfns)
(syms_of_floatfns): Likewise.
* fns.c (make_hash_table): Likewise.
* ftfont.c (ftfont_get_otf, ftfont_otf_features)
(ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
(ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
(ftfont_variation_glyphs): Likewise.
* gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
* keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
* lread.c (read_filtered_event): Likewise.
* minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
* process.c (wait_reading_process_output): Likewise.
* scroll.c (do_line_insertion_deletion_costs): Likewise.
* search.c (search_buffer, boyer_moore): Likewise.
* syntax.c (scan_sexps_forward): Likewise.
* xdisp.c (try_scrolling): Likewise.
* xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Likewise.
* xfns.c (x_default_scroll_bar_color_parameter): Likewise.
* xselect.c (x_get_window_property, receive_incremental_selection)
(x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
Likewise.
* xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.

Cleanups for src/callproc.c.
* src/callproc.c (child_setup): Remove subprocesses conditional.
Remove code dealing with SET_EMACS_PRIORITY, unused.

* src/buffer.c (Fset_buffer_multibyte): Remove subprocesses conditional.
* src/process.c (close_process_descs): Use DOS_NT instead of WINDOWSNT.

Convert function definitions to standard C and some cleanups.
* src/emacs.c (__do_global_ctors, __do_global_ctors_aux)
(__do_global_dtors, __main): Use void in definition.
(main): Remove code dealing with SET_EMACS_PRIORITY, unused.
Remove SYMS_MACHINE code, unused.  Remove SYMS_SYSTEM, inline
the only users from ...
* src/s/ms-w32.h (SYMS_SYSTEM): ... here and ...
* src/s/msdos.h (SYMS_SYSTEM): ... here.  Remove.
(HAVE_VOLATILE): Remove, unused.

Convert more function definitions to standard C.
* src/xdisp.c (window_box_edges, handle_single_display_spec)
(display_string): Convert definition to standard C.
* src/scroll.c (do_direct_scrolling, scrolling_1):
* src/dispnew.c (allocate_matrices_for_frame_redisplay)
(mirrored_line_dance):
* src/coding.c (code_convert_string):
* src/charset.c (map_charset_chars):
* src/ccl.c (Fccl_program_p, Fccl_execute, Fccl_execute_on_string)
(Fregister_ccl_program, Fregister_code_conversion_map):
* src/keyboard.c (kbd_buffer_nr_stored): Likewise.
(head_table): Make static and const.

Properly handle C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS

* configure.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Substitute, don't add them to CFLAGS/LDFLAGS.
(C_OPTIMIZE_SWITCH): Remove.
(TEMACS_LDFLAGS2): Add ${PROFILING_LDFLAGS}.

* lib-src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(BASE_CFLAGS): Add  ${C_WARNINGS_SWITCH}.
(ALL_CFLAGS, CPP_CFLAGS): Add ${PROFILING_CFLAGS}.
(LINK_CFLAGS): Add ${PROFILING_LDFLAGS}.

* lwlib/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.

* oldXMenu/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.

* src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(ALL_CFLAGS): Add C_WARNINGS_SWITCH and PROFILING_CFLAGS, put
CFLAGS last.

MS-Windows follow-up for 2010-07-12T05:25:46Z!handa@etlken.

 makefile.w32-in (lisp2): Change hebrew.el to hebrew.elc.

Improve Hebrew rendering.

merge trunk

Add ChangeLog

* mouse.el (mouse-drag-track): Handle select-active-regions (Bug#6612).

* blockinput.h: Remove obsolete comment.

Use offsetof instead of own definition

* lisp.h: Include <stddef.h>.
(OFFSETOF): Don't define.
(VECSIZE): Use offsetof instead of OFFSETOF.
(PSEUDOVECSIZE): Likewise.
* process.c (conv_sockaddr_to_lisp): Likewise.
* alloc.c: Don't include <stddef.h>.
* buffer.h (PER_BUFFER_VAR_OFFSET): Use offsetof.

* process.c: Remove obsolete comment.

* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).

Remove redundant definitions of HAVE_STRCHR and HAVE_STRRCHR for MS-DOS.

 sed2v2.inp (HAVE_STRCHR, HAVE_STRRCHR): Don't edit, already
 defined on <sys/config.h>.

Use strchr, strrchr instead of index, rindex

* callint.c (Fcall_interactively): Use strchr, strrchr instead of
index, rindex.
* doc.c (get_doc_string, Fsnarf_documentation): Likewise.
* editfns.c (Fuser_full_name, Fformat): Likewise.
* emacs.c (argmatch, sort_args, decode_env_path): Likewise.
* fileio.c (Ffile_symlink_p): Likewise.
* filelock.c (current_lock_owner): Likewise.
* font.c (font_parse_name, font_parse_family_registry): Likewise.
* fontset.c (fontset_pattern_regexp): Likewise.
* lread.c (read1): Likewise.
* sysdep.c (init_system_name): Likewise.
* xfns.c (select_visual): Likewise.
* s/hpux10-20.h (index, rindex): Don't define.
* s/ms-w32.h (index): Likewise.
* s/usg5-4.h: Likewise.

* sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit.
(HAVE_STRCHR, HAVE_STRRCHR): Edit to 1.

* emacsclient.c (set_local_socket): Use strchr, strrchr instead of
index, rindex.
* movemail.c (mail_spool_name, popmail): Likewise.
* pop.c (pop_list): Likewise.

* CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.

* configure.in: Don't check for index and rindex, check for strchr
and strrchr.  Define strchr and strrchr as index and rindex,
resp., in src/config.h if not available.

* callproc.c (relocate_fd): Use F_DUPFD if defined.

Constify functions taking char *

* alloc.c (pending_malloc_warning, malloc_warning): Add const.
* callproc.c (relocate_fd, getenv_internal_1, getenv_internal)
(egetenv): Likewise.
* doprnt.c (doprnt): Likewise.
* editfns.c (set_time_zone_rule, format2): Likewise.
* emacs.c (decode_env_path): Likewise.
* eval.c (signal_error, error): Likewise.
* insdel.c (replace_range_2): Likewise.
* keyboard.c (cmd_error_internal): Likewise.
* lread.c (isfloat_string, make_symbol, dir_warning): Likewise.
* print.c (write_string, write_string_1, print_error_message):
Likewise.
* vm-limit.c (warn_function, memory_warnings): Likewise.
* xdisp.c (message1, message1_nolog, message_with_string)
(vmessage, message, message_nolog): Likewise.
* emacs.c: Remove duplicate declaration.
* keyboard.h: Likewise.
* lisp.h: Update prototypes.

Fix indentation problem

Fix implicit declaration of kbd_on_hold_p

* keyboard.c: Include "process.h"

Remove obsolete noinline declaration

* eval.c (apply1, call2): Don't declare noinline.
* fns.c (concat): Likewise.

* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
empty argument to gvfs-copy.

Make doprnt and related functions ANSI C compliant, with prototypes.

* doprnt.c (doprnt): Take a va_list argument instead of count and
pointer.
* eval.c (error): Change to a standard-C variadic function.
* xdisp.c (vmessage): Renamed from message, made static, and
changed to take a va_list argument.
(message): New variadic wrapper.
(message_nolog): Now a variadic function, calling vmessage.
* lisp.h: Include stdarg.h for va_list.
(doprnt, error, message, message_nolog): Decls updated.

Fix bug #6603.

 makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o, and unexw32.o.

Don't use `subprocesses' in msdos.c.

 msdos.c (syms_of_msdos) <delete-exited-processes>: Remove DEFVAR.
 (delete_exited_processes): Don't define.
 process.c (syms_of_process) <delete-exited-processes>: Define
 even if !subprocesses.
 (delete_exited_processes): Ditto.

Add compilation regexps for cucumber and ruby.

* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Add
regexps for cucumber and ruby.

Merge changes from emacs-23 branch.

Adapt terminal frames to latest menu-bar changes.

* frame.c (make_frame): Initialize menu_bar_lines and
tool_bar_lines members.
(make_initial_frame, make_terminal_frame): Initialize
menu_bar_lines using value of menu-bar-mode.

* msdos.c (IT_set_frame_parameters): Don't set menu-bar-lines.

Merge changes from emacs-23 branch.

* xfaces.c (realize_face): Garbage the frame if a face is removed
(Bug#6593).

Makefile.in ($(DESTDIR)${archlibdir}): Convert spaces to TABs.

Unify the two branches, with and without subprocesses.

 process.c: Reshuffle #include's.  Condition some of the global
 and static variables on `subprocesses'.
 (hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p):
 Leave only one implementation.
 (Fget_buffer_process, Fprocess_inherit_coding_system_flag)
 (kill_buffer_processes, Flist_system_processes)
 (Fprocess_attributes, init_process, syms_of_process): Unify the
 implementations for with subprocesses and without them.

* tramp.texi (Inline methods): Remove "kludgy" phrase.
(Filename Syntax): Describe port numbers.

* dbus.texi (Top): Introduce Index.  Emphasize "nil" whereever
forgotten.
(Type Conversion): Precise conversion of natural numbers.
(Errors and Events): Add "debugging" to concept index.  Add variable
`dbus-debug'.

* make-docfile.c (write_c_args): Restructure scanning loop.

Fix frame sizing for Lucid/Motif/Lesstif.

* xfns.c (x_window): Set borderWidth to 0 for pane and
EmacsFrame.  Frame size calculation is wrong otherwise.

* xmenu.c (set_frame_menubar): Must realize menubar_widget to get the
correct size for Motif.
(free_frame_menubar): Call x_set_window_size to update frame size.

* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
allows to suppress errors when polling in Emacs' main loop.
(Fdbus_init_bus, Fdbus_get_unique_name, Fdbus_call_method)
(Fdbus_call_method_asynchronously, Fdbus_method_return_internal)
(Fdbus_method_error_internal, Fdbus_send_signal)
(xd_get_dispatch_status, xd_read_message, Fdbus_register_signal)
(Fdbus_register_method): Use it.  (Bug#6579)

Adapt docs of primitives to ANSI C arg list.

 internals.texi (Writing Emacs Primitives): Adapt to ANSI C
 calling sequences, which are now the standard.

merge trunk

Make make-docfile understand DEFUN arguments written in standard C.
* lib-src/make-docfile.c (write_c_args): Deal with type names in DEFUN
arguments.

* configure.in: Use -Wold-style-definition if available.
This helps with the transition to standard C code, it can be
removed when done.

Convert DEFUNs to standard C.
* src/alloc.c: Convert DEFUNs to standard C.
* src/buffer.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/dosfns.c:
* src/editfns.c:
* src/emacs.c:
* src/eval.c:
* src/fileio.c:
* src/filelock.c:
* src/floatfns.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/image.c:
* src/indent.c:
* src/insdel.c:
* src/keyboard.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/menu.c:
* src/minibuf.c:
* src/msdos.c:
* src/nsfns.m:
* src/nsmenu.m:
* src/nsselect.m:
* src/print.c:
* src/process.c:
* src/search.c:
* src/sound.c:
* src/syntax.c:
* src/term.c:
* src/terminal.c:
* src/textprop.c:
* src/undo.c:
* src/w16select.c:
* src/w32console.c:
* src/w32fns.c:
* src/w32font.c:
* src/w32menu.c:
* src/w32proc.c:
* src/w32select.c:
* src/window.c:
* src/xdisp.c:
* src/xfaces.c:
* src/xfns.c:
* src/xmenu.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c: Likewise.

MAINTAINERS: Update Eli Zaretskii's responsibilities.

Fix MS-DOS configury.

 sed1v2.inp (stamp-oldxmenu): Don't edit out in `temacs:' target,
 which doesn't exist.
 sed2v2.inp (HAVE_MEMCPY): Don't edit, already defined on <sys/config.h>.

Fix MS-DOS build broken by 2010-07-07T17:39:49Z!jan.h.d@swipnet.se.

 process.c (kbd_is_on_hold, hold_keyboard_input)
 (unhold_keyboard_input, kbd_on_hold_p) [!subprocesses]: Define.

Fix compilation for Motif/Lesstif.

* xmenu.c (set_frame_menubar, create_and_show_popup_menu)
(create_and_show_dialog): Don't call apply_systemfont_to_(menu|dialog)
unless USE_LUCID.

Change function definition from K&R to prototype.  Fix prototype warnings.

* lwlib-Xaw.c (xaw_generic_callback, command_reset)
(xaw_update_one_value): Reformat.
(xaw_update_one_widget): Reformat and remove dead code.
(xaw_scrollbar_scroll, xaw_scrollbar_jump, xaw_create_scrollbar)
(xaw_update_scrollbar): Remove (not used).
(make_dialog): Change from K&R to prototype. Remove dead code.
(xaw_creation_table): Remove scrollbar entry.

* lwlib-Xlw.c (x_print_complete_resource_name): Change from K&R to
prototype.
(xlw_update_one_value): Reformat.

* lwlib-Xm.c (x_print_complete_resource_name)
(make_destroyed_instance, free_destroyed_instance, first_child)
(lw_motif_widget_p, resource_motif_string, destroy_all_children)
(xm_arm_callback, xm_update_label, xm_update_list)
(xm_update_pushbutton, xm_update_cascadebutton)
(xm_update_toggle, xm_update_radiobox, make_menu_in_widget)
(update_one_menu_entry, xm_update_menu, xm_update_text)
(xm_update_text_field, xm_update_one_widget)
(xm_update_one_value, activate_button, dialog_key_cb)
(make_dialog, mark_dead_instance_destroyed)
(find_matching_instance, recenter_widget, recycle_instance)
(xm_create_dialog, make_menubar, remove_grabs, make_popup_menu)
(make_main, xm_destroy_instance, xm_popup_menu)
(set_min_dialog_size, xm_pop_instance, do_call)
(xm_internal_update_other_instances, xm_generic_callback)
(xm_nosel_callback, xm_pull_down_callback, xm_pop_down_callback)
(xm_set_keyboard_focus, xm_set_main_areas, xm_manage_resizing): Change
from K&R to prototype.

* lwlib-int.h (widget_creation_function): Fix prototype.

* lwlib.c (allocate_widget_info, lw_register_widget): Change from K&R
to prototype.
(lw_internal_update_other_instances, merge_widget_value): Reformat.

* xlwmenu.c (size_menu_item): Change from K&R to prototype.
Change label_width and height to int.
(draw_arrow, draw_shadow_rectangle, draw_shadow_rhombus)
(draw_separator, display_menu, fit_to_screen, motion_event_is_in_menu)
(map_event_to_widget_value): Reformat.
(display_menu_item): Change from K&R to prototype.

merge trunk

Make font-get to get :otf value dynamically from a font-object.

Remove leftover P_ macros.
* lib-src/update-game-score.c (P_): Remove macro.
* lib-src/ebrowse.c: Remove include guards.
(P_): Remove macro.

Remove alternative K&R declarations.
* lwlib/lwlib.c (allocate_widget_instance, get_widget_info)
(get_widget_instance, find_instance, set_one_value)
(update_one_widget_instance, update_all_widget_values)
(lw_modify_all_widgets, lw_get_widget, lw_make_widget)
(lw_create_widget, lw_pop_all_widgets, lw_show_busy)
(lw_refigure_widget, lw_allow_resizing): Remove alternative K&R
declarations.
* lwlib/lwlib-Xlw.c (xlw_update_one_widget):
(xlw_pop_instance): Likewise.
* lwlib/lwlib-Xaw.c (xaw_update_one_widget, xaw_pop_instance):
Likewise.
* lwlib/lwlib-Xm.c (P_): Remove.

* src/xdisp.c (store_mode_line_noprop_char): Remove K&R alternative declaration.

Clean up include guards.
* src/tparam.c: Remove include guards for config.h, string.h and code
that assumes #ifndef emacs.
* src/termcap.c:
* src/unexalpha.c:
* src/sysdep.c:
* src/filemode.c:
* src/filelock.c:
* src/bidi.c: Likewise.

Remove src/prefix-args.c.

* configure.in (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): Remove.

* msdos/sed1v2.inp: Remove reference to prefix-args.

* prefix-args.c: Remove file.
* src/autodeps.mk (ALLOBJS): Remove reference to prefix-args.
* src/Makefile.in (temacs${EXEEXT}): Remove references to
PRE_EDIT_LDFLAGS and POST_EDIT_LDFLAGS.
(mostlyclean): Remove reference to prefix-args.
(prefix-args): Remove.

Simplify start_of_data, start_of_text and related code.
* src/mem-limits.h: Remove !emacs and _LIBC conditional code.
(start_of_data): Merge into start_of_data function.
* src/sysdep.c (start_of_text): Remove.  Move simplified versions of
it in the only users: src/unexaix.c and unexec.c.
(read_input_waiting): Remove local declaration of quit_char.
(start, etext): Remove declarations.
(start_of_data): Merge with the version in mem-limits.h and move
to vm-limits.c.
* src/vm-limit.c (start_of_data): Merged and simplified version of the
code formerly in mem-limits.h and sysdep.c.
* src/unexec.c (start): New declaration, moved from sysdep.c.
(start_of_text): Simplified version of the code formerly in sysdep.c.
* unexaix.c (start_of_text): Simplified version of the code
formerly in sysdep.c.
* src/m/alpha.h (HAVE_TEXT_START): Remove.
(TEXT_START): Move ...
* src/unexalpha.c (TEXT_START): ... here.
* src/s/hpux10-20.h (TEXT_START): Remove.
* src/s/darwin.h (TEXT_START):
* src/m/mips.h (TEXT_START):
* src/m/macppc.h (HAVE_TEXT_START):
* src/m/m68k.h (TEXT_START):
* src/m/iris4d.h (TEXT_START):
* src/m/intel386.h (TEXT_START):
* src/m/ibmrs6000.h (TEXT_START):
* src/m/ia64.h (HAVE_TEXT_START):
* src/s/msdos.h (TEXT_START): Likewise.

* configure.in (UNEXEC_OBJ): Add comment about values for MSDOS
and MSWindows.

Prevent find-file from opening empty buffer when decryptin failed (bug#6568).

* epa-file.el (epa-file-error, epa-file--find-file-not-found-function)
(epa-file-insert-file-contents): Hack to prevent
find-file from opening empty buffer when decryptin failed
(bug#6568).

Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp

* alloc.c (overrun_check_malloc, overrun_check_realloc)
(overrun_check_free, xstrdup, allocate_string)
(allocate_string_data, compact_small_strings, Fmake_string)
(make_unibyte_string, make_multibyte_string)
(make_string_from_bytes, make_specified_string, make_float)
(Fcons, allocate_terminal, allocate_frame, make_pure_string)
(Fgarbage_collect): Replace bcopy, safe_bcopy, bzero, bcmp by
memcpy, memmove, memset, memcmp.
* atimer.c (start_atimer, set_alarm): Likewise.
* buffer.c (clone_per_buffer_values, report_overlay_modification)
(mmap_realloc, init_buffer_once): Likewise.
* callint.c (Fcall_interactively): Likewise.
* callproc.c (Fcall_process, Fcall_process_region, child_setup)
(getenv_internal_1): Likewise.
* casefiddle.c (casify_object): Likewise.
* ccl.c (ccl_driver): Likewise.
* character.c (str_as_multibyte, str_to_multibyte): Likewise.
* charset.c (load_charset_map_from_file)
(load_charset_map_from_file, load_charset_map_from_vector)
(Fdefine_charset_internal): Likewise.
* cm.c (Wcm_clear): Likewise.
* coding.c (decode_eol, decode_coding_object)
(Fset_coding_system_priority, make_subsidiaries): Likewise.
* data.c (Faset): Likewise.
* dired.c (directory_files_internal, file_name_completion_stat):
Likewise.
* dispnew.c (new_glyph_matrix, adjust_glyph_matrix)
(clear_glyph_row, copy_row_except_pointers)
(copy_glyph_row_contents, new_glyph_pool, realloc_glyph_pool)
(save_current_matrix, restore_current_matrix)
(build_frame_matrix_from_leaf_window, mirrored_line_dance)
(mirror_line_dance, scrolling_window): Likewise.
* doc.c (Fsnarf_documentation, Fsubstitute_command_keys):
Likewise.
* doprnt.c (doprnt): Likewise.
* editfns.c (Fuser_full_name, make_buffer_string_both)
(Fmessage_box, Fformat, Ftranspose_regions): Likewise.
* emacs.c (sort_args): Likewise.
* eval.c (Fapply, Ffuncall): Likewise.
* fileio.c (Ffile_name_directory, make_temp_name)
(Fexpand_file_name, search_embedded_absfilename)
(Fsubstitute_in_file_name, Ffile_symlink_p, Finsert_file_contents)
(auto_save_error): Likewise.
* fns.c (Fstring_equal, Fcopy_sequence, concat)
(string_to_multibyte, Fstring_as_unibyte, Fstring_as_multibyte)
(internal_equal, Fclear_string, larger_vector, copy_hash_table)
(Fmake_hash_table): Likewise.
* fringe.c (Fdefine_fringe_bitmap): Likewise.
* ftfont.c (ftfont_text_extents): Likewise.
* getloadavg.c (getloadavg): Likewise.
* image.c (define_image_type, make_image, make_image_cache)
(x_create_x_image_and_pixmap, xbm_image_p)
(w32_create_pixmap_from_bitmap_data, xbm_load, xpm_lookup_color)
(xpm_image_p, x_create_bitmap_from_xpm_data, xpm_load)
(init_color_table, x_build_heuristic_mask, pbm_image_p, pbm_load)
(png_image_p, png_read_from_memory, png_load, jpeg_image_p)
(tiff_image_p, tiff_read_from_memory, gif_image_p)
(gif_read_from_memory, gif_load, svg_image_p, gs_image_p):
Likewise.
* indent.c (scan_for_column, compute_motion): Likewise.
* insdel.c (gap_left, gap_right, make_gap_smaller, copy_text)
(insert_1_both, insert_from_gap, replace_range_2): Likewise.
* intervals.c (reproduce_tree, reproduce_tree_obj): Likewise.
* keyboard.c (echo_char, save_getcjmp, restore_getcjmp)
(kbd_buffer_store_event_hold, apply_modifiers_uncached)
(store_user_signal_events, menu_bar_items, tool_bar_items)
(process_tool_bar_item, append_tool_bar_item)
(read_char_minibuf_menu_prompt, read_key_sequence)
(Fread_key_sequence, Fread_key_sequence_vector, Frecent_keys):
Likewise.
* keymap.c (current_minor_maps, Fdescribe_buffer_bindings):
Likewise.
* lisp.h (STRING_COPYIN): Likewise.
* lread.c (Fload, read1, oblookup): Likewise.
* msdos.c (Frecent_doskeys): Likewise.
* nsfns.m (Fx_create_frame): Likewise.
* nsfont.m (nsfont_open, nsfont_text_extents, ns_glyph_metrics):
Likewise.
* nsimage.m (EmacsImage-initFromSkipXBM:width:height:)
(EmacsImage-initForXPMWithDepth:width:height:flip:length:):
Likewise.
* nsmenu.m (ns_update_menubar): Likewise.
* nsterm.m (ns_draw_fringe_bitmap, ns_term_init): Likewise.
* print.c (print_unwind, printchar, strout, print_string)
(print_error_message): Likewise.
* process.c (conv_lisp_to_sockaddr, set_socket_option)
(Fmake_network_process, Fnetwork_interface_list)
(Fnetwork_interface_info, read_process_output, Fprocess_send_eof)
(init_process): Likewise.
* ralloc.c (resize_bloc, r_alloc_sbrk, r_alloc_init): Likewise.
* regex.c (init_syntax_once, regex_compile, re_compile_fastmap):
Likewise.
* scroll.c (do_scrolling, do_direct_scrolling)
(scrolling_max_lines_saved): Likewise.
* search.c (search_buffer, wordify, Freplace_match): Likewise.
* sound.c (wav_init, au_init, Fplay_sound_internal): Likewise.
* syntax.c (skip_chars, skip_syntaxes): Likewise.
* sysdep.c (child_setup_tty, sys_subshell, emacs_get_tty)
(emacs_set_tty): Likewise.
* term.c (encode_terminal_code, calculate_costs)
(produce_special_glyphs, create_tty_output, init_tty, delete_tty):
Likewise.
* termcap.c (tgetst1, gobble_line): Likewise.
* termhooks.h (EVENT_INIT): Likewise.
* tparam.c (tparam1): Likewise.
* unexalpha.c (unexec): Likewise.
* unexec.c (write_segment): Likewise.
* unexmacosx.c (unexec_write_zero): Likewise.
* w32fns.c (w32_wnd_proc, Fx_create_frame, x_create_tip_frame)
(Fx_file_dialog, Fsystem_move_file_to_trash): Likewise.
* w32font.c (w32font_list_family, w32font_text_extents)
(w32font_list_internal, w32font_match_internal)
(w32font_open_internal, compute_metrics, Fx_select_font):
Likewise.
* w32menu.c (set_frame_menubar, add_menu_item)
(w32_menu_display_help, w32_free_submenu_strings): Likewise.
* w32term.c (XCreateGC, w32_initialize_display_info): Likewise.
* w32uniscribe.c (uniscribe_list_family): Likewise.
* w32xfns.c (get_next_msg, post_msg, prepend_msg): Likewise.
* window.c (make_window, replace_window, set_window_buffer)
(Fsplit_window): Likewise.
* xdisp.c (init_iterator, RECORD_OVERLAY_STRING, reseat_to_string)
(add_to_log, message3, x_consider_frame_title)
(append_space_for_newline, extend_face_to_end_of_line)
(decode_mode_spec_coding, init_glyph_string): Likewise.
* xfaces.c (x_create_gc, get_lface_attributes_no_remap)
(Finternal_copy_lisp_face, Finternal_merge_in_global_face)
(face_attr_equal_p, make_realized_face, make_face_cache)
(free_realized_faces, lookup_named_face, smaller_face)
(face_with_height, lookup_derived_face)
(x_supports_face_attributes_p, Finternal_set_font_selection_order)
(Finternal_set_font_selection_order, realize_default_face)
(compute_char_face, face_at_buffer_position)
(face_for_overlay_string, face_at_string_position, merge_faces):
Likewise.
* xfns.c (xic_create_fontsetname, Fx_create_frame)
(Fx_window_property, x_create_tip_frame)
(Fx_backspace_delete_keys_p): Likewise.
* xfont.c (xfont_list, xfont_match, xfont_list_family)
(xfont_text_extents): Likewise.
* xmenu.c (set_frame_menubar, xmenu_show): Likewise.
* xrdb.c (magic_file_p, x_get_resource): Likewise.
* xselect.c (x_queue_event, x_get_window_property)
(receive_incremental_selection): Likewise.
* xsmfns.c (x_session_check_input): Likewise.
* xterm.c (x_send_scroll_bar_event, SET_SAVED_MENU_EVENT)
(handle_one_xevent, x_check_errors, xim_initialize, x_term_init):
Likewise.
* character.h (BCOPY_SHORT): Removed.
* config.in: Regenerate.
* dispnew.c (safe_bcopy): Only define as dummy if PROFILING.
* emacs.c (main) [PROFILING]: Don't declare
dump_opcode_frequencies.
* lisp.h (safe_bcopy): Remove declaration.
(memset) [!HAVE_MEMSET]: Declare.
(memcpy) [!HAVE_MEMCPY]: Likewise.
(memmove) [!HAVE_MEMMOVE]: Likewise.
(memcmp) [!HAVE_MEMCMP]: Likewise.
* s/ms-w32.h (bzero, bcopy, bcmp, GAP_USE_BCOPY)
(BCOPY_UPWARD_SAFE, BCOPY_DOWNWARD_SAFE, HAVE_BCOPY, HAVE_BCMP):
Don't define.
(HAVE_MEMCMP, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET): Define.
* s/msdos.h (GAP_USE_BCOPY, BCOPY_UPWARD_SAFE)
(BCOPY_DOWNWARD_SAFE): Don't define.
* sysdep.c (memset) [!HAVE_MEMSET]: Define.
(memcpy) [!HAVE_MEMCPY]: Define.
(memmove) [!HAVE_MEMMOVE]: Define.
(memcmp) [!HAVE_MEMCMP]: Define.

* config.nt (HAVE_BCOPY, HAVE_BCMP): Remove undefs.
(HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET, HAVE_MEMCMP): Add undefs.

* sed2v2.inp (HAVE_MEMCPY, HAVE_MEMSET): Edit to 1.
(HAVE_BZERO): Don't edit.

* lwlib.c (lwlib_memset, lwlib_bcopy): Remove.
(malloc_widget_value, free_widget_info, allocate_widget_instance)
(lw_separator_p): Replace lwlib_memset, lwlib_bcopy, bzero, bcmp by
memset, memcpy, memcmp.
* lwlib-utils.c (XtApplyToWidgets): Likewise.
* xlwmenu.c (XlwMenuInitialize): Likewise.
* lwlib.h (lwlib_bcopy): Remove declaration.

* ebrowse.c (add_sym, make_namespace): Replace bcopy, bzero by
memcpy, memmove, memset.
* pop.c (pop_retrieve, socket_connection, pop_getline): Likewise.

* CPP-DEFINES (BCOPY_DOWNWARD_SAFE, BCOPY_UPWARD_SAFE)
(GAP_USE_BCOPY, HAVE_BCMP, HAVE_BCOPY, bcmp, bcopy, bzero):
Remove.

* configure.in: Don't check for bcopy, bcmp, bzero.  Don't include
<strings.h> and don't define bcopy, bzero, BCMP in config.h.

If kbd_buffer is becoming full, stop reading until it drains (Bug#6571).

* keyboard.c (input_available_signal): Declare.
(kbd_buffer_nr_stored): New function.
(kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns
more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571).
(kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored
returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571).
(tty_read_avail_input): If input is on hold, return.
Don't read more that free slots in kbd_buffer (Bug#6571).

* process.h (hold_keyboard_input, unhold_keyboard_input)
(kbd_on_hold_p): Declare.

* process.c (kbd_is_on_hold): New variable.
(hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p): New
functions.
(wait_reading_process_output): If kbd_on_hold_p returns non-zero,
select on empty input mask.
(init_process): Initialize kbd_is_on_hold to 0.

Convert function definitions in MS-DOS sources to ANSI C.

 msdos.h:
 msdos.c:
 dosfns.c:
 w16select.c: Convert function definitions to ANSI C.
 msdos.h (ctrl_break_func, install_ctrl_break_check): Remove
 unused prototypes.

Improve ispell.el word completion handling.

* ispell.el (ispell-alternate-dictionary): Use file-readable-p.
  Return nil if no word-list is found at default locations.
 (ispell-complete-word-dict): Default to nil.
 (ispell-command-loop): Use 'word-list' when using lookup-words.
 (lookup-words): Use ispell-complete-word-dict or
 ispell-alternate-dictionary.  Check for word-list availability
 and handle errors if needed with better messages (Bug#6539).
 (ispell-complete-word): Use ispell-complete-word-dict or
 ispell-alternate-dictionary.

Fix whitespace to follow coding guidelines.

* coding.c, sysdep.c: Convert some more functions to standard C.

* coding.c: Use SPECPDL_INDEX, DOS_NT.

Add some font-locking for Python 2.7.

* lisp/progmodes/python.el (python-font-lock-keywords): Add Python 2.7
builtins (BufferError, BytesWarning, WindowsError; callables
bin, bytearray, bytes, format, memoryview, next, print; __package__).

Minor zone.el fixes for bug#6483.
Zone did not like the intangible newlines etc in the gomoku buffer.

* lisp/play/zone.el (top-level): Do not require timer, tabify, or cl.
(zone-shift-left): Ignore intangibility, and any errors from forward-char.
(zone-shift-right): Remove no-op end-of-line.  Ignore intangibility.
(zone-pgm-putz-with-case): Use upcase-region rather than inserting,
deleting, and copying text properties.
(zone-line-specs, zone-pgm-stress): Check forward-line exit status.
(zone-pgm-rotate): Handle odd buffers like that of gomoku, where getting
to point-max is hard.
(zone-fret, zone-fill-out-screen): Replace cl's do with dotimes.
(zone-fill-out-screen): Ignore intangibility.

Minor zone.el fix.
* play/zone.el (zone-fall-through-ws): Fix next-line -> forward-line fallout.

* src/intervals.h (interval): Use EMACS_UINT instead of unsigned EMACS_INT.

* configure.in (getenv): Remove K&R declaration.

Make the function member of Lisp_Subr use standard C prototypes.
* src/lisp.h (struct Lisp_Subr): Use a union for the function member.
(DECL_ALIGN): Add a cast for the function.
* src/eval.c (Feval, Ffuncall): Use the proper type for each type
function call.

* fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
fringe face id, so face-remapping-alist works (Bug#6091).

Minor fix to describe-key, and a docstring.

* help.el (describe-key): Print up-event using key-description.

* mouse.el (mouse-appearance-menu): Add docstring.

src/w32*.c: Convert function definitions to standard C.

Fix conflicting declarations of x_get_keysym_name

* xterm.c (x_get_keysym_name): Change type of parameter to int.
* lisp.h: Declare x_get_keysym_name.
* keyboard.c (modify_event_symbol): Don't declare
x_get_keysym_name here.

Clean up movemail source

* movemail.c: Add MAIL_USE_POP around prototypes.
Include <string.h> if HAVE_STRING_H.
(strerror): Only declare if !HAVE_STRERROR.
(fatal): Make static.
(error): Likewise.
(pfatal_with_name): Likewise.
(pfatal_and_delete). Likewise.
(concat): Likewise.
(xmalloc): Likewise.
(popmail): Likewise.
(pop_retr): Likewise.
(mbx_write): Likewise.
(mbx_delimit_begin): Likewise.
(mbx_delimit_end): Likewise.

* movemail.c: Add MAIL_USE_POP around prototypes.