* lisp/simple.el (x-selection-owner-p, x-selection-exists-p): Declare.

* lisp/emacs-lisp/eieio.el (class-parent): Undo previous change.

Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00354.html

Fix previous patch.

* net/tramp-sh.el (tramp-get-remote-id): Do not raise an error.
(tramp-get-remote-uid-with-id, tramp-get-remote-gid-with-id)
(tramp-get-remote-python): New defuns.
(tramp-get-remote-uid-with-perl)
(tramp-get-remote-gid-with-perl): New defuns.  Perl code
contributed by yary <not.com@gmail.com> (tiny change).
(tramp-get-remote-uid-with-python)
(tramp-get-remote-gid-with-python): New defuns.  Python code
contributed by Andrey Tykhonov <atykhonov@gmail.com> (tiny change).
(tramp-get-remote-uid, tramp-get-remote-gid): Use new defuns.

Auto-commit of generated files.

Fix MinGW builds from inside the MSYS installation tree.

 configure.ac <srcdir> [MINGW32]: Make sure the value of 'srcdir'
 is in the full /d/foo/bar form.  See the discussion in
 http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00210.html,
 and in particular
 http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00252.html
 and its followups, for the details.

Fix a compiler warning on MS-Windows due to recent changes.

 src/w32reg.c (w32_get_string_resource): Make the first 2 arguments
 'const char *' to avoid compiler warnings due to similar change in
 the prototype of x_get_string_resource.

* xterm.h (struct x_display_info): New members last_mouse_glyph_frame,
last_mouse_scroll_bar, last_mouse_glyph and last_mouse_movement_time,
going to replace static variables below.  Adjust comments.
* xterm.c (last_mouse_glyph, last_mouse_glyph_frame)
(last_mouse_scroll_bar, last_mouse_movement_time): Remove.
(note_mouse_movement, XTmouse_position, x_scroll_bar_note_movement)
(x_scroll_bar_report_motion, handle_one_xevent, syms_of_xterm):
Related users changed.
* w32term.h (struct w32_display_info): New members last_mouse_glyph_frame,
last_mouse_scroll_bar, last_mouse_scroll_bar_pos, last_mouse_glyph and
last_mouse_movement_time, going to replace static variables below.
Adjust comments.
* w32term.c (last_mouse_glyph_frame, last_mouse_scroll_bar)
(last_mouse_scroll_bar_pos, last_mouse_glyph, last_mouse_movement_time):
Remove.
(note_mouse_movement, w32_mouse_position, w32_scroll_bar_handle_click)
(x_scroll_bar_report_motion, syms_of_w32term): Related users changed.
* nsterm.h (struct ns_display_info): New members last_mouse_glyph,
last_mouse_movement_time and last_mouse_scroll_bar, going to replace
static variables below.
* nsterm.m (last_mouse_glyph, last_mouse_movement_time)
(last_mouse_scroll_bar): Remove.
(note_mouse_movement, ns_mouse_position, mouseMoved, mouseEntered)
(mouseExited): Related users changed.

* emacs-lisp/eieio.el (class-parent): Don't use defalias with macros.

* eshell/em-unix.el (eshell-remove-entries):
Rename argument to avoid name-clash with global `top-level'.

Do not use external array to process X scroll bar messages.
* xterm.c (scroll_bar_windows, scroll_bar_windows_size): Remove.
(x_send_scroll_bar_event): Pack window pointer into two slots
of XClientMessageEvent if we're 64-bit.  Adjust comment.
(x_scroll_bar_to_input_event): Unpack accordingly.

Revise previous esh-proc change

* eshell/esh-proc.el (eshell-kill-process-function):
Remove eshell-reset-after-proc from eshell-kill-hook if present.
(eshell-reset-after-proc): Remove unused arg `proc'.

* eshell/esh-proc.el (eshell-reset-after-proc): Mark unused arg.

