* lisp/emacs-lisp/bytecomp.el: Add a warning and remove a spurious warning.
(byte-compile-initial-macro-environment): Don't compile before eval in
`eval-and-compile'.
(byte-compile-arglist-warn): Add check for defining macros after their
first use.  Check call use even if the function is fboundp.

Make rmail-epa-decrypt handle more ways of formatting the message.

* mail/rmail.el (rmail-epa-decrypt): Detect armor with line prefixes.
Check more carefully for mime-part specified character set.
Check for mime-part Content Transfer Encoding.
Notify if no armor found.

build-aux/msys-to-w32: Minor doc fixes.

Makefile.in (epaths-force-w32): Simplify.

* Makefile.in (epaths-force-w32): Simplify, assuming that the shell is
bash (as is the case in MSYS).
(msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer used).

build-aux/msys-to-w32: simplify the initial interface.

* build-aux/msys-to-w32: simplify the initial over-engineered
interface, and the implementation.
* Makefile.in (epaths-force-w32): Update for the above.

Run `window-configuration-change-hook' only after all faces have been realized.

* frame.c (adjust_frame_size): Call x_set_window_size only if
f->can_x_set_window_size is set.
(make_frame): Initialize f->can_x_set_window_size and
f->can_run_window_configuration_change_hook.
(Fcan_run_window_configuration_change_hook): New function.
* frame.h (frame): Split `official' into `can_x_set_window_size'
and `can_run_window_configuration_change_hook'.
* nsfns.m (Fx_create_frame): Set f->can_x_set_window_size.
* w32fns.c (Fx_create_frame, x_create_tip_frame): Set
f->can_x_set_window_size.
* window.c (run_window_configuration_change_hook): Return
immediately if either f->can_x_set_window_size or
f->can_run_window_configuration_change_hook are false.
(Fset_window_configuration): Instead of f->official set
f->can_x_set_window_size.
* xfns.c (Fx_create_frame, x_create_tip_frame): Set
f->can_x_set_window_size.
* faces.el (face-set-after-frame-default): Enable running
`window-configuration-change-hook'.

* nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge
cleanup from 2014-11-01.

Fixes: debbugs:18972

* lisp/replace.el: History for query replace pairs.
(query-replace-defaults): Promote to a list of cons cell.  Doc fix.
(query-replace-from-to-separator): New variable.
(query-replace-read-from): Let-bind query-replace-from-to-history
to a list of FROM-TO strings created from query-replace-defaults
and separated by query-replace-from-to-separator.  Use it as
the history while reading from the minibuffer.  Split the returned
string by the separator to get FROM and TO parts, and add them
to the history variables.
(query-replace-read-to): Add FROM-TO pairs to query-replace-defaults.
(query-replace-regexp-eval): Let-bind query-replace-defaults to nil.
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00253.html

