* lisp/vc/vc-annotate.el (vc-annotate-background-mode): New defcustom.
(vc-annotate-color-map): Use less saturated colors (20%) for
background-mode.
(vc-annotate-very-old-color): Add default value for background-mode.
(vc-annotate-background): Set default value to nil since now text on
the default backgrounds should be legible in light and dark modes.
(vc-annotate-lines): Use `vc-annotate-background-mode'.  Doc fix.

Fixes: debbugs:17808

* lisp/simple.el (transpose-chars): Don't move point into read-only area.

Fixes: debbugs:17829

* lisp/window.el (with-displayed-buffer-window): New macro.
(with-temp-buffer-window, with-current-buffer-window):
Use `macroexp-let2' to evaluate and bind variables
in the same order as macro arguments.
(display-buffer--action-function-custom-type): Add
`display-buffer-below-selected' and `display-buffer-at-bottom'.

* lisp/minibuffer.el (minibuffer-completion-help): Replace
`with-output-to-temp-buffer' with `with-displayed-buffer-window'
with actions that display *Completions* at-bottom when called
from the minibuffer, or below-selected in a normal buffer.
Associate `window-height' with `fit-window-to-buffer'.
Let-bind `pop-up-windows' to nil.

* lisp/dired.el (dired-mark-pop-up): Use `with-displayed-buffer-window'
instead of `with-current-buffer-window'.

Fixes: debbugs:17809

* chartab.c (char_table_translate): Move to...
* character.h (char_table_translate): ... inline function here.
Avoid Faref and assume that args are always valid.  This helps to
speedup search, which is especially important for a huge buffers.
* lisp.h (char_table_translate): Remove prototype.

* process.c: Add sanity checks for file descriptors.

(wait_reading_process_output, Fprocess_filter_multibyte_p):
Check that infd is nonnegative before using it as an fd.
(read_and_dispose_of_process_output, Fprocess_send_eof):
Likewise, for outfd.
(wait_reading_process_output): Omit unnecessary check of infd.

Fixes: debbugs:17844

ChangeLog fix: correcting file path.

Minor fixups related to usage of the 'long' type.

* gnutls.c (emacs_gnutls_handshake):
* xfaces.c (dump_realized_face):
Work even if 'long' is narrower than 'void *'.
* termcap.c (scan_file):
* xselect.c (x_decline_selection_request)
(x_reply_selection_request, x_get_window_property):
* xterm.c (x_set_frame_alpha):
Remove unnecessary 'L' suffixes of integer constants.
* xfns.c (hack_wm_protocols):
* xselect.c (x_fill_property_data):
* xterm.c (x_set_offset, x_set_window_size_1, x_make_frame_invisible):
Remove unnecessary casts to 'long'.
(set_machine_and_pid_properties): Don't assume pid_t fits in 32 bits.

Minor ImageMagick safety fixes.

* image.c (imagemagick_compute_animated_image):
Remove useless assignment to local.  Avoid problems if dest_width is 0.
(imagemagick_load_image): Use int for pixel counts that can't
exceed INT_MAX.  Avoid problem if PixelGetNextIteratorRow returns
a row width greater than the image width (or greater than LONG_MAX!).

HideIfDef mode bug fixes and enhancements. This is #3 of 3 patches based
on the completed work posted on http://www.emacswiki.org/emacs/HideIfDef.

- Add macro evaluation function and key binding for a marked region.
- Merge continuous "..." lines into one.
- Fix old hideif bugs that fail to hide the correct #elif regions
- Support hide/show commands in a marked region.
- Expand top level for .h files to prevent re-inclusion protection.
- Change maintainer.

* lisp/progmodes/hideif.el (hide-ifdef-env): Change to global.
(hide-ifdef-env-backup): New variable.
(hide-ifdef-expand-reinclusion-protection, hide-ifdef-header-regexp):
New customizable variables.
(hif-clear-all-ifdef-defined): New defun.
(hif-merge-ifdef-region, hide-ifdef-region-internal, hide-ifdef-region)
(hif-show-ifdef-region): Merge hidden regions to prevent continuous "...".
(hif-tokenize): Fix for MS-DOS/Win EOL style.
(hif-endif-to-ifdef, hif-make-range, hif-find-range, hif-possibly-hide):
Fix bug to hide the correct #elif region(s).
(hif-range-elif): New defun.
(hif-recurse-level): New var.
(hif-evaluate-region, hif-evaluate-macro): New defun.
(hide-ifdef-guts): Prevent reinclusion protected C/C++ headers from
fully hidden.
(hide-ifdef-define, hide-ifdefs, hide-ifdef-block, show-ifdef-block):
Better interaction.

lisp/gnus/gnus-start.el (gnus-dribble-read-file): Don't stop auto-saving

merge trunk

* automated/dbus-tests.el (dbus-test02-register-service-session)
(dbus-test02-register-service-system): Fix docstring.
(dbus-test02-register-service-own-bus)
(dbus-test03-peer-interface): New tests.

Fix Bug#17858

* net/dbus.el (dbus-peer-handler): New defun.
(dbus-register-service): Register it.
(dbus-managed-objects-handler): Fix docstring.

* font.h (struct font_driver): Remove get_outline and free_outline;
not used by any font driver.
* ftfont.c (ftfont_driver):
* macfont.m (macfont_driver):
* nsfont.m (nsfont_driver):
* w32font.c (w32font_driver):
* w32uniscribe.c (uniscribe_font_driver):
* xfont.c (xfont_driver): Related users changed.
* xselect.c (x_get_window_property): Use convenient xmalloc.
Call to xfree only if some data was really allocated.

* lisp/emacs-lisp/lisp.el (narrow-to-defun-include-comments): New var.
(narrow-to-defun): New arg include-comments, defaulting to it.

Fixes: debbugs:16328

* lisp/rect.el (rectangle--highlight-for-redisplay): Don't pass `orig' with
different calling convention to rectangle--unhighlight-for-redisplay.