* eshell/esh-util.el (eshell-read-hosts-file): Use `filename' arg.
(directory-files-and-attributes): Mark unused arg.

* eshell/em-unix.el (eshell-remove-entries): Remove unused arg `path'.
Update callers.

* eshell/em-hist.el (eshell-hist-parse-arguments): Remove unused arg `silent'.
Update callers.

* erc/erc-list.el (erc-list-handle-322): Mark unused argument.

Address some "unused lexical argument" warnings in eshell

* eshell/em-ls.el (eshell-ls-use-in-dired): Use `symbol' arg.
Fix (f)boundp mix-up.

* eshell/em-smart.el (eshell-smart-scroll-window)
(eshell-disable-after-change):
* eshell/em-term.el (eshell-term-sentinel): Mark unused arg.

Address some "unused lexical argument" warnings in erc

* erc/erc.el (erc-open-server-buffer-p): Actually use the `buffer' arg.
* erc/erc-backend.el (erc-server-process-alive): Take optional `buffer' arg.

* erc/erc-button.el (erc-button-click-button, erc-button-press-button):
Mark unused arguments.

Fix fontification of type when followed by "const".
* progmodes/cc-engine.el (c-forward-decl-or-cast-1): Don't exclude
"known" types from fontification.

* w32term.c (note_mouse_movement): Fix last change.

Auto-commit of loaddefs files.

Ifdef away recent changes which aren't relevant to NS port.
* dispextern.h (x_mouse_grabbed, x_redo_mouse_highlight)
[!HAVE_NS]: Declare as such.
* frame.c (x_mouse_grabbed, x_redo_mouse_highlight)
[!HAVE_NS]: Define as such.

* frame.c (x_redo_mouse_highlight): New function
to factor out common code used in W32 and X ports.
* dispextern.h (x_redo_mouse_highlight): Add prototype.
* xterm.h (struct x_display_info):
* w32term.h (struct w32_display_info):
* nsterm.h (struct ns_display_info): New members
last_mouse_motion_frame, last_mouse_motion_x and
last_mouse_motion_y, going to replace static variables below.
* xterm.c (last_mouse_motion_event, last_mouse_motion_frame)
(redo_mouse_highlight): Remove.
(note_mouse_movement, syms_of_xterm): Adjust user.
(handle_one_xevent): Likewise.  Use x_redo_mouse_highlight.
* w32term.c (last_mouse_motion_event, last_mouse_motion_frame)
(redo_mouse_highlight): Remove.
(note_mouse_movement, syms_of_w32term): Adjust user.
(w32_read_socket): Likewise.  Use x_redo_mouse_highlight.
* nsterm.m (last_mouse_motion_position, last_mouse_motion_frame):
Remove.
(note_mouse_movement, mouseMoved, syms_of_nsterm):
* nsfns.m (compute_tip_xy): Adjust user.

* frame.c (x_mouse_grabbed): New function.
* dispextern.h (x_mouse_grabbed): Add prototype.
(last_mouse_frame): Remove declaration.
* xterm.h (struct x_display_info):
* w32term.h (struct w32_display_info):
* nsterm.h (struct ns_display_info): New member
last_mouse_frame, going to replace...
* xdisp.c (last_mouse_frame): ...global variable.
(note_tool_bar_highlight):
* w32term.c (w32_mouse_position, w32_read_socket):
* xterm.c (XTmouse_position, handle_one_xevent):
Use x_mouse_grabbed.
* nsterm.m (ns_mouse_position, mouseDown): Adjust user.

* progmodes/gud.el (gud-mode): Silence --without-x compilation.
(tooltip-mode): Declare.

* progmodes/gud.el (gud-find-file): Silence --without-x compilation.

* eshell/em-glob.el (ange-cache):
* eshell/em-unix.el (ange-cache): Declare.

Fix typo in declaration

* emacs-lisp/chart.el (x-display-color-cells): Declare.
(chart-face-list): Drop Emacsen without display-color-p.

