* lisp/mail/mail-utils.el: No need to require lisp-mode, it's in loadup.

Misc url-cookie tidy-up.

* lisp/url/url-cookie.el: Don't require cl when compiling.
(url-cookie-clean-up, url-cookie-generate-header-lines): Use dolist.
(url-cookie-parse-file, url-cookie-store, url-cookie-retrieve)
(url-cookie-handle-set-cookie): Simplify.

gnus.texi (Filtering New Groups): Mention.

nnir.el (nnir-run-gmane): Better check for gmane groups: error out if groupname doesn't contain "gmane".

Merge changes made in Gnus trunk.

nnir.el (nnir-run-imap): Return article list in UID order.
gnus-start.el (gnus-auto-subscribed-groups): Add nnimap to the list of automatically subscribed groups.
 (gnus-auto-subscribed-categories): New variable.
 (gnus-matches-options-n): Use it.
 (gnus-default-subscribed-newsgroups): Remove unused variable.
 (gnus-start-draft-setup): Message a bit less.
gnus-agent.el (gnus-agentize): Don't create the queue group automatically on startup.  It'll be created later, if needed.
gnus-start.el (gnus-1): Clarify comment.
 (gnus-matches-options-n): Fix typo in last change.
 (gnus-1): Don't create the nndrafts group twice.
 (gnus-setup-news): There's no need to read the active file here, since that's done again later on a per-backend basis.
 (gnus-start-draft-setup): Make sure that the new group is started out empty.
netrc.el (netrc-point-at-eol): Remove the unused netrc-point-at-old and netrc-bound-and-true-p bindings.
 (netrc-parse): Cache the netrc contents.

* net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.

ChangeLog fixes.
Includes removing changes for files not present.

ChangeLog merge fix.

ChangeLog whitespace fix.

ChangeLog merge fix.

Merge from emacs-23

proto-stream.el (proto-stream-open-network-only): Fix the calling convention of the network-only option.
gnus-sum.el (gnus-summary-enter-digest-group): Mention gnus-auto-select-on-ephemeral-exit.

subr.el (posn-col-row): Evaluate header-line-format in the context of
 the POSITION window's buffer.

