Merge from trunk

Make the effect of (defvar foo) local.
* src/eval.c (apply_lambda): Make static.  Remove eval_flag arg.
(Fsetq): Don't check declared_special.
(Fdefun, Fdefmacro): Use Ffunction.
(Fdefvar): Don't set declared_special for (defvar foo).
(FletX): Check locally-special vars.  Only do specbind once.
(Flet): Check locally-special vars.
(Feval): Don't check declared_special.
(funcall_lambda): Check locally-special vars.
* src/lisp.h (apply_lambda): Remove extern declaration.
* src/lread.c (readevalloop): CSE.
* lisp/subr.el (with-lexical-binding): Remove.

* 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.

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.

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.

* 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.

Merge from trunk

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.

* 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>.

* 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.

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.

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.

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

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/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.

* 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.

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'.

* 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.

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.

* src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484).

* lisp/vc/vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501).

* configure.in: Fix last change.

Smarter initialization for dired-use-ls-dired (Bug#7546).

* lisp/dired.el (dired-use-ls-dired): Set default to a special
"unspecified" value.
(dired-insert-directory): When called the first time, check
whether "ls --dired" succeeds and set dired-use-ls-dired (Bug#7546).

Remove empty machine description files

* configure.in: Remove reference to removed machine description
files and allow $machine and $machfile to be empty.  Substitute
M_FILE/S_FILE instead of machfile/opsysfile.

* msdos/sed1v2.inp (M_FILE, S_FILE): Add $(srcdir)/ prefix.

* Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@.
(S_FILE): Substitute @S_FILE@ instead of @opsysfile@.
* src/m/arm.h, src/m/sh3.h, src/m/xtensa.h: Remove files.

* lisp/replace.el: Add "collect" feature to occur.
(occur-collect-regexp-history): New var.
(occur-read-primary-args): Return a replace string for nlines, if needed.
(occur): Extend the meaning of nlines.

* lisp/progmodes/which-func.el (which-func-ff-hook): Log the error message.
(which-func-update-1): Distinguish symbols from strings.
(which-function): Stay within 80 columns.

* lisp/subr.el (with-demoted-errors): Distinguish symbols from strings.

* lisp/newcomment.el (comment-styles): Add docs to each style.
Improve docstring.
(comment-style): Use comment-styles's docs to describe values.

Fixes: debbugs:7509

Remove EXPLICIT_SIGN_EXTEND.

* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.

nnir.el: Rearrange code to allow macros to be autoloaded by gnus-sum.el.

* nnir.el: Rearrange code to allow macros to be autoloaded by
gnus-sum.el.
(nnir-retrieve-headers-override-function): Make this variable
customizable.
(nnir-retrieve-headers): Remove obsolete subject-mangling code.

gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.

Revert to 2010-12-03T11:48:24Z!jan.h.d@swipnet.se.

Remove EXPLICIT_SIGN_EXTEND.

* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.

* CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove.

Restore another execute-bit.

Restore executable bit omitted when undeleting files in 2010-12-03T14:45:09Z!yamaoka@jpl.org.

nnir.el: Rearrange code to allow macros to be autoloaded by gnus-sum.el.
 (nnir-retrieve-headers-override-function): Make this variable customizable.
 (nnir-retrieve-headers): Remove obsolete subject-mangling code.
gnus-sum.el (nnir-article-group,nnir-article-rsv): Autoload macros from nnir.el.

Restore files that I seem to have mistakenly deleted.

gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.

Restore dock New Frame and Preferences menu functions (Bug#7535).

* term/common-win.el (x-setup-function-keys): Restore ns-new-frame
and ns-show-prefs.

* term/ns-win.el (global-map): Restore ns-new-frame and ns-show-prefs
bindings.

Draw cursor and images correctly for Nextstep (bug#7412).

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

* frame.c (x_set_font): Remove unused variable.

Update cl-loaddefs.el

gnus-util.el (gnus-macroexpand-all): Fix last change.

gnus-util.el (gnus-macroexpand-all): Allow optional argument `environment'.

gnus-util.el (gnus-macroexpand-all): Don't modify argument.

Silence nxml-mode.el compilation.
* lisp/nxml/nxml-mode.el: Require rng-nxml.
(rng-nxml-mode-init, nxml-enable-unicode-char-name-sets):
Remove declarations.

Remove leading `*' from nxml defcustom docs.

* lisp/nxml/nxml-mode.el, lisp/nxml/nxml-outln.el, lisp/nxml/rng-loc.el:
* lisp/nxml/rng-nxml.el, lisp/nxml/rng-valid.el:
Remove leading `*' from defcustom docs.

startup.el trivia.
* lisp/startup.el (normal-top-level-add-subdirs-to-load-path): Simplify.
(normal-top-level-add-to-load-path, tty-handle-args):
Convert comments to basic doc-strings.

Remove some browse-url.el autoloads.
* lisp/net/browse-url.el (browse-url-url-at-point)
(browse-url-default-browser): Remove autoload cookies.

emacsbug.el trivia.
* lisp/mail/emacsbug.el (report-emacs-bug-create-existing-bugs-buffer):
Remove more undefined cl functions.

diff-sentinel trivia.
* lisp/ibuf-ext.el (diff-sentinel): Update declaration.
* lisp/ibuffer.el: Regenerate autoloads.
* lisp/vc/diff.el (diff-sentinel): Make new arguments optional, eg for
the sake of ibuffer-diff-buffer-with-file-1.

* lisp/gnus/mm-extern.el (message-goto-body): Update declaration.

Standardize license notices in new files.

EMACS_UNIBYTE trivia.

* make-dist: Remove EMACS_UNIBYTE unsetting; it does nothing.

gnus-util.el (gnus-macroexpand-all): Fix last change.

gnus-util.el (gnus-macroexpand-all): New function.
gnus-sum.el (gnus-summary-line-format-alist): Use gnus-macroexpand-all instead of macroexpand-all that is unavailable in XEmacs.

Trivial fixes for epg.el.

* epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
"RIPEMD160" (Bug#7490).  Reported by Daniel Kahn Gillmor.
(epg-context-set-passphrase-callback): Mention that the callback
is not called when used with GnuPG 2.x.

message.el (message-from-style): Fix previous commit.

Merge changes made in Gnus trunk.

nnir.el: Batch header retrieval.
proto-stream.el: New library to provide protocol-specific TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar protocols.
nnimap.el (nnimap-open-connection): Use it.
proto-stream.el (open-proto-stream): Complete the documentation.
nnimap.el (nnimap-open-connection): Check for "OK" from the greeting.
nntp.el: Use proto-streams for the relevant connections types.
nntp.el (nntp-open-connection): Switch on STARTTLS on supported servers.
proto-stream.el (open-proto-stream): Add a way to specify what the end of a command is.
proto-stream.el (proto-stream-open-tls): Delete output from openssl if we're using tls.el.
proto-stream.el (proto-stream-open-network): If we don't have gnutls-cli or gnutls built in, then don't try to establish a STARTTLS connection.
color.el (color-lab->srgb): Fix function call name.
proto-stream.el: Fix the syntax in the comment.
nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
proto-stream.el (proto-stream-open-starttls): Actually implement the starttls.el STARTTLS.
proto-stream.el (proto-stream-always-use-starttls): New variable.
proto-stream.el (proto-stream-open-starttls): De-duplicate the starttls code.
proto-stream.el (proto-stream-open-starttls): Folded back into the main function.
proto-stream.el (proto-stream-command): Refactor out.
nnimap.el (nnimap-stream): Change default to `undecided'.
nnimap.el (nnimap-open-connection): If `nnimap-stream' is `undecided', try ssl first, and then network.
nnimap.el (nnimap-open-connection-1): Respect nnimap-server-port.
nnimap.el (nnimap-open-connection): Be more backwards-compatible.
proto-stream.el (open-protocol-stream): Renamed from open-proto-stream.
proto-stream.el (proto-stream-open-network): When doing opportunistic TLS upgrades we don't really care about the identity of the peer.
gnus.texi (Customizing the IMAP Connection): Note the new defaults.
gnus.texi (Direct Functions): Note the STARTTLS upgrade.
proto-stream.el (proto-stream-open-network): Force starttls.el to use gnutls-cli, since that what we've checked for.
proto-stream.el (proto-stream-always-use-starttls): Only default to t if open-gnutls-stream exists.
proto-stream.el (proto-stream-open-network): If STARTTLS failed, then just open a normal connection.
proto-stream.el (proto-stream-open-network): Wait until the greeting before doing STARTTLS.
nnimap.el (nnimap-open-connection-1): Always upgrade to STARTTLS (for backwards compatibility).
nnimap.el (nnimap-open-connection-1): Really respect nnimap-server-port.
nntp.el (nntp-open-connection): Provide a :success condition.
nnimap.el (nnimap-open-connection-1): Ditto.
proto-stream.el (proto-stream-open-network): See what the response to the STARTTLS command is.
proto-stream.el (proto-stream-open-network): Add some comments.
proto-stream.el: Fix example.
proto-stream.el (open-protocol-stream): Actually mention the STARTTLS upgrade.
nnir.el (nnir-get-active): Skip nnir-ignored-newsgroups when searching.
nnir.el (nnir-ignore-newsgroups): Fix default value.
nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.
mm-util.el (mm-delete-duplicates): Add comment.
gnus-sum.el (gnus-summary-delete-article): If delete fails don't change the registry.
nnimap.el (nnimap-open-connection-1): w32 open-network-stream doesn't seem to accept strings-with-numbers as port numbers.
color.el: fix docstring to use English rather than math notation for intervals.
shr.el (shr-find-fill-point): Don't break before apostrophes.
nnir.el (nnir-request-move-article): Bail out if no move support in group.
color.el (color-rgb->hsv): Fix docstring.
nnir.el (nnir-get-active): Improve active list retrieval.
shr.el (shr-find-fill-point): Work better for kinsoku chars and apostrophes.
gnus-gravatar.el (gnus-gravatar-size): Set gnus-gravatar-size to nil.
nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p.
nnimap.el (nnimap-open-connection-1): Fix PREAUTH.
proto-stream.el (open-protocol-stream): All starttls connections are handled by the network handler.
gnus-gravatar.el (gnus-gravatar-insert): Delete unnecessary binding to t of inhibit-read-only since it is inside gnus-with-article-headers.
gnus-gravatar.el (gnus-gravatar-transform-address): Use mail-extract-address-components that supports non-ASCII names rather than mail-header-parse-addresses.
shr.el (shr-find-fill-point): Don't break line between kinsoku-bol characters.
gnus-gravatar.el (gnus-gravatar-insert): Allow LWSP in the middle of names.
nnmaildir.el (nnmaildir-request-set-mark): Add article to add-mark funcall.
gnus-msg.el: Remove nastygram thing.
message.el (message-from-style): Fix comment.
message.el (message-user-organization): Do not use gnus-local-organization.
gnus.el: Remove gnus-local-organization.
rtree.el: New file to handle range trees.
nnir.el, gnus-sum.el: Redo the way nnir handles registry updates.
rtree.el (rtree-extract): Simplify.
gnus-win.el (gnus-configure-windows): Remove Gnus 3.x setting support.
gnus-msg.el: Mark gnus-outgoing-message-group as obsolete.
gnus.texi (Archived Messages): Remove gnus-outgoing-message-group.
gnus-win.el (gnus-configure-frame): Remove old compatibility code.
rtree.el (rtree-memq): Rewrite it as a non-recursive function.
rtree.el (rtree-add, rtree-delq, rtree-length): Implement.
rtree.el (rtree-add): Make code slightly faster.
nnir.el: Allow modified summary-line-format in nnir summary buffers.

* net/tramp.el (tramp-local-host-regexp): Add "localhost6".
(tramp-file-name-port): Check also for `tramp-default-port'.
(tramp-get-connection-name): New defun.
(tramp-get-connection-process): Use it.
(tramp-debug-message): Extend function exclude list.
(tramp-drop-volume-letter): Fix doc string.

* net/tramp-cmds.el: Remove solved todo item.

* net/tramp-efs.el:
* net/tramp-ftp.el:
* net/tramp-gvfs.el:
* net/tramp-gw.el:
* net/tramp-imap.el:
* net/tramp-smb.el: Fix regexps added to `tramp-default-method-alist'
and `tramp-default-user-alist', respectively.

* net/tramp-gw.el (tramp-gw-open-connection): Use
`tramp-get-connection-name' and `tramp-get-connection-buffer'.

* net/tramp-imap.el (tramp-imap-make-iht): Use just
`tramp-file-name-port'.

* net/tramp-sh.el (tramp-methods): Add recursive options to "pscp"
and "psftp".  Exchange "%k" marker with options.
(tramp-do-copy-or-rename-file, tramp-sh-handle-file-local-copy):
Compute size of link target.
(tramp-do-copy-or-rename-file-out-of-band). Move setting of
`tramp-current-*' up due to gateway methods.  Optimze computing of
copy arguments.  Use `tramp-get-connection-name' and
`tramp-get-connection-buffer'.  Improve debug messages.
(tramp-compute-multi-hops): Remove port determination.
(tramp-maybe-open-connection): Use `tramp-get-connection-name'.

* net/trampver.el: Update release number.

cl-macs `loop' fix for bug#7492.

* lisp/emacs-lisp/cl-macs.el (cl-parse-loop-clause):
Avoid infinite loop over windows.

Small flymake changes.

* lisp/progmodes/flymake.el (flymake-check-file-limit):
Allow nil to mean "no limit".
(flymake-check-patch-master-file-buffer): Update for above change.
Allow a .tex file-name extension to be optional.
(flymake-master-tex-init): Also match \include statements.

* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.