coding.c (Fset_terminal_coding_system_internal): Fix previous change (set charset-ID list instead of charset-symbol list).
gnus-art.el (gnus-inhibit-images): New user option.

* gnus-art.el (gnus-inhibit-images): New user option.
(gnus-mime-display-single): Don't display image if it is non-nil.

* mm-decode.el (mm-shr): Bind shr-inhibit-images to the value of
gnus-inhibit-images.

* shr.el (shr-image-displayer): New function.
(shr-tag-img): Use it.
shr.el (shr-image-displayer): Protect function against non-existent image source.
* vc-hg.el (vc-hg-program): New var.
Suggested by Norman Gray <norman@astro.gla.ac.uk>.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it.
* lisp/progmodes/grep.el (grep-regexp-alist): Tighten the regexp.

Fixes: debbugs:7378
* lisp/progmodes/python.el (run-python): Explain why we remove the current
directory from sys.path.  Suggested by Eric Hanchrow <erich@cozi.com>.
Remove "tiny change"s for Eric Hanchrow
* src/xterm.c (get_current_wm_state): Rename from get_current_vm_state.
(do_ewmh_fullscreen, x_handle_net_wm_state): Update callers.
Fix bug #7417 with cursor positioning on empty lines.

 xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
 lines on text-mode terminals.
* emacs-lisp/smie.el (smie-bnf-classify): Signal errors for tokens
that are both openers (resp. closers) and something else.
(smie-grammar): Loosen definition of valid values.
(smie-next-sexp, smie-down-list, smie-blink-matching-open)
(smie-indent--parent, smie-rule-parent, smie-indent-keyword)
(smie-indent-after-keyword): Adjust users.
(smie-indent-keyword): Don't indent empty lines.
Merge changes made in Gnus trunk.

nnir.el (nnir-run-imap): Order the article list separately for each group.
shr.el (shr-put-image): Break lines when inserting big pictures.
mml2015.el (mml2015-epg-encrypt): Fix two cons with missing sender.
gnus-html.el: Don't display images if gnus-inhibit-images is non-nil.

(gnus-html-wash-images): Don't display images if gnus-inhibit-images is non-nil; register displayer for cid images.
(gnus-html-display-image): Work for cid image.
(gnus-html-insert-image): Allow arguments.
(gnus-html-put-image): Inhibit read-only.
(gnus-html-prefetch-images): Don't prefetch images if gnus-inhibit-images is non-nil.
Make the yank-handler argument obsolete.
* simple.el (kill-new, kill-append, kill-region):
* comint.el (comint-kill-region): Make the yank-handler argument obsolete.
gnus.texi (Misc Article): Document gnus-inhibit-images.
* lisp/electric.el (electric-pair-pairs): New var.
(electric-pair-post-self-insert-function): Use it.
(electric-layout-post-self-insert-function): Don't insert a before
newline unless it's actually needed.
* lisp/minibuffer.el (completion-fail-discreetly): New var.
(completion--do-completion): Use it.
* lisp/textmodes/rst.el: Minor cleanup to improve style.
(rst-get-decoration): Eliminate unneeded assignment.
(rst-update-section, rst-promote-region, rst-straighten-decorations)
(rst-section-tree, rst-adjust): Use point-marker.
(rst-toc-mode-mouse-goto): Avoid setq.
(rst-shift-region-guts, rst-shift-region-left)
(rst-iterate-leftmost-paragraphs, rst-iterate-leftmost-paragraphs-2)
(rst-convert-bullets-to-enumeration): Use copy-marker.
* comint.el (comint-kill-region): Fix last change.
Merge from emacs-23
shr.el: Allow customizing the vertical table lines.

shr.el (shr-table-horizontal-line): Renamed from shr-table-line.
 (shr-table-vertical-line): New variable.
 (shr-insert-table): Use it.