Document that expand-file-name collapses multiple slashes.  (Bug#7617)

 fileio.c (Fexpand_file_name): Doc fix.

* lisp/bookmark.el (bookmark-name-from-full-record): Rename back to
  this original name from `bookmark-name-from-record' reverting part of
  2010-12-08T08:09:27Z!kfogel@red-bean.com / kfogel@red-bean.com-20101208080927-5j9jqnb2xvcw4ogm.
  As Drew Adams pointed out, there was no reason to cause churn for
  third-party callers.

(c-forward-type): Before scanning a template arglist, check that the
current language supports this.

Fallout from bug #7563.

 processes.texi (Shell Arguments):
 strings.texi (Creating Strings): Don't mention "shell commands";
 make it explicit that `split-string-and-unquote' and
 `combine-and-quote-strings' are mainly for working with arguments
 to call-process and start-process.

Update to Org mode 7.4

Fix bug #7398 with truncated glyphs in w32 tooltips.

 w32fns.c (Fx_show_tip): Call try_window with last argument
 TRY_WINDOW_IGNORE_FONTS_CHANGE.  Delete the TODO ifdef: problem
 solved.  Round up the tip height to an integral multiple of the
 frame's line height.  Add FRAME_COLUMN_WIDTH to the tip width.

Fix bug #7398 with truncated glyphs in tooltip display on w32.

 w32fns.c (Fx_show_tip): Call try_window with last argument
 TRY_WINDOW_IGNORE_FONTS_CHANGE.  Delete the TODO ifdef: problem
 solved.  Round up the tip height to an integral multiple of the
 frame's line height.  Add FRAME_COLUMN_WIDTH to the tip width.

Code cleanup in xdisp.c regarding string_char_and_length.

 xdisp.c (string_pos_nchars_ahead, c_string_pos)
 (face_before_or_after_it_pos, next_element_from_string)
 (next_element_from_c_string, produce_stretch_glyph): Remove unused
 calculations of maximum string length before calling
 string_char_and_length and STRING_CHAR_AND_LENGTH.
 (string_char_and_length): Update commentary: MAXLEN is no longer
 needed.

Fix bug #7563 with docs of split-string-and-unquote.

 processes.texi (Shell Arguments): Fix documentation of
 `split-string-and-unquote'.  Add indexing.

Fix bug #7576 with lack of index entries for character syntax.

 custom.texi (Init Syntax): Add index entries for "character syntax".

Misc vc-bzr.el.

* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable
state of the file matches.  (Bug#7544)
(vc-bzr-register, vc-bzr-checkin)
(vc-bzr-annotate-extract-revision-at-line): Doc fixes.
(vc-directory-exclusion-list): Remove unnecessary eval-after-load.

Comment changes:
Remove outdated comments about defunct upstream.
Set maintainer to FSF.

* lisp/textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.

* lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.
(This really only affects empty files.)

Fixes: debbugs:7606

ChangeLog fix.

* etc/TODO: Updates; and re-fill some lines.

* doc/emacs/text.texi (HTML Mode): Small fixes.

Fixes: debbugs:7607

Doc fixes.
* lisp/subr.el (member-ignore-case, run-mode-hooks, insert-for-yank-1)
(with-silent-modifications): Doc fixes.

[Backport from trunk]: * make-dist: Exclude etc/*.pyc.

* make-dist: Exclude etc/*.pyc.

Merge changes made in Gnus trunk.

nnir.el (nnir-request-expire-articles): Only allow article deletion.
message.el (message-bogus-recipient-p): Set address to "" if nil.
gnus-gravatar.el (gnus-gravatar-transform-address): Fix error when email address is nil.
proto-stream.el (proto-stream-open-network-only): New function to have a way to specify non-STARTTLS upgrade connections.

Don't depend on POSIX compatible parsing of parameter expansion

Derive from prog-mode, use derived-mode-p, and fix up various
minor style issues in lisp/progmodes.

* lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init)
(vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable ->
make-local-hook.
* lisp/progmodes/sh-script.el (sh-require-final-newline): Remove.
(sh-set-shell): Don't set require-final-newline since it's already done
by prog-mode.
* lisp/progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column
since we never set it.
* lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation):
Use read-string and standard prompt.
* lisp/progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration.
* lisp/progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl.
(meta-common-mode-syntax-table): Rename from meta-mode-syntax-table.
(meta-common-mode-map): Rename from meta-mode-map.
Remove C-m binding, which is a user preference, not mode specific.
(meta-common-mode): New major mode; replace meta-common-initialization.
* lisp/progmodes/js.el (js-mode): Call syntax-propertize rather than messing
around with font-lock.
* lisp/progmodes/etags.el (select-tags-table-mode):
Derive from special-mode.
* lisp/progmodes/octave-mod.el (octave-mode):
* lisp/progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode)
(gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode)
(gdb-frames-mode, gdb-locals-mode, gdb-registers-mode):
Let define-derived-mode do its job.
* lisp/progmodes/cpp.el (cpp-edit-mode-map):
Move initialization into declaration.
(cpp-edit-mode): Use define-derived-mode.
(cpp-edit-load): Use derived-mode-p.
* lisp/progmodes/mixal-mode.el (mixal-mode):
* lisp/progmodes/f90.el (f90-mode):
* lisp/progmodes/cfengine.el (cfengine-mode): Don't bother setting
require-final-newline since prog-mode does it already.
* lisp/progmodes/cc-cmds.el (c-update-modeline): Use match-string.
* lisp/progmodes/asm-mode.el (asm-mode-map): Fix menu setup.
* lisp/progmodes/antlr-mode.el: Require cc-mode upfront.
(antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in
the declaration.
(antlr-directory-dependencies, antlr-show-makefile-rules):
Use derived-mode-p.
(antlr-language-option): Don't assume point-min==1.
(antlr-mode): Use define-derived-mode.
* lisp/progmodes/ada-mode.el: Use derived-mode-p.
(ada-mode): Use define-derived-mode.
Use hack-local-variables-hook.

* lisp/progmodes/vhdl-mode.el (vhdl-mode):
* lisp/progmodes/verilog-mode.el (verilog-mode):
* lisp/progmodes/vera-mode.el (vera-mode):
* lisp/progmodes/sql.el (sql-mode):
* lisp/progmodes/scheme.el (scheme-mode):
* lisp/progmodes/perl-mode.el (perl-mode):
* lisp/progmodes/octave-inf.el (inferior-octave-mode):
* lisp/progmodes/autoconf.el (autoconf-mode):
* lisp/progmodes/m4-mode.el (m4-mode):
* lisp/progmodes/inf-lisp.el (inferior-lisp-mode):
* lisp/progmodes/idlwave.el (idlwave-mode):
* lisp/progmodes/icon.el (icon-mode):
* lisp/progmodes/idlw-help.el (idlwave-help-mode):
* lisp/progmodes/dcl-mode.el (dcl-mode):
* lisp/progmodes/idlw-shell.el (idlwave-shell-mode):
* lisp/progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode)
(ebrowse-member-mode, ebrowse-electric-position-mode):
Use define-derived-mode.

* lisp/progmodes/xscheme.el (xscheme-start)
(local-set-scheme-interaction-buffer, scheme-interaction-mode):
* lisp/progmodes/which-func.el (which-function):
* lisp/progmodes/vhdl-mode.el (vhdl-set-style):
* lisp/progmodes/verilog-mode.el (verilog-set-compile-command)
(verilog-modify-compile-command, verilog-error-regexp-add-xemacs)
(verilog-set-define, verilog-auto-reeval-locals):
* lisp/progmodes/sql.el (sql-product-font-lock, sql-interactive-mode):
* lisp/progmodes/simula.el (simula-mode):
* lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode):
* lisp/progmodes/python.el (python-check, python-mode):
* lisp/progmodes/prolog.el (prolog-mode-variables):
* lisp/progmodes/gud.el (gud-tooltip-activate-mouse-motions):
* lisp/progmodes/ebrowse.el (ebrowse-view-file-other-frame):
* lisp/progmodes/delphi.el (delphi-mode):
* lisp/progmodes/cc-styles.el (c-setup-paragraph-variables):
* lisp/progmodes/cc-mode.el (c-basic-common-init, c-common-init)
(c-font-lock-init): Move make-local-variable to their setq.

* lisp/progmodes/xscheme.el (exit-scheme-interaction-mode)
(xscheme-enter-interaction-mode, xscheme-enter-debugger-mode)
(xscheme-debugger-mode-p, xscheme-send-string-1):
* lisp/progmodes/tcl.el (inferior-tcl-proc, tcl-current-word)
(tcl-load-file, tcl-restart-with-file):
* lisp/progmodes/ps-mode.el (ps-run-running):
* lisp/progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint):
* lisp/progmodes/js.el (js--get-all-known-symbols):
* lisp/progmodes/inf-lisp.el (inferior-lisp-proc):
* lisp/progmodes/idlwave.el (idlwave-beginning-of-statement)
(idlwave-template, idlwave-update-buffer-routine-info)
(idlwave-update-current-buffer-info)
(idlwave-get-routine-info-from-buffers, idlwave-choose)
(idlwave-scan-class-info, idlwave-fix-keywords)
(idlwave-list-buffer-load-path-shadows):
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add)
(idlwave-toolbar-remove):
* lisp/progmodes/idlw-shell.el (idlwave-shell-save-and-action)
(idlwave-shell-file-name, idlwave-shell-electric-debug-all-off)
(idlwave-shell-menu-def):
* lisp/progmodes/idlw-complete-structtag.el
(idlwave-prepare-structure-tag-completion):
* lisp/progmodes/gud.el (gud-set-buffer):
* lisp/progmodes/f90.el (f90-backslash-not-special):
* lisp/progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.

Move call to Fkill_emacs from signal handler (session event) (Bug#7552).

* keyboard.c (kbd_buffer_get_event): Construct SAVE_SESSION_EVENT
as (Qsave_session arg).

* xsmfns.c (smc_interact_CB): Set arg to Qnil.
(smc_die_CB): Make an event with arg Qt.
(Fhandle_save_session): If event has Qt as argument,
call Fkill_emacs.

Bump version to 23.2.91.
Regenerate configure and ldefs-boot.el.

* configure.in: Don't double machfile in final message.

* lisp/textmodes/texinfo.el (texinfo-mode-map): Bind texinfo-insert-@end.
(texinfo-mode): Don't disable adaptive-fill-mode.
(texinfo-insert-block): Adjust cursor placement for blocks with arg.
(texinfo-insert-@end, texinfo-insert-braces, texinfo-insert-@code)
(texinfo-insert-@dfn, texinfo-insert-@email, texinfo-insert-@emph)
(texinfo-insert-@example, texinfo-insert-@file, texinfo-insert-@item)
(texinfo-insert-@kbd, texinfo-insert-@node, texinfo-insert-@noindent)
(texinfo-insert-@quotation, texinfo-insert-@samp)
(texinfo-insert-@strong, texinfo-insert-@table, texinfo-insert-@var)
(texinfo-insert-@uref): Use define-skeleton.
(texinfo-insert-@-with-arg): Delete.

arc-mode.el (archive-zip-extract): If w32-quote-process-args is nil, do quote
 archive member names.  Suggested by hm <helmut.muelner@joanneum.at>.

* net/tramp.el (tramp-action-password, tramp-process-actions):
Revert patch from 2010-12-08.  Use `save-restriction'.

* lisp/files.el (diff-no-select): Declare.

Small emacsbug.el stuff.
* lisp/mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties.
(report-emacs-bug-create-existing-bugs-buffer): Avoid free variables.

* lisp/comint.el (comint-input-ring-file-name): Doc fix.

Fix ChangeLog attribution.

* doc/emacs/trouble.texi (Checklist): Fix typo in newsgroup name.

Commit missing file from 2010-05-15T00:48:53Z!rgm@gnu.org.

Fixes: debbugs:7505

shr.el (shr-tag-label): Add <label> support.

Fix bug #1077 with popping new frames from a minibuffer-only frame.

 menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p):
 New functions.
 (menu-bar-showhide-menu) <menu-bar-mode, showhide-tool-bar>: Use
 them instead of `nil' and `>', respectively.
 (menu-bar-showhide-tool-bar-menu): Use menu-bar-frame-for-menubar
 instead of `nil'.
 (toggle-menu-bar-mode-from-frame): Use menu-bar-frame-for-menubar
 and menu-bar-positive-p instead of `nil' and `>', respectively.

Fix bug #1077 with popping new frames from a minibuffer-only frame.

Do NOT merge with trunk!

 menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p): New functions.
 (menu-bar-showhide-menu) <menu-bar-mode, showhide-tool-bar>: Use
 them instead of `nil' and `>', respectively.

mm-util.el (mm-ucs-to-char): Use eval-and-compile.

Tiny code fix.

shr.el (shr-tag-script): Ignore <script>.

shr.el (shr-image-displayer): Work for images lined side by side.

Rename some landmark functions.
* lisp/play/landmark.el (lm-print-y,s,noise-int, lm-print-y,s,noise):
Rename functions without commas, update callers.

diary-lib fix for bug#7536.
* lisp/calendar/diary-lib.el (diary-list-sexp-entries):
Handle case of no newline at end of file.

* lisp/mail/smtpmail.el (smtpmail-send-it): Revert previous change.
(convert-standard-filename means it was bogus.)

gnus-demon.el (gnus-demon-init): Call run-with-timer with time as argument, not t. XEmacs does not support that.

* net/tramp.el (tramp-handle-start-file-process): Protect
buffer-modified value.  (Bug#7557)
(tramp-action-password): Delete region, do not narrow.
(tramp-process-actions): Do not widen.

New version 13.2. (Bug#7582)

nnir.el (nnir-request-expire-articles): New function.

nnir.el (nnir-retrieve-headers): Use rassq when comparing article ids.
 (nnir-run-gmane): Simplify groupspec formatting.

Adjust parameter names and doc strings to resolve confusion over
whether "bookmark" meant a bookmark name or a bookmark record.
Along the way, shorten one function's name for similar reasons.

(Issue #7548)

* lisp/bookmark.el
  (bookmark-name-from-record):
    New name for `bookmark-name-from-full-record'.  All callers changed.
  (bookmark-get-bookmark, bookmark-get-bookmark-record,
   bookmark-default-annotation-text, bookmark-prop-get, bookmark-prop-set,
   bookmark-get-annotation, bookmark-set-annotation,
   bookmark-get-filename, bookmark-set-filename,
   bookmark-get-position, bookmark-set-position,
   bookmark-get-front-context-string, bookmark-set-front-context-string,
   bookmark-get-rear-context-string, bookmark-set-rear-context-string,
   bookmark-get-handler, bookmark-edit-annotation, bookmark--jump-via,
   bookmark-handle-bookmark, bookmark-location, bookmark-show-annotation):
    Rename `bookmark' parameter to `bookmark-name-or-record', to
    clearly show its role, and shorten or adjust doc strings accordingly.
  (bookmark-set-name):
    Same, and pass the parameter directly to `bookmark-get-bookmark'
    instead of redundantly doing the callee's work.
  (bookmark-default-annotation-text, bookmark-send-edited-annotation,
   bookmark-relocate, bookmark-insert-location, bookmark-insert,
   bookmark-delete):
    Rename `bookmark' parameter to `bookmark-name', and in some cases
    shorten doc string accordingly.
  (bookmark-rename):
    Change `old' and `new' parameters to `old-name'
    and `new-name', and adjust an internal variable to avoid confusion.
  (bookmark-jump, bookmark-jump-noselect):
    Clarify `bookmark' parameter in doc string.

In gdb, try to init comint history from gdbhist.
* lisp/progmodes/gdb-mi.el (gdb): Try to initialize comint input history
from gdb's history file.  (Bug#7575)

* mail/emacsbug.el (report-emacs-bug): Try to handle some other mail clients.

Make verify-visited-file-modtime default to the current buffer.

* src/fileio.c (Fverify_visited_file_modtime): Default to current buffer.
* doc/lispref/buffers.texi (Modification Time):
verify-visited-file-modtime now defaults to the current buffer.

* lisp/log-edit.el (log-edit-changelog-entries): Regexp quote filename.

Fixes: debbugs:7505

* lisp/cus-edit.el (custom-save-all): Bind print-length and print-level to nil.

Fixes: debbugs:7581

mouse.el fix for bug#7586.
* lisp/mouse.el (mouse-menu-major-mode-map, mouse-menu-bar-map):
Run hooks to update menu contents.

Small smtpmail fix for bug#7588.
* lisp/mail/smtpmail.el (smtpmail-send-it): Avoid colons in the queued
file names, for the sake of MS Windows.

Fix ChangeLog whitespace.

Fix ChangeLog typo.

* lisp/files.el (dir-locals-collect-variables): Don't let errors stop us.
Use string-prefix-p.
(file-name-version-regexp): New var.
(file-name-sans-versions):
* lisp/jka-cmpr-hook.el (jka-compr-build-file-regexp): Use it,
(jka-compr-get-compression-info): Use dolist.
(jka-compr-compression-info-list): Don't bother specifying
version/backup regexps.

shr.el (shr-tag-table-1): Use bg/gfcolor specs on tables.
 (shr-render-td): Handle td style="" better.
 (shr-tag-table): Use the color from the style sheet.
 (shr-render-td): Make sure we copy over all the overlays, too.
nnimap.el (nnimap-parse-flags): Tweak VANISHED regexp to avoid regexp overflow, possibly.

* diff-mode.el (diff-refine-hunk): Make it work when the hunk contains
empty lines without a leading space.

* doc/lispref/modes.texi (Auto-Indentation): New section to document SMIE.
(Major Mode Conventions):
* doc/lispref/text.texi (Mode-Specific Indent): Refer to it.

* simple.el (just-one-space): Make argument n default to 1 if
omitted.

* lisp/electric.el (electric-indent-post-self-insert-function):
Delete trailing newlines even if we don't reindent.

nnir.el (nnir-run-gmane): Restore sub-optimal test for gmane server.
 (nnir-request-article): Improve article retrieval.

* xsmfns.c (smc_die_CB): Call Fkill_emacs.

Fixes: debbugs:7552

Decode extra numeric entities.

mm-util.el (mm-extra-numeric-entities): New variable.
mm-url.el (mm-url-decode-entities):
mm-decode.el (mm-shr): Use it to decode extra numeric entities.

* lisp/gnus/message.el: Use completion-at-point.
(message-completion-function): New fun, extracted from message-tab.
(message-mode): Use it for completion-at-point-functions.
(message-tab): Use it and completion-at-point.

shr.el (shr-find-fill-point): Don't break a line after a kinsoku-bol character if a non-breakable character follows.

proto-stream.el (proto-stream-open-tls): Return nil if we don't get any stream.
gnus.texi (Server Commands): Point to the rest of the server commands.

Merge changes made in Gnus trunk.

shr.el (shr-render-td): Render td content with shr-descend, so style will be applied to <td> too.
 (shr-colorize-region): Colorize region even if we only have a background.
 (shr-tag-body): Fix color and background color inheritance.
 (shr-tag-body): Do not recolorize after shr-generic.
 (shr-tag-font): Let shr-generic colorize via inheritance.
shr.el (shr-descend): Only colorise something if we have a node that sets colors.
gnus-int.el (gnus-request-thread): Rework to take a header instead of a Message-ID to avoid having nnimap depend on gnus-sum.
shr.el (shr-tag-font): Colorize the region.
 (shr-tag-body): Ditto.
 (shr-tag-font): Actually let the styles be inherited instead of overwriting them.
 (shr-tag-font): Get the background color right.
 (shr-tag-style): Ignore all <style> tags for the moment.

* lisp/bindings.el (complete-symbol): Move back from minibuffer.el.
* lisp/minibuffer.el (completion-at-point): Remove the `arg'.

Fix Lawrence Mitchell's email address in lisp/ChangeLog.

* dired-aux.el (dired-do-redisplay): Postphone dired-after-readin-hook while mapping over marks (Bug#6810).

Initialize image-dired auxilliary filenames relative to image-dired-dirs (Bug#7518).

* image-dired.el (image-dired-db-file)
(image-dired-temp-image-file, image-dired-gallery-dir)
(image-dired-temp-rotate-image-file): Set default values relative
to image-dired-dir (Bug#7518).

Fix arg usage of format-decode-run-method (Bug#7488).

* lisp/format.el (format-decode-run-method): Pass args FROM and TO, not
point-min and point-max, to shell-command-on-region (Bug#7488).

* lisp/simple.el (just-one-space): Delete newlines for negative arg.

Return CDATA sections (like <style>foo</style>) as text nodes.

Also ignore blank HTML nodes.

* lisp/ansi-color.el (ansi-color-unfontify-region): Replace by trivial def.
(ansi-color-filter-apply): Simplify.
(ansi-color-apply): Use `font-lock-face' rather than `face'.

* src/lread.c (read1): Allow newstyle unquote outside of backquote.
Disallow old-style backquotes inside new-style backquotes.
Don't count unquotes to figure out when we're "syntactically inside
but semantically outside of a backquote" any more.
Extend the restriction no-unescaped-commas-and-backquotes-in-symbols
to all contexts.

Fix crash with invisible text and overlays (Bug#7016).

* src/dispextern.h (struct it): New member overlay_strings_charpos.

* src/xdisp.c (next_overlay_string, load_overlay_strings): Record the
charpos where we computed n_overlay_strings.
(next_overlay_string): Load overlay strings at recorded position,
which may not be the same as the iterator's charpos (Bug#7016).

* frame.el (blink-cursor-mode): Make default t for ns.

nnir.el (nnir-request-move-article): Remove obsolete code.
shr.el (shr-find-fill-point): Don't regard apostrophe as kinsoku-bol.

gnus-util.el (gnus-macroexpand-all): Use eval-and-compile.

Merge changes made in Gnus trunk.

nnir.el (nnir-categorize): Replace mapcar with mapc.
shr.el (shr-urlify): Display the title in <a> tags.
shr.el (shr-urlify): Show the URL before the title to avoid misleading URLs.
gnus-sum.el (gnus-summary-show-article): Reverse the meanings of `C-u
C-u g' and `C-u g' so that `C-u g' does what it traditionally did.
gnus.texi (Paging the Article): Note the reverse meanings of `C-u C-u g'.
gnus-html.el (gnus-html-put-image): Use widget instead of local maps
so that TAB works.
nnir.el (nnir-run-gmane): Use more careful test for gmane nntp server.
nnimap.el (nnimap-process-expiry-targets): Avoid downloading articles
unless necessary.
gnus-util.el (gnus-output-to-mail): Require nnmail before using nnmail
variables.
shr.el (shr-stylesheet): New dynamic variable for cascading the styles.
 (shr-colorize-region): New function.
 (shr-insert-background-overlay): Remove.
 (shr-render-td): Background setting should be taken care of on a higher level.
 (shr-tag-body): Use post-hoc colorizations.
 (shr-descend): Only render color/background when they change.
 (shr-tag-body): Set up a style sheet based on bgcolor/fgcolor.
 (shr-put-color-1): Don't overwrite old colors.
 (shr-colorize-region): When the background color isn't explicit, use a fixed background.
gnus.el (gnus-valid-select-methods): Allow nnimap to respool.
nntp.el (nntp-snarf-error-message): nnheader-report takes a format string as the parameter.
gnus-sum.el (gnus-summary-respool-article): The completion function expects a list instead of an alist.

Fix for 7412 (no cursor on image) backported from trunk.

* nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background
with cursor color and draw a rectangle around the image.