* lisp/isearch.el (isearch-text-char-description): Keep characters
intact and put formatted strings with the `display' property.

* src/keyboard.c: Call gui-set-selection instead of x-set-selection.
* src/xdisp.c (window-scroll-functions): Improve docstring.

Uniquify the 'size' symbol.

* frame.c (Qsize):
* w32notify.c (Qsize): Remove.
* lisp.h (Qsize): New decl.
* lread.c (Qsize): Now extern.
* w32notify.c (syms_of_w32notify): No need to defsym.

doc/misc/gnus.texi (HTML): Fix xref to EWW

Improve inhibiting of implied frame resizes.

* frames.texi (Size and Position): Rewrite description of
`frame-inhibit-implied-resize'.
* cus-start.el (frame-resize-pixelwise): Fix group.
(frame-inhibit-implied-resize): Add entry.
* dispnew.c (change_frame_size_1): Fix call of
adjust_frame_size.
* frame.c (Qsize, Qframe_position, Qframe_outer_size)
(Qframe_inner_size, Qexternal_border_size, Qtitle_height)
(Qmenu_bar_external, Qmenu_bar_size, Qtool_bar_external)
(Qtool_bar_size): New constants.
(frame_inhibit_resize, adjust_frame_size): New argument to
handle case where frame_inhibit_implied_resize is a list.
(Fmake_terminal_frame, Fset_frame_height, Fset_frame_width)
(Fset_frame_size, x_set_left_fringe, x_set_right_fringe)
(x_set_right_divider_width, x_set_bottom_divider_width)
(x_set_vertical_scroll_bars, x_set_horizontal_scroll_bars)
(x_set_scroll_bar_width, x_set_scroll_bar_height): Update
callers.
(frame-inhibit-implied-resize): Rewrite doc-string.
* frame.h (frame_inhibit_resize, adjust_frame_size): Fix
external declarations.
(Qframe_position, Qframe_outer_size)
(Qframe_inner_size, Qexternal_border_size, Qtitle_height)
(Qmenu_bar_external, Qmenu_bar_size, Qtool_bar_external)
(Qtool_bar_size): Extern them.
* gtkutil.c (FRAME_TOTAL_PIXEL_HEIGHT, FRAME_TOTAL_PIXEL_WIDTH)
(xg_height_or_width_changed): Remove.
(xg_frame_set_char_size): Adjust adjust_frame_size calls.
(menubar_map_cb, xg_update_frame_menubar, free_frame_menubar)
(tb_size_cb, update_frame_tool_bar, free_frame_tool_bar)
(xg_change_toolbar_position): Call adjust_frame_size directly.
* nsfns.m (x_set_internal_border_width, Fx_create_frame): Fix
calls of adjust_frame_size.
* w32fns.c (x_set_internal_border_width, x_set_menu_bar_lines)
(Fx_create_frame, x_create_tip_frame): Adjust adjust_frame_size
calls.
(x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that
frame can get resized when tool-bar-lines parameter changes from
or to zero.
(Fw32_frame_menu_bar_size): Return fourth value.
(Fw32_frame_rect): Block input around system calls
(Fx_frame_geometry): New function.
* w32menu.c (set_frame_menubar): Adjust adjust_frame_size call.
* w32term.c (x_new_font): Adjust adjust_frame_size call.
* widget.c (EmacsFrameSetCharSize): Adjust frame_inhibit_resize
call.
* window.c (Fset_window_configuration): Adjust adjust_frame_size
call.
* xfns.c (x_set_menu_bar_lines, x_set_internal_border_width)
(Fx_create_frame): Adjust adjust_frame_size calls.
(x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that
frame can get resized when tool-bar-lines parameter changes from
or to zero.
(Fx_frame_geometry): New function.
* xmenu.c (update_frame_menubar): On Lucid call
adjust_frame_size with one pixel less height to avoid that
repeatedly adding/removing the menu bar grows the frame.
(free_frame_menubar): On Motif arrange to optionally preserve
the old frame height when removing the menu bar.
* xterm.c (x_new_font): Adjust adjust_frame_size call.

doc/misc/{gnus.texi,gnus-faq.texi}: Add link to EWW manual

* gnus.texi (HTML): Update section so that it mentions shr and w3m.
Also link the full EWW manual that explains more on shr, too.

* gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to
increase contrast when displaying HTML mail with shr.

Document how to increase contrast in EWW/shr

* doc/misc/eww.texi (Advanced): Document increasing contrast with
shr-color-visible-distance-min and
shr-color-visible-luminance-min.

epg: Utilize --pinentry-mode added in GnuPG 2.1

* epa.el (epa-pinentry-mode): New user option.
(epa-sign-file, epa-encrypt-file, epa-decrypt-region)
(epa-sign-region, epa-encrypt-region): Respect epa-pinentry-mode.
* epa-file.el (epa-file-insert-file-contents)
(epa-file-write-region): Respect epa-pinentry-mode.

epg: Adjust to GnuPG 2.1 key listing change

* epg.el (epg--list-keys-1): Ignore fields after the 15th field
(bug#18979).  Reported by Hideki Saito.

package.el: Fix the last commit

package.el: Display output sent to stderr, when verification failed

* emacs-lisp/package.el (package--display-verify-error): New function.
(package--check-signature): Use it to display output sent to stderr.

epg: Fix the last commit

* epg.el (epg-context): Initialize ERROR-OUTPUT as "" instead of nil.

* lisp/subr.el (pop): Don't call the getter twice.

Fixes: debbugs:18968

* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Optimize away trivial
uses of `funcall'.

epg: Improve error handling

* epa.el (epa-error-buffer): New variable.
(epa-display-error): New function.
(epa-decrypt-file, epa-verify-file, epa-verify-region)
(epa-delete-keys, epa-import-keys): Display output sent to stderr.
(epa-sign-file, epa-sign-region, epa-encrypt-region)
(epa-export-keys, epa-insert-keys): Display output sent to stderr.
Use setf instead of epg-context-set-*.
* epa-file.el (epa-file-insert-file-contents): Use
epa-display-error instead of epa-display-info.  Mimic the behavior
of jka-compr when decryption program is not found.
(epa-file-write-region): Use epa-display-error instead of
epa-display-info.

* lisp/vc/vc/git.el: Fix previous.
Move new code after vc-git-log-view-mode definition to avoid bootstrap error.
Ref: http://hydra.nixos.org/build/16795500

* lisp/vc/vc.el (vc-region-history): New command.
(vc-print-log-internal): Use cl-some.
* lisp/vc/vc-git.el (vc-git-region-history): New function.
(vc-git-region-history-mode-map)
(vc-git--log-view-long-font-lock-keywords)
(vc-git-region-history-font-lock-keywords): New vars.
(vc-git-region-history-font-lock): New function.
(vc-git-region-history-mode): New major mode.

Require subst-x only at compile-time

* lisp/net/eww.el (subr-x): Require subr-x at compile-time because eww
uses string-trim.

* NEWS: Mention `url-user-agent'.

url-http.el (url-user-agent): Add :version.

url-http.el: introduce url-user-agent

* url-http.el (url-user-agent): New variable, can be function or
string.  Suggested by Vibhav Pant <vibhavp@ubuntu.com>.

(url-http-user-agent-string): Use it.

* url-http.el (url-user-agent): New variable, can be function or
string.  Suggested by Vibhav Pant <vibhavp@ubuntu.com>.

Fix void-function string-trim error

* lisp/net/eww.el (subr-x): Require subr-x because eww uses
string-trim.

epg: Collect output lines sent to stderr

* epg.el (epg-context): Add new slot ERROR-OUTPUT.
(epg-error-output): New buffer-local variable.
(epg--start): Initialize epg-error-output.
(epg--process-filter): Record output lines sent to stderr, in
epg-error-output.
(epg-wait-for-completion): Copy epg-error-output to ERROR-OUTPUT
slot of context.
* epa-file.el (epa-file-insert-file-contents): On error, display
output sent to stderr.
(epa-file-write-region): Likewise.

Merge from emacs-24; up to 117669

Revert previous accidental commit

Merge from emacs-24; up to 117669

* Makefile.in (install-info, uninstall): Use --no-print-directory.
(QUIET_SUBMAKE): Remove.

Fixes: debbugs:18908

* Makefile.in (install-info, uninstall): Restore pre-2012-12-13  solution
Do not merge to trunk.

Fixes: debbugs:18908

* lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.

Fixes: debbugs:18936

Spelling fixes; tweak explanation of commit messages.

* admin/notes/repo: Avoid "DVCS" acronym without first explaining it.
Mention using the first line of a ChangeLog as the topic line, and
that commit messages should use UTF-8.
* lisp/mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".

* net/eww.el (eww): Trim URL with `string-trim'.
Suggested by Vibhav Pant <vibhavp@gmail.com>.

Fix error messages from jit-stealth-lock when load-average returns nil.

 lisp/jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
 returned by load-average.

* net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use
a local copy; setting `inhibit-file-name-handlers' proper might be
more performant.

Fixes: debbugs:18751

* lisp/mail/emacsbug.el (report-emacs-bug): Simplify interactive spec.

* lisp/mail/emacsbug.el (report-emacs-bug): No longer include recent-keys

Fixes: debbugs:18900

eww readability tweak

* net/eww.el (eww-score-readability): Don't count comments positively.

shr typo fix from recent check-in

* net/shr.el (shr-retransform-dom): Typo fix.

eww point positioning tweak

(eww-display-html): Don't leave point inside forms.

Minor readability parsing issues with SVC images

* net/eww.el (eww-score-readability): Parse SVC images correctly.

* net/shr.el: Ditto.

* lisp/emacs-lisp/byte-run.el (defun-declarations-alist): Fix compiler-macro
autoloading when specified as a lambda.
* lisp/emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Assume that
edebug-prin1-to-string already handles circularity.

Minor `shr-retransform-dom' fix

* net/shr.el (shr-retransform-dom): Don't ignore elements that
have no children like <br />.

* lisp/simple.el (execute-extended-command--last-typed): New var.
(read-extended-command): Set it.
Don't complete obsolete commands.
(execute-extended-command--shorter-1)
(execute-extended-command--shorter): New functions.
(execute-extended-command): Use them to suggest shorter names.
(indicate-copied-region, deactivate-mark): Use region-active-p.

doc/misc/auth.texi (Help for users): Explain quoting rules better

Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org

NEWS and comment trivia re crisp.el

Remove `eww-colorize-region'

(eww-colorize-region): Remove duplicate function.
(eww-tag-body): Use `shr-colorize-region'.

eww compilation warning fix

(url-queue): Require `url-queue' to avoid compilation warning.

Make eww display PDFs inline

* net/eww.el (eww-display-html): Clear `url-queue'.
(eww-display-pdf): New function.
(eww-render): Display PDFs with `doc-view'.

* INSTALL: Remove univeral binary section.

src/window.c (window_scroll_pixel_based): Fix a typo in a comment.

Fix minor issues with functions that dump glyph matrices.

 src/xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix.
 (Fdump_frame_glyph_matrix): Don't segfault if invoked on a GUI
 frame; instead, print an error message.

* net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a
local copy of FILENAME, when it is remote.

Fixes: debbugs:18751

* net/eww.el (eww-list-bookmarks): Autoload.

* nsfns.m (ns_set_doc_edited): Check for FRAME_NS.

Fixes: debbugs:18925

Add missing ChangeLog entry from previous checkin

* net/shr.el (shr-retransform-dom): Allow several text sub-nodes.

Make titles in eww prettier

(eww-tag-title): Remove newlines and extra whitespace from the
displayed title.

Fix `eww-display-html' bug when passed an explicit DOM

(eww-display-html): Don't try to decode the text if we've been
passed in a pre-parsed DOM.

Have `R' in eww save the history

(eww-readable): Save the history before displaying so that we can
go back to the non-readable version.

Fix charset problems with the `R' command in eww

* net/eww.el (eww-display-html): The charset is called `utf-8',
not `utf8'.
(eww-readable): Decode the saved text correctly.

Add a new, somewhat experimental "readability" command to eww

* net/eww.el (eww-readable): New command and keystroke.

* net/shr.el (shr-retransform-dom): New function.

Fix `eww-current-source' buffer confustion

* net/eww.el (eww-display-html): Set `eww-current-source' in the
correct buffer.
(eww-view-source): Use it.

ChangeLog: Add bug numbers.

* net/eww.el (eww): Recognize colon-delimited IPv6 addresses..

* net/eww.el (eww-submit): Encode empty form values as "".

* net/eww.el (eww): Allow "file:/file/name" URLs.

* net/eww.el (eww-mode-map): Remove mentions of `eww-quit'.

Fix memory leak

* nsimage.m (allocInitFromFile:): Initialize bmRep.
(dealloc): Release bmRep.

* nsimage.m (ImageList, imageListNext, imageListSetNext:)
(reference): Remove.
(allocInitFromFile:): Remove searching ImageList and calling
reference.
(dealloc): Remove handling if ImageList.

* nsterm.h (EmacsImage): Remove imageListNext, refCount, reference,
imageListSetNext, imageListNext.

Fixes: debbugs:18918

Fix incorrect assertion

* process.c (catch_child_signal): Fix incorrect assertion.

Fix bug #18897 with printing large objects from eieio.el.

 lisp/emacs-lisp/eieio.el (eieio-edebug-prin1-to-string): Adjust
 for use as advice.
 (edebug-setup-hook): Advise `edebug-prin1-to-string'.

* net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise
an error when the command fails; the return code must indicate.
(tramp-adb-send-command-and-check): Fix docstring.

* lisp/emacs-lisp/pp.el (pp-macroexpand-expression): Use macroexpand-1.
* lisp/progmodes/elisp-mode.el (emacs-lisp-macroexpand): Idem.

Fixes: debbugs:18821

sql.el (sql-mode-oracle-font-lock-keywords): Correct regexp
syntax, add new keywords, and parse longer keywords first.
(sql-redirect-one): Protect against empty command.
(sql-mode, sql-interactive-mode): Set `custom-mode-group\' property

* sql.el (sql-interactive-mode, sql-stop): Correct fix for
Bug#16814 with let-bind of comint-input-ring variables around read
and save functions.

Clean up merge conflict.

* macfont.m (macfont_draw):
* nsterm.m (ns_mouse_position, judge): Clean up merge conflict.

* doc/emacs/programs.texi (Misc for Programs): Fix typo.

Merge from emacs-24; up to 117656

ChangeLog simplification

Fix ChangeLog typo

* net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Check, that `tramp-cache-get-count-*'
and `tramp-cache-set-count-*' are bound.  Otherwise, there might
be compiler warnings.

* net/tramp-sh.el (tramp-get-remote-uid, tramp-get-remote-gid):
Return -1 respective "UNKNOWN", if uid or gid cannot be determined.

Make blink-parens work with a closing template delimiter.
progmodes/cc-cmds.el (c-electric-lt-gt): Cause a redisplay
before calling blink-paren-function, so as to apply syntax-table
properties to the ">".

Ignore BUFFER_SWITCH_EVENT events for the purposes of input-pending-p.

 src/keyboard.c (readable_events): When FLAGS include
 READABLE_EVENTS_FILTER_EVENTS, ignore BUFFER_SWITCH_EVENT events.
 This avoids returning non-nil from input-pending-p when only such
 events are in the queue.

Fixes: debbugs:18856

Fix bug #18856 with failure to fontify compilation buffers.

 lisp/progmodes/compile.el (compilation-mode): Turn off deferred
 fontifications locally.

* net/tramp-sh.el (tramp-send-command): Fix the case where the
remote-echo connection property is non-nil.

Fixes: debbugs:18858

Backport Tramp changes from trunk.

* net/tramp-adb.el (tramp-adb-sh-fix-ls-output): Use `bolp'.
(tramp-adb-handle-write-region): Improve messages.
(tramp-adb-maybe-open-connection): Don't set
`tramp-current-*' variables.

* net/tramp-cache.el (tramp-flush-file-function): Simplify check.
Suppress debug messages.

* net/tramp-ftp.el (top): Remove special handling for URL syntax.
(tramp-ftp-file-name-handler):

* net/tramp-gvfs.el (tramp-gvfs-methods) <sftp>: Add.
(tramp-gvfs-methods-mounttracker)
(tramp-gvfs-mountlocation-signature): Check `tramp-gvfs-enabled'
during initialization.
(tramp-gvfs-handle-delete-file): Flush file properties, not
directory properties.
(tramp-gvfs-handle-file-attributes): Use `string-to-number' when
reading "unix::mode".
(tramp-gvfs-handle-file-name-all-completions):
Use "-h" option for "gvfs-ls".
(tramp-gvfs-url-file-name): Apply `cons' where appropriate.
`user' and `localname' could be nil.
(tramp-gvfs-send-command): Simplify traces.

* net/tramp-sh.el (vc-handled-backends, vc-bzr-program)
(vc-git-program, vc-hg-program): Declare.
(tramp-methods) <sftp>: Remove.  It has never worked satisfactorily.
(tramp-methods) <nc>: Add new method.
(tramp-methods) <telnet>: Redirect stderr to "/dev/null".
(tramp-methods) <plink, plinkx, pscp, psftp>: Improve
`tramp-login-args'.
(tramp-default-user-alist): Add "nc".
(top): Remove completion function for "sftp".  Add completion
functions for "nc" and "psftp".
(tramp-sh-handle-set-visited-file-modtime):
(tramp-sh-handle-verify-visited-file-modtime): Use `point-at-eol'.
(tramp-do-copy-or-rename-file-out-of-band):
Use cached "remote-copy-args" value, if available.  (Bug#18199)
Tweak docstring.  Implement support for "nc" method.
(tramp-sh-handle-expand-file-name, tramp-local-coding-commands)
(tramp-remote-coding-commands, tramp-call-local-coding-command):
Tweak docstring.
(tramp-sh-handle-start-file-process): Expand `default-directory'.
(tramp-sh-handle-write-region): Tweak error message.
(tramp-sh-handle-vc-registered): Remove backends when the remote
binary does not exist.
(tramp-open-connection-setup-interactive-shell):
Prefer utf-8 coding.  (Bug#17859)
(tramp-find-inline-encoding): Do not raise an error.
(tramp-make-copy-program-file-name): Tweak docstring.  Handle also
the "nc" case.  Quote result also locally.
(tramp-get-remote-id): Check also for "gid".
(tramp-get-remote-python):

* net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-set-file-acl): Use `start-process'.
(tramp-smb-handle-insert-directory): Use progress reporter.
(tramp-smb-handle-rename-file): Flush also file properties of
FILENAME.

* net/tramp.el (tramp-methods): Tweak docstring.
(tramp-file-name-handler): Apply `cons' where appropriate.
(tramp-handle-file-accessible-directory-p): Check for
`file-readable-p' instead of `file-executable-p'.
(tramp-handle-shell-command): Use `display-buffer'.  (Bug#18326)
(tramp-handle-unhandled-file-name-directory): Return "/".
(tramp-check-cached-permissions):
Use `tramp-compat-file-attributes'.
(tramp-call-process): Add new argument VEC.  Adapt callees in all
tramp*.el files.

* net/trampver.el: Update release number.

nsselect.m cleanup, remove unused, declare vars static.

* nsselect.m (QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME)
(NXPrimaryPboard, NXSecondaryPboard): Declare static.
(Qforeign_selection): Remove.
(ns_get_local_selection): Identation fix.
(syms_of_nsselect): Remove Qforeign_selection, ns-lost-selection-hooks

* lisp/select.el (gui-get-selection): Comment: data-type ignored on NS.

* src/nsselect.m (ns_get_local_selection): Remove calling of
functions in Vselection_converter_alist.
(syms_of_nsselect): Remove Vselection_converter_alist.

Fixes: debbugs:18911

Auto-commit of loaddefs files.

Correct name on yesterday's patch "Add "enum classs" support to C++ mode."
to Daniel Colascione.

Auto-commit of loaddefs files.

* lisp/emacs-lisp/macroexp.el (macroexpand-1): New function.
(macroexp--expand-all): Unrelated tweaks.
* lisp/emacs-lisp/gv.el (gv-get): Use macroexpand-1.

Fixes: debbugs:18821

* lisp/simple.el (newline): Add assertions to try and help catch bug#18913.