On MS-Windows, display busy cursor on all GUI frames.
This is similar to what we have on X.  Quickly tested by Dani Moncayo.
* w32fns.c (toplevel): Remove hourglass_hwnd; no longer used.
(w32_show_hourglass, w32_hide_hourglass, w32_note_current_window):
Likewise.
(hide_hourglass, show_hourglass): Redesign to match X counterparts.
* xdisp.c (start_hourglass): Remove Windows-specific bits.

Fix nick duplication in format-@nick

Use convenient alists to manage per-frame font driver-specific data.
* frame.h (struct frame): Rename font_data_list to...
[HAVE_XFT || HAVE_FREETYPE]: ... font_data, which is a Lisp_Object now.
* font.h (struct font_data_list): Remove; no longer need a special
data type.
(font_put_frame_data, font_get_frame_data) [HAVE_XFT || HAVE_FREETYPE]:
Adjust prototypes.
* font.c (font_put_frame_data, font_get_frame_data)
[HAVE_XFT || HAVE_FREETYPE]: Prefer alist functions to ad-hoc list
management.
* xftfont.c (xftfont_get_xft_draw, xftfont_end_for_frame):
Related users changed.
* ftxfont.c (ftxfont_get_gcs, ftxfont_end_for_frame): Likewise.
Prefer convenient xmalloc and xfree.

* net/tramp-adb.el (tramp-adb-sh-fix-ls-output): Use `bolp'.

* net/tramp-sh.el (tramp-sh-handle-set-visited-file-modtime)
(tramp-sh-handle-verify-visited-file-modtime): Use `point-at-eol'.

* net/tramp.el (tramp-call-process): Handle error strings.

* net/trampver.el: Update release number.

* trampver.texi: Update release number.

Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org

* lisp/desktop.el (desktop-save): Rename arg `auto-save' to `only-if-changed'.
Doc fix.

Fixes: debbugs:17873

* lisp.h (toplevel): Add compile-time assert to verify suitable member layout
in Lisp_Sub_Char_Table.

* mouse.el (mouse-yank-primary, mouse-yank-secondary): Use insert-for-yank.

Fixes: debbugs:17271