* semantic/find.el (semantic-brute-find-first-tag-by-name):
Replace obsolete function assoc-ignore-case with assoc-string.

* semantic/complete.el (tooltip-mode, tooltip-frame-parameters, tooltip-show):
Declare.

* gnus-util.el (image-size): Declare.

* net/shr.el (image-size, image-animate): Declare.

* net/gnutls.el (gnutls-log-level): Declare.

* net/eww.el (libxml-parse-html-region): Declare.
(eww-display-html): Explicit error if no libxml2 support.

* term.el (term-mouse-paste): Reorder to silence --without-x compilation.

* mpc.el (doc-view-mode): Silence --without-x compilation.

* follow.el (scroll-bar-toolkit-scroll, scroll-bar-drag)
(scroll-bar-scroll-up, scroll-bar-scroll-down, mwheel-scroll): Declare.

* doc-view.el (doc-view-mode): Silence --without-x compilation.

* term/ns-win.el (x-handle-args): Declare.

* w32-common-fns.el (x-server-version, x-select-enable-clipboard): Declare.

* term/w32-win.el (create-default-fontset): Declare.

* term/x-win.el (x-select-enable-clipboard): Declare.

* term/common-win.el (x-select-enable-primary, x-last-selected-text-primary)
(x-last-selected-text-clipboard): Declare.

* image.el (image-multi-frame-p): Remove --without-x warning/error.

* image.el (image-type-from-buffer): Remove --without-x warning/error.

* mouse.el (mouse-yank-primary): Reorder to silence --without-x compilation.

* frame.el (x-display-name): Declare.

* faces.el (x-display-list, x-open-connection, x-get-resource): Declare.

* lisp/subr.el (x-popup-dialog): Declare.

* mail/rmailmm.el (rmail-mime-set-bulk-data): Silence --without-x compilation.

wdired.el trivia

* lisp/wdired.el (dired-backup-overwrite): Remove declaration.
(wdired-mode-map): Add doc string.

Silence some --without-x compilation warnings

* custom.el (x-get-resource): Declare.

* frame.el (x-display-grayscale-p): Declare.

* simple.el (font-info): Declare.

* window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
(fit-frame-to-buffer): Explicit error if --without-x.
(mouse-autoselect-window-select): Silence compiler.

* eshell/esh-util.el (eshell-sublist): Remove unused local variable.

Address some "unused lexical variable" warnings

* lisp/dframe.el (x-sensitive-text-pointer-shape, x-pointer-shape): Declare.

* lisp/eshell/esh-io.el (x-select-enable-clipboard): Declare.

* lisp/erc/erc-button.el (erc-button-add-buttons):
* lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments):
* lisp/eshell/em-hist.el (eshell/history, eshell-isearch-backward):
* lisp/eshell/em-pred.el (eshell-parse-modifiers, eshell-pred-file-time):
Remove unused local variables.

* lisp/url/url-http.el (zlib-decompress-region): Declare.

* lisp/textmodes/two-column.el: Make 2C-split work for --without-x.
(scroll-bar-columns): Autoload.
(top-level): Require fringe when compiling.

* subr.el (add-hook): Robustify to handle closure as well.

lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix last change

[Gnus] Silence the byte compiler

* gnus-icalendar.el (gnus-icalendar-event--find-attendee)
(gnus-icalendar-event-from-ical)
(gnus-icalendar-event--build-reply-event-body)
(gnus-icalendar-event-reply-from-buffer)
(gnus-icalendar-find-org-event-file)
(gnus-icalendar-event->gnus-calendar, gnus-icalendar-reply)
(gnus-icalendar-mm-inline): Use gmm-labels instead of labels or flet.

* mm-util.el (mm-special-display-p): Isolate XEmacs stuff.

* lisp/simple.el (messages-buffer-mode-map): Unbind "g".

* lisp/help-mode.el (help-mode-finish): Use derived-mode-p.
Remove obsolete highlighting.

