* lisp/dired-aux.el (dired-do-chmod): Don't provide initial input.

Replace display-buffer-window by help-setup window parameter.

* window.el (display-buffer-window): Remove.
(display-buffer-record-window): Use help-setup window parameter
instead of variable display-buffer-window.
(display-buffer-function, special-display-buffer-names)
(special-display-function): Mention help-setup parameter instead
of display-buffer-window in doc-string.
* help.el (help-window-setup): New argument help-window.  Use
help-window-setup parameter instead of display-buffer-window.
Reword some messages.
(with-help-window): Pass window used for displaying the buffer
to help-window-setup.  Don't set display-buffer-window.

* doc/lispref/lists.texi (Sets And Lists): Fix typo.  (tiny change)

xdisp.c (try_window_reusing_current_matrix): Fix incorrect computation of loop end.

 src/xdisp.c (try_window_reusing_current_matrix): Fix incorrect
 computation of loop end.  Reported by Johan Bockgård <bojohan@gnu.org>.

Fix typos in ChangeLogs.

Tabify previous change.

* lisp/emacs-lisp/debug.el (debugger-make-xrefs): Preserve point.  (Bug#9462)

* lisp/window.el (window-deletable-p): Use next-frame.

Remove most window auto deletions.

* window.el (window-auto-delete): Remove.
(window-deletable-p): Remove argument FORCE.  Don't deal with
dedicatedness and previous buffers.
(switch-to-prev-buffer): Don't delete window.
(delete-windows-on): Delete a window's frame if and only if the
window is dedicated.
(replace-buffer-in-windows): Delete buffer's window or frame if
and only if window is dedicated.
(quit-window): Handle quit-restore as before last change.
(bury-buffer): Delete window only if window-deletable-p returns
t.

* lisp/progmodes/scheme.el (scheme-indent-function): Yet another doc typo.

* lisp/progmodes/scheme.el (scheme-indent-function): Fix doc typo in previous.

Fix URL connection failing handling.

* url-http.el (url-http-find-free-connection): If there was an
error on connect, make sure the user isn't bothered with
irrelevant questions.

* lisp/window.el (window-deletable-p): Never delete last frame on a terminal.

* src/frame.c (Fother_visible_frames_p): Function deleted.

* lisp/help.el (describe-key-briefly): Copy previous standard-output change.

* lisp/help.el (where-is): Respect non-standard standard-output.  (tiny change)

Fixes: debbugs:9030

Doc fixes related to lisp-indent-function (bug#9484)

* lisp/emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.

* lisp/progmodes/scheme.el (scheme-indent-function): Give it a doc string.

* lisp/emacs-lisp/cl-indent.el (common-lisp-indent-function): Comment.

* themes/adwaita-theme.el: New file.

Two new themes from Scott Frazer.

* themes/whiteboard-theme.el:
* themes/deeper-blue-theme.el (deeper-blue): New files.

* dired-aux.el (dired-mark-read-string): Don't use default value on empty input.
(dired-do-chxxx): Treat empty input for "touch" as no -t option.
Omit initial minibuffer contents.
(dired-do-chmod): Signal an error on empty input.
(dired-mark-read-string): Don't return default on empty input.

* files.el (file-modes-symbolic-to-number): Doc fix.

Fixes: debbugs:9361

* doc/emacs/frames.texi (Frame Commands): Doc fix for delete-other-frames.
Note that it only deletes frames on current terminal.

Fix bug #2496 with column counting in presence of display tables.

 src/indent.c (compute_motion): Process display vector front to back
 rather than the other way around.

Auto-commit of generated files.

gnus.el (gnus-interactive-exit): Update defcustom spec.

* src/fileio.c (Finsert_file_contents): Don't assume beg_offset is 0.

* lisp/international/mule-cmds.el (ucs-completions): Remove.
(read-char-by-name): Use complete-with-action instead; add metadata.

* gnus.el (gnus-nntp-server): Move to gnus-int.el to silence bytecomp.
* gnus-int.el (gnus-nntp-server): Move from gnus.el.

gnus-group.el (gnus-group-list-(limit|flush|plus)-map): Allow limiting, flushing and plusing ticked articles.

Merge changes made in Gnus trunk.

gnus.texi (Listing Groups): Explain `gnus-group-list-limit'.
 (Finding the News): Doc clarification.
 (Terminology): Mention naming.
gnus-group.el (gnus-group-list-limit): Explain what the command does.
gnus-sum.el (gnus-fetch-headers): Bump message level.

* minibuf.c (Fread_from_minibuffer): Doc fix.

* frame.el (delete-other-frames): Doc fix.

Fixes: debbugs:276

NEWS: fix typo: s/an prefix/a prefix/

Add defcustom definitions for display-buffer vars.

* lisp/window.el (display-buffer--action-function-custom-type)
(display-buffer--action-custom-type): New vars.
(display-buffer-alist, display-buffer-default-action)
(display-buffer-overriding-action): Add defcustom types.

* play/doctor.el (make-doctor-variables): Define `doctor-sent'.

Change modes that used same-window-* vars to use switch-to-buffer.

* cmuscheme.el (run-scheme, switch-to-scheme):
* ielm.el (ielm):
* shell.el (shell):
* net/rlogin.el (rlogin):
* net/telnet.el (telnet, rsh):
* progmodes/inf-lisp.el (inferior-lisp): Use switch-to-buffer.

* cus-edit.el (customize-group, custom-buffer-create)
(customize-browse, custom-buffer-create-other-window): Use
switch-to-buffer or switch-to-buffer-other-window.

* info.el (info, Info-find-node, Info-revert-find-node, Info-next)
(Info-prev, Info-up, Info-speedbar-goto-node)
(info-display-manual): Use switch-to-buffer.
(Info-speedbar-goto-node): Use switch-to-buffer-other-frame.

* lisp/gnus/message.el (message-pop-to-buffer): Default to switch-to-buffer.
(message-mail-other-window, message-mail-other-frame)
(message-news-other-window, message-news-other-frame): Use
switch-to-buffer-other-frame and switch-to-buffer-other-window instead
of setting buffer display varibles.

* mail/sendmail.el (mail): Use switch-to-buffer.
(mail-recover): Use switch-to-buffer-other-window.

* progmodes/gdb-mi.el (gdb-restore-windows, gdb-setup-windows):
Use switch-to-buffer.

Fix bug #9475 with alignment in *Completions* buffer.

 src/xdisp.c (produce_stretch_glyph): Fix a typo made in changes from
 2011-08-30T17:32:44Z!eliz@gnu.org.

* lisp/dired.el (dired-sort-toggle-or-edit): Revert last changes.

(dired-sort-toggle-or-edit): Clarify string further.

Merge from gnulib, porting to Tru64.

* lib/lstat.c, lib/stat.c, m4/include_next.m4, m4/nocrash.m4:
* m4/signal_h.m4, m4/time_h.m4, m4/unistd_h.m4:
Merge from gnulib.  This fixes a compilation error on Tru64 UNIX
aka OSF/1 5.1 DTK cc.  There is also some mingw stuff here that
doesn't affect Emacs.

* gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing duplicates" to a higher level.

(gnus-verbose): Lower default to 6 to get rid of the most egregious messages.

-o doesn't exist on *BSD, so don't mention it

Fixes: debbugs:9301

Clarify slightly the last checkin.

(Fvisited_file_modtime): Document `(-1 65535)' as a value for non-existent files.

nnrss.el (nnrss-retrieve-groups): Decode the charset before looking up the file (bug#9351).

Fix bug #9139 with revisiting non-existent files.

 src/fileio.c (Finsert_file_contents): If the file cannot be opened,
 set its "size" to -1.  This will set the modtime_size field of
 the corresponding buffer to -1, which is what
 verify-visited-file-modtime expects for files that do not exist.

Make `(type graphic)' match `x', `w32' and `ns', like the manual says.

Fixes: debbugs:9029

(process-kill-buffer-query-function): Mention the buffer name in the query.

* subr.el (eval-after-load): Doc string clarification

Fixes: debbugs:9125

* image-mode.el (image-next-line): The line parameter is mandatory

* dired.el (dired-sort-toggle-or-edit): Mention -o and -g, too, which can be useful.

Fixes: debbugs:9301

* textmodes/flyspell.el: Remove obsolete comment

Fixes: debbugs:9368

Doc string clarification.

* subr.el (match-string): Mention that the current buffer should
be the same as the search was done in.

Fixes: debbugs:9282

* processes.texi (Network Servers): Clarify what the process buffer is used for.

Fixes: debbugs:9233

* facemenu.el: Disable the remove-* commands if the mark isn't active.

Fixes: debbugs:9162

* keymap.h (KEY_DESCRIPTION_SIZE, push_key_description): Move decls

here ...
* lisp.h: ... from here.  push_key_description is no longer
defined in keyboard.c, so its declaration should not be in
lisp.h's "Defined in keyboard.c" section, and KEY_DESCRIPTION_SIZE
logically belongs with push_key_description.

Merge changes made in Gnus trunk.

gnus.texi: Remove mentions of `recent', which are now obsolete.
 (Interactive): Document `quiet'.
nnimap.el: Redo the charset handling.  Let Gnus encode the names, as it does with all other backends, but decode the names immediately after getting them.
gnus-group.el (gnus-group-name-charset): Always return `utf-7' when decoding nnimap groups.
gnus.el (gnus-variable-list): Don't save `gnus-format-specs' in the newsrc file.  It doesn't seem like an important optimisation any more.
nnimap.el (nnimap-transform-headers): Fix regexp to be less prone to overflows.
gnus.el (gnus-article-mark-lists): Remove `recent'.
 (gnus-interactive-exit): Extend to `quiet'.
gnus-sum.el (gnus-offer-save-summaries): Use it.
gnus-art.el (gnus-treat-hide-citation-maybe): Add more doc to the string.
plstore.el (plstore--get-buffer): Silence compiler warnings by renaming function arguments from `this'.
gnus-sum.el (gnus-newsgroup-recent): Removed.
gnus-spec.el (gnus-lrm-string-p): `bidi-string-mark-left-to-right' has been renamed.
 (gnus-lrm-string-p): Include RLM and PDF, too.
gnus-int.el (gnus-open-server): Make the "denied" message clearer (bug#9225).

Fix various uses of display-buffer and pop-to-buffer
to avoid using special-display-* and same-window-* variables.

* lisp/buff-menu.el (Buffer-menu-switch-other-window): Use second arg
of display-buffer.
(Buffer-menu-2-window): Use switch-to-buffer-other-window.

* lisp/replace.el (occur-mode-goto-occurrence)
(occur-mode-display-occurrence) Use second arg of pop-to-buffer
and display-buffer.

* lisp/window.el (display-buffer-alist): Add *Python*.

* lisp/mail/reporter.el (reporter-submit-bug-report): Use second arg of
display-buffer.

* lisp/mail/sendmail.el (sendmail-user-agent-compose): Don't bind the
special-display and same-window variables.
(mail-other-window): Use switch-to-buffer-other-window.
(mail-other-frame): USe switch-to-buffer-other-frame.

* lisp/progmodes/gdb-mi.el (gdb-frame-gdb-buffer): Use
display-buffer-other-frame.
(gdb-display-gdb-buffer): Use pop-to-buffer.

* lisp/progmodes/gud.el (gud-goto-info): Use info-other-window.

* lisp/progmodes/python.el: Don't set same-window-buffer-names.

* lisp/textmodes/bibtex.el (bibtex-search-entry): Use switch-to-buffer.

Fix info and customize *-other-window commands.

* lisp/cus-edit.el (customize-group): New argument.
(customize-group-other-window): Use it.
(customize-face, customize-face-other-window): Likewise.
(custom-buffer-create-other-window): Use pop-to-buffer directly.

* lisp/info.el (info-setup): New function.
(info-other-window, info): Call it.

* buffer.h: Include <sys/types.h> instead of <time.h>.

Otherwise, off_t wasn't defined on FreeBSD 9.0-BETA2 i386.
Problem reported by Herbert J. Skuhra.

window.el (display-buffer--maybe-same-window): Renamed from display-buffer-maybe-same-window.

Tweaks to display-buffer default actions; remove same-window-* autoload forms.

* lisp/window.el (display-buffer-alist): Add entry for buffers
previously handled same-window-*.
(display-buffer-alist, display-buffer-default-action)
(display-buffer-overriding-action): Mark as risky.
(display-buffer-alist): Document action function changes.
(display-buffer--same-window-action)
(display-buffer--other-frame-action): New variables.
(switch-to-buffer, display-buffer-other-frame): Use them.
(display-buffer): Rename reuse-frame entry to reusable-frames.
(display-buffer-reuse-selected-window): Function deleted.
(display-buffer-reuse-window): Handle reusable-frames alist entry.
If it's omitted, check pop-up-frames/display-buffer-reuse-frames.
(display-buffer-special): New function.
(display-buffer--maybe-pop-up-frame-or-window): Rename from
display-buffer-reuse-or-pop-window.  Split off special-display
part into display-buffer-special.
(display-buffer-use-some-window): Don't perform any special
pop-up-frames handling.
(pop-to-buffer): Use window-normalize-buffer-to-switch-to.

* lisp/cmuscheme.el:
* lisp/ielm.el:
* lisp/shell.el:
* lisp/mail/sendmail.el:
* lisp/progmodes/inf-lisp.el: Don't set same-window-buffer-names.

* lisp/cus-edit.el:
* lisp/info.el:
* lisp/net/rlogin.el:
* lisp/net/telnet.el:
* lisp/progmodes/gud.el: Don't set same-window-regexps.

* xml.c (parse_region): Make the parsing work for non-comment-starting XML files again.

Fixes: debbugs:9144

* src/image.c (gif_load): Fix calculation of bottom and right corner.
(Bug#9468)

Prevent sluggish bidi redisplay in small windows.

 src/xdisp.c (MAX_DISP_SCAN): Decrease to 250.  Prevents sluggish
 redisplay in small windows.

Fix docstrings in lisp/isearch.el.

* lisp/isearch.el (isearch-edit-string): Remove obsolete mention of
`C-w' (`isearch-yank-word-or-char') from docstring.
(isearch-query-replace): Fix typo in docstring.

Fixes: debbugs:9466

* lisp/paren.el (show-paren-function): Don't show escaped parens.
Let-bind `unescaped' to `t' when paren is not escaped.

Fixes: debbugs:9461

Add to sendmail.el a new command mail-add-attachment.

 etc/NEWS: Document the new command and the alias for mail-insert-file.
 lisp/mail/sendmail.el (mml-to-mime, mml-attach-file)
 (mm-default-file-encoding): Remove autoload forms, they are
 replaced with autoload cookies in mml.el and mm-encode.el.
 (mail-add-attachment): New command.
 (mail-mode-map): Add a menu-bar item for mail-add-attachment.
 (mail-mode): Mention mail-insert-file and mail-add-attachment in
 the doc string.
 (mml-to-mime, mml-attach-file, mm-default-file-encoding): Declare.
 lisp/gnus/mm-encode.el (mm-default-file-encoding): Add autoload cookie.
 lisp/gnus/mml.el (mml-to-mime, mml-attach-file): Add autoload cookies.
 doc/emacs/sending.texi (Mail Misc): Document mail-add-attachment.

* lisp/simple.el (count-words-region): Use buffer if there's no region.

Add `wdired-isearch-filter-read-only' to lisp/wdired.el.

* lisp/wdired.el (wdired-change-to-wdired-mode): Set buffer-local
`isearch-filter-predicate' to `wdired-isearch-filter-read-only'.
(wdired-isearch-filter-read-only): New function.

Fixes: debbugs:6362

gnus-art.el (article-date-ut): Work properly even when
 there are things like Date header in the body;
 work for forwarded parts.

progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'
spuriously generating `awk-mode-syntax-table'.  (Bug #9448).

Fix bug #9392 with rmail-forward.

 lisp/simple.el (mail-encode-mml): New defvar.
 lisp/mail/rmail.el (mail-encode-mml): Add a defvar.
 (rmail-enable-mime-composing): Default to t.
 (rmail-forward): Use MIME method of forwarding only if both
 rmail-enable-mime-composing and rmail-enable-mime are non-nil.
 Set mail-encode-mml non-nil if the MIME method was used.
 lisp/mail/sendmail.el (mml-to-mime): Add autoload form.
 (mail-encode-mml): Add a defvar.
 (mail-mode): Make mail-encode-mml buffer-local and initialize it
 to nil.
 (mail-send): If mail-encode-mml is non-nil, run the outgoing
 message through mml-to-mime, and reset mail-encode-mml to nil.

src/frame.c (x_report_frame_params): Cast to avoid compiler warnings.

* lisp/woman.el (woman-special-characters): Add hy character.

* lisp/woman.el (woman-special-characters): Add oq and cq quote characters.

woman.el fix for bug#9447.

* lisp/woman.el (woman-if-body): When processing an .el block,
do not delete the next .el block as well.

Whitespace changes.

Don't have previous and next buffers deal with internal windows.

* window.c (Fset_window_prev_buffers, Fset_window_next_buffers):
Operate on live windows only.

* window.el (window-deletable-p): Make sure window is live before
invoking window-prev-buffers.

New rcirc command rcirc-cmd-invite

See: http://debbugs.gnu.org/9453

* lisp/progmodes/compile.el (compilation-environment): Make it a defcustom.

Fixes: debbugs:8340

(grep-regexp-alist): Move dangling comment to the previous rule.

src/emacs.c (my_heap_start): #ifdef to avoid warnings when unused.

Rewrite window/frame auto-deletion code.  (Bug#9419) and (Bug#9456)

* window.el (frame-auto-delete): Rename to window-auto-delete.
Make it control auto-deletion of windows and/or frames.
(window-deletable-p): New argument FORCE.  Rewrite conditions
for deleting window/frame. (Bug#9419)
(switch-to-prev-buffer, replace-buffer-in-windows, quit-window):
Rewrite handling of case when window/frame can be deleted.
(delete-windows-on): Call window-deletable-p with new FORCE
argument t. (Bug#9456)

Fix move-if-change permissions.

These were inadvertenly changed to 644 in the previous revision;
the file should be executable, so change it back to 755.

Fix a crash in vertical-motion.

 src/xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it
 only under bidi iteration.

(xg_make_tool_item): Insert comment about eventbox.

* lisp/help-mode.el (help-mode): Restore autoload.

* lisp/progmodes/compile.el (compilation-start): Let-bind `thisenv' to
`compilation-environment'.  Set buffer-local
`compilation-environment' to `thisenv' later after (funcall mode).
(Bug#8340)

* lisp/vc/vc-git.el (vc-git-grep): Remove --no-color.  (Bug#9408)
(vc-git-grep): Prepend "PAGER=" to `compilation-environment'
instead of replacing its value.  (Bug#8340)

* lisp/progmodes/grep.el (grep-regexp-alist): Calculate column positions
based on text properties put by `grep-filter' instead of matching
escape sequences.
(grep-mode): Set buffer-local `compilation-error-screen-columns'
to the value of `grep-error-screen-columns'.

Fixes: debbugs:9438

* lisp/simple.el (next-error-highlight, next-error-highlight-no-select): Doc fix.

Fixes: debbugs:9432

Auto-commit of generated files.

* lib-src/etags.c (Fortran_functions): Handle "elemental" functions.

* lib-src/etags.c (Fortran_functions): Handle "pure" functions.  (tiny change)

Fixes: debbugs:9359

* lisp/progmodes/cc-fonts.el: Remove trailing whitespace.

cc-fonts.el fix for bug#9443 (tiny change)

* lisp/progmodes/cc-fonts.el (c-font-lock-enclosing-decls):
Check for null c-opt-block-decls-with-vars-key.

Conditionally initialize rcirc-input-ring

* lisp/emacs-lisp/find-func.el (find-function-C-source): Only set
find-function-C-source-directory after checking that we found a source
file there.

Fixes: debbugs:9440

isnan: Fix porting problem to Solaris 10 with bundled gcc.

Without this fix, the command to link temacs failed due to an
undefined symbol __builtin_isnan.  This is because
/usr/include/iso/math_c99.h #defines isnan(x) to
__builtin_isnan(x), but the bundled gcc, which identifies itself
as gcc 3.4.3 (csl-sol210-3_4-branch+sol_rpath), does not have
a __builtin_isnan.
* configure.in (isnan): Remove now-unnecessary check.
* src/floatfns.c (isnan): #undef, and then #define to a clone of
what's in data.c.
(Fisnan): Always define, since it's always available now.
(syms_of_floatfns): Always define isnan at the Lisp level.

Auto-commit of generated files.

Merge from trunk.