* print.c (print_object): Adjust to match new layout of sub char-table
(Bug#17898).

* emacs-lisp/pp.el (pp-eval-expression, pp-eval-last-sexp):
Support lexical-binding.

* lisp/progmodes/hideif.el (hide-ifdef-exclude-define-regexp): Add the
forgotten :version "24.5".

Shrink Lisp_Sub_Char_Table by preferring C integers to Lisp_Objects.
* lisp.h (struct Lisp_Sub_Char_Table): Use C integers for depth and
min_char slots.  Adjust comment.
(enum char_table_specials): Rename from CHAR_TABLE_STANDARD_SLOTS.
Add SUB_CHAR_TABLE_OFFSET member.
(make_uninit_sub_char_table): New function.
* alloc.c (mark_char_table): Add extra argument to denote char table
subtype.  Adjust to match new layout of sub char-table.
(mark_object): Always mark sub char-tables with mark_char_table.
* chartab.c (make_sub_char_table, copy_sub_char_table)
(sub_char_table_ref, sub_char_table_ref_and_range, sub_char_table_set)
(sub_char_table_set_range, optimize_sub_char_table, map_sub_char_table)
(map_sub_char_table_for_charset, uniprop_table_uncompress):
All related users changed.
* lread.c (read1): Adjust to match new layout of sub char-table.

* doc/lispref/keymaps.texi (Key Lookup): Remove mention of indirect entries.
(Scanning Keymaps): Reword the `noindirect' argument.
* src/keymap.c (get_keyelt): Simplify.
(copy_keymap_item): Remove left-over code for when we had
key-shortcut caches.

* lisp/man.el (Man-bgproc-sentinel): Use `Man-page-from-arguments'
for the message about the man page cleaned up.

Display man pages immediately and use process-filter to format them asynchronously.
* lisp/man.el (Man-width): Doc fix.
(man): Doc fix.
(Man-start-calling): Use `with-selected-window' to get
`frame-width' and `window-width'.
(Man-getpage-in-background): Call `Man-notify-when-ready'
immediately after creating a new buffer.  Call `Man-mode' and set
`mode-line-process' in the created buffer.  Set process-filter to
`Man-bgproc-filter' in start-process branch.  In call-process branch
call either `Man-fontify-manpage' or `Man-cleanup-manpage'.
Use `Man-start-calling' inside `with-current-buffer'.
(Man-fontify-manpage): Don't print messages.  Fix boundary condition.
(Man-cleanup-manpage): Don't print messages.
(Man-bgproc-filter): New function.
(Man-bgproc-sentinel): Add `save-excursion' to keep point when
user moved it during asynchronous formatting.  Move calls of
`Man-fontify-manpage' and `Man-cleanup-manpage' to
`Man-bgproc-filter'.  Move the call of `Man-mode' to
`Man-getpage-in-background'.  Use `quit-restore-window'
instead of `kill-buffer'.  Use `message' instead of `error'
because errors are catched by process sentinel.
(Man-mode): Move calls of `Man-build-page-list',
`Man-strip-page-headers', `Man-unindent', `Man-goto-page' to
`Man-bgproc-sentinel'.  Doc fix.  (Bug#2588, bug#5054, bug#9084, bug#17831)

* net/gnutls.el (gnutls-negotiate): Prevent destructive modification of
customization option `gnutls-verify-error.

* lisp/simple.el (deactivate-mark, set-mark-command, handle-shift-selection):
Don't keep transient-mark-mode buffer-local when not needed.

Fixes: debbugs:6316

src/dispnew.c: Fix a typo in a comment.

Fix bug #17892 with mode/header line and display margins.

 src/dispnew.c (prepare_desired_row): Accept 2 additional arguments:
 the window whose glyph row is being prepared and a flag whether it
 is for mode/header line.  Make sure the glyph row's marginal areas
 are in sync with what the window wants.
 src/xdisp.c (display_line, display_mode_line): Call
 prepare_desired_row with additional arguments, as appropriate.
 src/dispextern.h (prepare_desired_row): Adjust prototype.
 src/window.h: Improve commentary of the marginal columns.

* lisp/xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal): Don't burp if the terminal
is suspended.

Fixes: debbugs:17857

merge trunk

* coding.c (MIN_CHARBUF_SIZE): Delete it.
(MAX_CHARBUF_EXTRA_SIZE): New macro.
(ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE.

* lisp/vc/log-edit.el (log-edit-goto-eoh): New function.
(log-edit--match-first-line): Use it.

Fixes: debbugs:17861

Fix ChangeLog entry

* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
Prefer utf-8 coding.  (Bug#17859)

Auto-commit of loaddefs files.

Auto-commit of loaddefs files.

* menu.c (Fx_popup_dialog): Set Vmenu_updating_frame to avoid crash
caused by xw_popup_dialog in daemon mode (Bug#17891).

* xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889).

* lisp/vc/log-edit.el (log-edit-hook): Add missing :version.

* lisp/progmodes/python.el (python-indent-post-self-insert-function):
Enhancements to electric indentation behavior inside
parens.

* test/automated/python-tests.el
(python-tests-self-insert): New function.
(python-triple-quote-pairing): Use it.
(python-util-forward-comment-1): New test. (Bug#17658)

* lisp/ps-def.el (ps-generate-postscript-with-faces1): Don't mess with
buffer-invisibility-spec.

Fixes: debbugs:17867

* lisp/emacs-lisp/subr-x.el (string-reverse): Define as obsolete alias
for `reverse'.

Changelog, NEWS and Copyright fixes.

Fix use of deallocated memory.

* nsterm.h (EmacsScroller): Remove dealloc.

* nsterm.m (judge): EmacsScroller: Move dealloc code here.
(dealloc): Remove for EmacsScroller.

Get rid of the AUTOGEN_VCS variable in lisp/Makefile

* lisp/emacs-lisp/autoload.el (autoload-ensure-writable): New variable.
(autoload-ensure-default-file): Maybe make existing output writable.

* lisp/Makefile.in (AUTOGEN_VCS): Remove.
(autoloads): Use autoload-ensure-writable rather than AUTOGEN_VCS.

Fix bug #17875 with changing TTY frame size, then selecting new frame.

 src/frame.c (do_switch_frame): When switching to another TTY frame,
 make sure FrameCols and FrameRows are in sync with the new frame's
 data.

Fix bug #17881 with infloop in decoding emacs-mule encoded text.

 src/coding.c (MIN_CHARBUF_SIZE): Enlarge to 32.

Remove unnecessary redisplays in NS port.

* nsmenu.m (update_frame_tool_bar): Set wait_for_tool_bar to NO
when setNeedsDisplay is called so we don't trigger redisplay for every
tool bar update.

* nsterm.m (any_help_event_p): New variable.
(mouseMoved:): Set any_help_event_p to YES if help event is
generated.  Remove else with empty help event that triggered redisplay
for every mouse move.
(windowDidResignKey:): If any_help_event_p, generate empty help
event.

* lisp/emacs-lisp/subr-x.el (string-reverse): Use `reverse'.

New if-let, when-let, thread-first and thread-last macros.

* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.

* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.

* net/rcirc.el (rcirc-buffer-process): Restore previous behaviour.

Fixes: debbugs:17772

* update_autogen: Find loaddefs targets rather than parsing lisp/Makefile.in

* lisp/Makefile.in: Comment.

* vc/vc-git.el (vc-git-checkin): When operating on the whole tree
pass "-a".

* automated/tramp-tests.el (tramp--instrument-test-case):
Print debug buffer in any case.

* xfns.c (Qsuppress_icon): Remove; no real users.
(syms_of_xfns): Don't DEFSYM it.  Remove ancient comments.
* w32fns.c (Qsuppress_icon): Remove, for the same reason.
(syms_of_w32fns): Don't DEFSYM it.

Don't call c-parse-state when c++-template-syntax-table is active.
* progmodes/cc-engine.el (c-guess-continued-construct CASE G)
(c-guess-basic-syntax CASE 5D.3): Rearrange so that
c-syntactic-skip-backwards isn't called with the pertinent syntax
table.

Doc and comment fixes re "online" help

* doc/emacs/help.texi (Misc Help):
* doc/emacs/trouble.texi (Checklist):
* doc/lispintro/emacs-lisp-intro.texi (Note for Novices, Finding More)
(Conclusion):
* doc/lispref/help.texi (Help Functions):
* doc/misc/info.texi, doc/misc/mh-e.texi:
* etc/refcards/calccard.tex (section{Getting Help}):
* lisp/cus-edit.el (help):
* lisp/finder.el (finder-known-keywords):
* lisp/help.el (help-for-help-internal):
* lisp/vc/ediff-mult.el (ediff-meta-buffer-verbose-message)
(ediff-redraw-registry-buffer):
* lisp/vc/ediff-ptch.el (ediff-patch-file-internal):
Doc fixes re "online" help.

Fixes: debbugs:17803

Update idlwave url

* doc/misc/idlwave.texi (Introduction): Comment out dead http screenshot links.

* lisp/progmodes/idlwave.el (idlwave): Update url-link for custom group.
(idlwave-mode): Doc URL update.

* admin/update_autogen: Remove need to cd into/out of lisp/.

* src/Makefile.in (ns-app): Mark as PHONY.

* admin/grammars/Makefile.in (bootstrap-clean): Don't delete Makefile,
for sake of top-level maintainer-clean rule.

* src/Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):
Fully revert earlier dumbness.

* src/Makefile.in: Fix thinko in previous.

Small cleanup for src/Makefile liblw.a, libXMenu11.a rules

* src/Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):
Remove prerequisites, sub-makes will figure it out.
(FORCE): Remove.
(mostlyclean): There are no libXMenu11.a, liblw.a in this directory.

* oldXMenu/deps.mk (${OBJS}): Depend on ../src/config.h.

Use gcc auto-dependency information for lwlib and oldXMenu

* configure.ac (lwlib_deps_frag, oldxmenu_deps_frag): New output files.

* make-dist (lwlib, oldXMenu): Distribute *.mk.

* lwlib/Makefile.in: Move old dependency information to new file deps.mk.
(MKDIR_P, DEPFLAGS, MKDEPDIR, lwlib_deps_frag):
New, set by configure.
(DEPDIR): New variable.
(ALL_CFLAGS): Add DEPFLAGS.
(.c.o): Add MKDEPDIR.
(clean, mostlyclean): Delete DEPDIR.

* lwlib/deps.mk, lwlib/autodeps.mk: New files.

* oldXMenu/Makefile.in: Move old dependency information to new file deps.mk.
(MKDIR_P, DEPFLAGS, MKDEPDIR, oldxmenu_deps_frag):
New, set by configure.
(DEPDIR): New variable.
(ALL_CFLAGS): Add DEPFLAGS.
(.c.o): Add MKDEPDIR.
(clean, mostlyclean): Delete DEPDIR.

* oldXMenu/deps.mk, oldXMenu/autodeps.mk: New files.

* src/deps.mk: Comment update.

* .bzrignore: Ignore lwlib/deps, oldXMenu/deps.

Merge from emacs-24; up to 2014-06-12T14:55:48Z!monnier@iro.umontreal.ca

* test/automated/Makefile.in (GDB): New variable.
(emacs): Use $GDB.

Fixes: debbugs:15991

Disable logging in the short form of the test Makefile rules

* test/automated/Makefile.in (WRITE_LOG): New variable.
(%.log): Use WRITE_LOG.
(test_template): Disable logging.

merge trunk

* coding.c (MAX_CHARBUF_SIZE): Renamed from CHARBUF_SIZE.
(MIN_CHARBUF_SIZE): New macro.
(ALLOC_CONVERSION_WORK_AREA): New arg SIZE.  Callers changed.

Fixes: debbugs:17865
* coding.c (encode_coding_utf_8): Correctly count produced_chars
also in unibyte case.

* calc-test.el: Set copyright to FSF; standardize permissions notice

* test/automated/calc-tests.el: New file and add tests for math-bignum.

Fixes: debbugs:17556

ChangeLog fix

* lisp/progmodes/hideif.el: Use lexical-binding.  Fix up cl-lib usage.

merge trunk

Fix Bug#17739.

* composite.el: Setup composition-function-table for dotted circle.
(compose-gstring-for-dotted-circle): New function.

* international/characters.el: Add category "^" to all
non-spacing characters.

* lisp/Makefile.in (doit): Remove force rule.
(custom-deps, finder-data, autoloads, update-subdirs)
(compile-one-process): PHONY targets do not need force rules.

lisp/Makefile tiny simplification

* lisp/Makefile.in (compile-main, compile, compile-always):
No need to explicitly pass variables to ourself in recursive calls.

Add short test aliases that always re-run the tests

* test/automated/Makefile.in (TESTS): New list of short PHONY aliases.
(test_template): New definition.  Apply to TESTS.

* lisp/files.el (minibuffer-with-setup-hook): Evaluate the first arg eagerly.

* automated/dbus-tests.el (dbus--test-register-service)
(dbus-test02-register-service-session): Replace `dbus-ping' calls
by `dbus-list-known-names'.

Fixes: debbugs:17858

ChangeLog fix: relocate entry to correct position

Have `make check' re-run all the tests, every time

* test/automated/Makefile.in (check-maybe): Rename from check.
(check): Re-run all the tests, every time.
(clean, mostlyclean): Also delete *.log~.

* calendar/todo-mode.el (todo-set-top-priorities): Fix logic to
account for file-wide setting of todo-top-priorities-overrides.
Make code a bit cleaner.

src/w32heap.c: Minor formatting and whitespace changes.

* lisp/progmodes/hideif.el: Style fixes. Fix doc-strings and comment style,
also add a change log entry for the latest hideif.el changes.

Regenerate ldefs-boot.el

Backport fix for http://debbugs.gnu.org/17556 from trunk

* lisp/calc/calc.el (math-bignum): Handle most-negative-fixnum.

* lisp/net/eww.el (eww-mode) <eww-current-title>: Make local.

Fixes: debbugs:17860

Replace BOOTSTRAPEMACS with an order-only dependence on bootstrap-emacs

* Makefile.in (src): No more need to pass BOOTSTRAPEMACS.

* src/Makefile.in (.el.elc): Replace suffix rule with pattern rule.
(%.elc): New pattern rule, with order-only prerequisite.
($(lisp)): No more need to depend on BOOTSTRAPEMACS.
($(lispsource)/loaddefs.el): Use an order-only prerequisite
in place of BOOTSTRAPEMACS.

Fixes: debbugs:2151

* make-dist: Exclude test/automated/*.log.