* lisp/play/life.el (life-mode): Use define-derived-mode.  Derive from
special-mode.
(life): Let-bind inhibit-read-only.
(life-setup): Avoid `setq'.  Use `life-mode'.

* lisp/gnus/gnus-agent.el (gnus-category-mode): Use define-derived-mode.
(gnus-agent-mode): Use derived-mode-p.
(gnus-agent-rename-group, gnus-agent-delete-group): Don't bind
gnus-command-method and *-command-method to nil, but bind
gnus-command-method to *-command-method instead!
(gnus-agent-fetch-articles): Remove unused var `id'.
(gnus-agent-fetch-headers): Remove unused arg `force'.
(gnus-agent-braid-nov): Remove unused arg `group'.  Adjust callers.
(gnus-agent-save-alist, gnus-agent-save-local): Remove unused `item'.
(gnus-agent-short-article, gnus-agent-long-article)
(gnus-agent-low-score, gnus-agent-high-score): Move declaration before
first use.
(gnus-agent-fetch-group-1): Remove unused vars `arts', `category',
`score-param'.
(gnus-tmp-name, gnus-tmp-groups): Defvar them.
(gnus-get-predicate): Push in front of the cache, rather than end.
(gnus-agent-expire-current-dirs, gnus-agent-expire-stats): Defvar them.
(gnus-agent-expire-group-1): Use push.  Don't abuse dyn-binding.
(gnus-agent-expire-unagentized-dirs): Don't rebind
gnus-agent-expire-current-dirs since the defvar silences the warning.
(gnus-agent-retrieve-headers): Remove unused var `cached-articles'.
(gnus-agent-regenerate-group): Remove unused vars `point' and `dl'.
(gnus-agent-regenerate): Simplify interactive spec and doc.

* lisp/gnus/gnus-eform.el (gnus-edit-form-mode): Use define-derived-mode.

* lisp/gnus/gnus-salt.el (gnus-tree-mode): Use define-derived-mode.
Use save-current-buffer.
(gnus-tree-mode-map): Initialize in the declaration.
(gnus-pick-mouse-pick-region): Remove unused var `fun'.
(scroll-in-place): Defvar it.
(gnus-tmp-*): Defvar them.
(gnus-get-tree-buffer): Use derived-mode-p.
(gnus--let-eval): New macro.
(gnus-tree-highlight-node): Use it to avoid dynamic binding of
non-prefixed variables.
(gnus-tree-open, gnus-tree-close): Remove unused arg `group'.

* lisp/gnus/gnus-sum.el (gnus-summary-highlight): Remove `below' from the list of
vars since it doesn't seem to be available.
(gnus-set-global-variables, gnus-summary-read-group-1)
(gnus-select-newsgroup, gnus-handle-ephemeral-exit)
(gnus-summary-display-article, gnus-summary-select-article)
(gnus-summary-next-article, gnus-offer-save-summaries)
(gnus-summary-generic-mark): Use derived-mode-p.
(gnus-summary-read-group-1, gnus-summary-exit)
(gnus-summary-exit-no-update, gnus-kill-or-deaden-summary):
Adjust calls to gnus-tree-close and gnus-tree-open.

* w32term.c (w32_read_socket): Avoid temporary
variables in a call to x_real_positions.
* xterm.c (handle_one_xevent): Likewise.

* lisp/emacs-lisp/package.el (package-generate-autoloads): Remove `require'
which should not be needed any more.
(package-menu-refresh, package-menu-describe-package): Use user-error.

* lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode):
Use define-derived-mode.
(semantic-symref-produce-list-on-results): Set up the results here
instead of in semantic-symref-results-mode.  Move after
semantic-symref-current-results's defvar now that it refers to that var.
(semantic-symref-auto-expand-results)
(semantic-symref-results-summary-function)
(semantic-symref-results-mode-hook): Remove redundant :group arg.
(semantic-symref, semantic-symref-symbol, semantic-symref-regexp):
Initialize directly in the let.

* lisp/eshell/esh-cmd.el (eshell-post-rewrite-command-function): New var.
(eshell-post-rewrite-command-hook): Make obsolete.
(eshell-parse-command): Simplify.
(eshell-structure-basic-command): Remove unused arg `vocal-test'.
(eshell--cmd): Declare.
(eshell-parse-pipeline): Remove unused var `final-p'.
Pass a dynvar to eshell-post-rewrite-command-hook.
Implement the new eshell-post-rewrite-command-function.
(eshell-invoke-directly): Remove unused arg `input'.
* lisp/eshell/esh-io.el (eshell-io-initialize):
Use eshell-post-rewrite-command-function.
(eshell--apply-redirections): Rename from eshell-apply-redirections;
adjust to new calling convention.
(eshell-create-handles): Rename args to avoid clashing with dynvar
`standard-output'.

Fixes: debbugs:15399

gnus-int.el (gnus-open-server): Silence compiler

* frame.h (x_set_bitmap_icon) [!HAVE_NS]: New function.
(x_icon_type): Remove prototype.
(x_bitmap_icon) [!HAVE_NS]: Declare as such.
* frame.c (x_icon_type): Remove.
* w32term.c (x_make_frame_visible, x_iconify_frame):
* xterm.c (x_make_frame_visible, x_iconify_frame):
Use x_set_bitmap_icon to factor out common code.

* dispextern.h (check_x_display_info, x_get_string_resource):
Declare here just once and unify the latter.
* frame.c (check_x_display_info, x_get_string_resource):
* nsterm.h (check_x_display_info):
* xrdb.c (x_get_string_resource):
* xterm.h (check_x_display_info): Remove prototypes.
* nsfns.m (x_get_string_resource): Likewise.  Adjust definition.
* w32reg.c (x_get_string_resource): Likewise.
(w32_get_rdb_resource): Adjust user.

lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag

Auto-commit of generated files.

message.el (message-display-completion-list): Abolish

* xterm.h (struct x_display_info): New member
x_pending_autoraise_frame, going to replace...
* xterm.c (pending_autoraise_frame): ...static variable.
(x_new_focus_frame, XTread_socket): Adjust users.
* w32term.h (struct w32_display_info): New member
w32_pending_autoraise_frame, going to replace...
* w32term.c (pending_autoraise_frame): ...global variable.
(x_new_focus_frame, w32_read_socket): Adjust users.

Fix ChangeLog typos

ChangeLog whitespace fixes

Commentary update

Add a major-mode for the *Messages* buffer

Ref: http://lists.gnu.org/archive/html/emacs-devel/2010-02/msg00135.html

* lisp/simple.el (messages-buffer-mode): New major mode.
(messages-buffer): New function.

* lisp/startup.el (normal-top-level): Switch mode of *Messages* buffer.

* src/xdisp.c (message_dolog): If we create *Messages*,
switch it to messages-buffer-mode.

* lisp/emacs-lisp/ert.el (ert--force-message-log-buffer-truncation)
(ert-run-test): Use `message-buffer' function.
(ert--force-message-log-buffer-truncation): Ignore read-only.

* lisp/help.el (view-echo-area-messages): Use `message-buffer' function.

* lisp/mail/emacsbug.el (report-emacs-bug): Use `message-buffer' function.

* lisp/gnus/gnus-util.el (gnus-message-with-timestamp-1):
Use `message-buffer' function if available.  Ignore read-only.

* etc/NEWS: Mention this.

* xterm.c (toplevel) [USE_MOTIF]: Include xlwmenu.h to pacify GCC.

ChangeLog whitespace fixes

Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org

Don't overuse 'const' in types of locals.

* bidi.c (bidi_count_bytes):
* gtkutil.c, gtkutil.h (xg_event_is_for_menubar)
(xg_event_is_for_scrollbar):
* xselect.c (x_handle_property_notify)
(x_handle_selection_notify, x_handle_dnd_message):
* xsettings.c, xsettings.h (xft_settings_event):
* xterm.c (x_handle_net_wm_state, handle_one_event)
(x_menubar_window_to_frame, x_detect_focus_change)
(construct_mouse_click, note_mouse_movement)
(x_scroll_bar_to_input_event, x_scroll_bar_expose)
(x_scroll_bar_handle_click, x_scroll_bar_note_movement)
(handle_one_xevent, x_handle_net_wm_state):
* xterm.h (x_handle_property_notify, x_handle_selection_notify)
(x_handle_dnd_message):
Avoid unnecessary 'const', typically the second 'const' in
'const foo * const arg', a 'const' that does not affect the API
and doesn't significantly help the human reader.

* xterm.c (handle_one_xevent): Do not call to x_clear_area
if GTK >= 2.7.0.

* configure.ac: Do not check for g_type_init because we
require glib >= 2.28 for GTK3, glib >= 2.10 for GTK2,
glib >= 2.26 for GSettings and glib >= 2.7.0 for GConf, so
suitable glib should provide g_type_init unconditionally.
* src/image.c (fn_g_type_init) [WINDOWSNT]: Define and load
only if Glib < 2.36.0.
(fn_g_type_init) [!WINDOWSNT]: Define only if Glib < 2.36.0.
* src/xsettings.c (init_gconf, init_gsettings): Do not check
for g_type_init.

message.el (message-expand-group, message-completion-in-region): Correct the order of start and end of a region

* lisp/url/url-misc.el (url-data): Avoid match-data mix-up with base64 case.
Use Content-Transfer-Encoding rather than Content-Encoding.

Fixes: debbugs:15285

* test/automated/eshell.el (eshell-match-result):
Return a more informative failure than simply "false".  Update callers.

Fix comment typo

* test/automated/eshell (eshell-test/for-name-shadow-loop): Tweak previous

* lisp/icomplete.el (icomplete-in-buffer): New var.
(icomplete-pre-command-hook, icomplete-post-command-hook): Remove those
vars and replace them with functions.
(icomplete-minibuffer-setup): Adjust accordingly.
(icomplete--completion-table, icomplete--completion-predicate)
(icomplete--field-string, icomplete--field-beg, icomplete--field-end):
New functions.
(icomplete-forward-completions, icomplete-backward-completions)
(icomplete-simple-completing-p, icomplete-exhibit)
(icomplete-completions): Use them.
(icomplete--in-region-buffer): New var.
(icomplete--in-region-setup): New function.
(icomplete-mode): Use it.

* test/automated/eshell.el (eshell-test/for-name-shadow-loop):
Test value before and after loop as well as during.

* etc/CONTRIBUTE: Copyedits.

* lisp/eshell/esh-opt.el: Fix last change to set lexical-vars properly.
(eshell--do-opts): Rename from eshell-do-opt, remove arg `body-fun',
return args and options.
(eshell-eval-using-options): Use the new return value of
eshell--do-opts to set the options's vars in their scope.
(eshell--set-option): Rename from eshell-set-option.
Add arg `opt-vals'.
(eshell--process-option): Rename from eshell-process-option.
Add arg `opt-vals'.
(eshell--process-args): Use an `opt-vals' alist to store the options's
values during their processing and return them additionally to the
remaining args.

Fixes: debbugs:15379

* xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0
before calling g_type_init.

* etc/CONTRIBUTE: Clarify disclaimer a bit.

* lisp/subr.el (eval-after-load): Preserve evaluation order.

Fixes: debbugs:15389

Fix syms_of_(mac|ms)font calls.

* font.c (syms_of_font): Move call to syms_of_(ns|mac)font ...

* nsterm.m (syms_of_nsterm): ... to here.

* xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.
(ignore_next_mouse_click_timeout): Use Time as X does.
(handle_one_xevent): Avoid cast and use unsigned comparison.