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.

Merge from trunk.

isearch.el (isearch-other-meta-char): Wherever a key list is unread,
"unread" the prefix arg, too.  This fixes bug #8901.

Merge changes made in Gnus trunk.

gnus-sum.el (gnus-summary-exit): Ensure we kill the proper original-article-buffer.
nnir.el (nnir-compose-result): Fix matching of server type.
 (nnir-run-swish++): Ditto.
 (nnir-run-namazu): Ditto.
 (nnir-run-notmuch): Ditto.

Merge from trunk.

Auto-commit of generated files.

* lisp/progmodes/grep.el (rgrep): Add "-type d".

Fixes: debbugs:9414

* lisp/progmodes/grep.el (grep-process-setup): Fix comments.

Fixes: debbugs:8084

* dbusbind.c (xd_signature_cat): Rename from signature_cat.

Grep related fixes.

* etc/grep.txt: Add `eval' to the Local Variables section that
emulates `grep-filter'.

* lisp/progmodes/grep.el (grep-filter): Avoid incomplete processing by
keeping point where processing of grep matches begins, and
continue to delete remaining escape sequences from the same point.
(grep-filter): Make leading zero optional in "0?1;31m" because
git-grep emits "\033[1;31m" escape sequences unlike expected
"\033[01;31m" as GNU Grep does.
(grep-process-setup): Replace obsolete "ml=" with newer "sl=".

Fixes: debbugs:9408

* lisp/subr.el (y-or-n-p): Capitalize "yes".

Merge from trunk.

Merge changes made in Gnus trunk.

gnus.el (gnus-home-directory): Add warning about setting in .gnus.el (bug#9405).
gnus-score.el (gnus-summary-increase-score): Doc clarification (bug#9421).
gnus-spec.el (gnus-face-0): Make all the face specs into defcustoms (bug#9425).
gnus-art.el (gnus-treatment-function-alist): Remove CRs as the first thing (bug#9426).

sprintf-related integer and memory overflow issues

Fixes: debbugs:9397 debbugs:9412

Merge from trunk.

Integer overflow fixes for scrolling, etc.

Merge from trunk.

* xdisp.c: Integer overflow fix.

(try_window_id): Check Emacs fixnum range before converting to 'int'.

* window.c: Integer overflow fixes.

(window_scroll_line_based, Frecenter):
Check that an Emacs fixnum is in range before assigning it to 'int'.
(Frecenter, Fmove_to_window_line): Use EMACS_INT, not int, for
values converted from Emacs fixnums.
(Frecenter): Don't wrap around a line count if it is out of 'int'
range; instead, treat it as an extreme value.
(Fset_window_configuration, compare_window_configurations):
Use ptrdiff_t, not int, for index that might exceed 2 GiB.

* net/tramp.el (top): Require 'shell.  Use `tramp-unload-hook' but
`tramp-cache-unload-hook' where appropriate.
(tramp-methods): Rename `tramp-remote-sh' to
`tramp-remote-shell'.  Add `tramp-remote-shell-args'.
(tramp-handle-shell-command): New defun, moved from tramp-sh.el.

* net/tramp-sh.el (top): Don't require 'shell.
(tramp-methods): Add `tramp-remote-shell' and
`tramp-remote-shell-args' entries.
(tramp-sh-file-name-handler-alist): Use `tramp-handle-shell-command'.
(tramp-sh-handle-shell-command): Remove.
(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
Use `tramp-remote-shell'.

* search.c: Integer overflow fixes

(Freplace_match): Use ptrdiff_t, not int, for indexes that can
exceed INT_MAX.  Check that EMACS_INT value is in range before
assigning it to the (possibly-narrower) index.
(match_limit): Don't assume that a fixnum can fit in 'int'.

* print.c: Integer overflow fix.

(print_object): Use ptrdiff_t, not int, for index that can
exceed INT_MAX.

* indent.c: Integer overflow fixes.

(position_indentation): Now takes ptrdiff_t, not int.
(Fvertical_motion): Don't wrap around LINES values that don't fit
in 'int'.  Instead, treat them as extreme values.  This is good
enough for windows, which can't have more than INT_MAX lines anyway.

Fix bug #9433 with indexing of C-x 8 RET.

 doc/emacs/basic.texi (Inserting Text): Add index entries.

Merge from gnulib.

Merge from trunk.

nnimap.el (nnimap-open-connection-1): Use the correct port number in the error message.

* Require libxml/parser.h to avoid compilation warning.

Fix up xmlCleanupParser sequence.

* xml.c (parse_region): Don't call xmlCleanupParser after parsing,
since this reportedly can destroy thread storage.

* emacs.c (shut_down_emacs): Call xmlCleanupParser on shutdown.

Make sendmail-query-once update send-mail-function directly.

* mail/sendmail.el (sendmail-query-once-function): Deleted.
(sendmail-query-once): Save directly to send-mail-function.
Update message-send-mail-function too.

* mail/smtpmail.el (smtpmail-try-auth-methods): Clarify prompt.

* progmodes/python.el (python-mode-map): Use correct function to
start python interpreter from menu-bar (as reported by Geert
Kloosterman).
(inferior-python-mode-map): Fix typo.
(python-shell-map): Removed.

* lisp/net/rcirc.el (rcirc-print): Simplify code for rcirc-scroll-show-maximum-output.  There is no need to walk through all windows to find the right one.

* help.el (help-return-method): Doc fix.

Don't delete frame when there's a previous buffer to show (Bug#9419).

* window.el (window-deletable-p): Don't return a non-nil value
when there's a buffer that was shown in the window before.
(Bug#9419)
(display-buffer-pop-up-frame, display-buffer-pop-up-window): Set
window's previous buffers to nil.

Fix rmail-forward.

Fix display by Rmail of bidirectional text in MIME email messages.

 lisp/mail/rmailmm.el (rmail-mime-insert-tagline): Insert an extra
 newline before and after the tag line, so it doesn't interfere
 with determining the paragraph direction of bidirectional text.

Add Bug#.

Merge from trunk.

* fileio.c: Fix bugs with large file offsets.

The previous code assumed that file offsets (off_t values) fit in
EMACS_INT variables, which is not true on typical 32-bit hosts.
The code messed up by falsely reporting buffer overflow in cases
such as (insert-file-contents "big" nil 1 2) into an empty buffer
when "big" contains more than 2**29 bytes, even though this
inserts just one byte and does not overflow the buffer.
(Finsert_file_contents): Store file offsets as off_t
values, not as EMACS_INT values.  Check for overflow when
converting between EMACS_INT and off_t.  When checking for
buffer overflow or for overlap, take the offsets into account.
Don't use EMACS_INT for small values where int suffices.
When checking for overlap, fix a typo: ZV was used where
ZV_BYTE was intended.
(Fwrite_region): Don't assume off_t fits into 'long'.
* buffer.h (struct buffer.modtime_size): Now off_t, not EMACS_INT.

Remove unused variable find-file-not-true-dirname-list

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

lisp/gnus/message.el (message-setup-1): Return t (Bug#9392).

Remove pop-to-buffer-same-window.

* lisp/window.el (pop-to-buffer-1, pop-to-buffer-same-window): Deleted.
(pop-to-buffer): Change interactive spec.  Pass second argument
directly to display-buffer.
(display-buffer): Fix interactive spec.  Use functionp to
distinguish between a function and a list of functions.

* lisp/abbrev.el (edit-abbrevs):
* lisp/arc-mode.el (archive-extract):
* lisp/autoinsert.el (auto-insert):
* lisp/bookmark.el (bookmark-bmenu-list):
* lisp/files.el (find-file):
* lisp/view.el (view-buffer):
* lisp/progmodes/compile.el (compilation-goto-locus):
* lisp/textmodes/bibtex.el (bibtex-initialize): Use switch-to-buffer.

* lisp/org/ob-ref.el (org-babel-ref-goto-headline-id):
* lisp/org/org.el (org-get-location, org-tree-to-indirect-buffer)
(org-mark-ring-goto, org-refile, org-add-log-note)
(org-revert-all-org-buffers, org-switchb)
(org-cycle-agenda-files, org-submit-bug-report)
(org-goto-marker-or-bmk):
* lisp/org/org-agenda.el (org-prepare-agenda, org-agenda-switch-to):
* lisp/org/org-capture.el (org-capture-goto-target)
(org-capture-fill-template):
* lisp/org/org-clock.el (org-clock-goto):
* lisp/org/org-ctags.el (org-ctags-visit-buffer-or-file):
* lisp/org/org-exp.el (org-export-as-org):
* lisp/org/org-feed.el (org-feed-show-raw-feed):
* lisp/org/org-html.el (org-export-htmlize-generate-css):
* lisp/org/org-id.el (org-id-goto):
* lisp/org/org-irc.el (org-irc-visit-erc):
* lisp/org/org-mobile.el (org-mobile-apply):
* lisp/org/org-publish.el (org-publish-org-to, org-publish-find-date):
* lisp/org/org-remember.el (org-go-to-remember-target):
* lisp/org/org-src.el (org-src-switch-to-buffer)
(org-edit-fixed-width-region): Use switch-to-buffer.

* lisp/org/org-compat.el (org-pop-to-buffer-same-window): Deleted.

Add missing piece of earlier commit.

* lisp/vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories.

Fixes: debbugs:9391

Minor doc fix for last change.

Split default-buffer-default into separate display action components.

* lisp/window.el (display-buffer-alist): Doc fix.
(display-buffer): Add docstring.  Don't treat display-buffer-default specially.
(display-buffer-reuse-selected-window)
(display-buffer-same-window, display-buffer-maybe-same-window)
(display-buffer-reuse-window, display-buffer-pop-up-frame)
(display-buffer-pop-up-window)
(display-buffer-reuse-or-pop-window)
(display-buffer-use-some-window): New functions.
(display-buffer-default-action): Use them.
(display-buffer-default): Deleted.
(pop-to-buffer-1): Fix choice of actions.

* lisp/minibuffer.el (completion--insert-strings): Don't get confused by
completion entries that end with an LF char.

lisp/window.el (frame-auto-delete, window-deletable-p): Doc fix.

Fix display-buffer interactive spec, and fixes for pop-to-buffer*.

* lisp/window.el (display-buffer): Restore interactive spec.
(display-buffer-same-window, display-buffer-other-window): New
functions.
(pop-to-buffer-1): New function.  Use the above.
(pop-to-buffer, pop-to-buffer-same-window): Use it.
(pop-to-buffer-other-window, pop-to-buffer-other-frame): Deleted.

* lisp/view.el (view-buffer-other-window, view-buffer-other-frame):
Just use pop-to-buffer.

Merge from trunk.

* src/doprnt.c (esnprintf): Remove.  All uses removed.

Suggested by Chong Yidong in <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9412#23>.

gnus-sum.el: When adding article headers to a summary buffer also update gnus-newsgroup-articles (bug#9386).

Auto-commit of loaddefs files.

* lisp/vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories.

Fixes: debbugs:9391

* lisp/vc/vc-git.el (vc-git-grep): Use --no-color.  (tiny change)

Fixes: debbugs:9408

bzr 2.4.0, including changelog_merge plugin, was released.

Merge from trunk.

Add a stub for snprintf, for ancient hosts lacking it.

* configure.in (snprintf): New check.
* nt/config.nt (HAVE_SNPRINTF): New macro.
* src/sysdep.c (snprintf) [! HAVE_SNPRINTF]: New function.

Properly handle splitting of Rmail buffer and message view buffer.

Merge from trunk.

Auto-commit of generated files.

Restore Emacs 23 display-buffer functions and options.

* window.el (display-buffer-window): Rewrite doc-string.
(display-buffer-record-window): New function.
(display-buffer-macro-specifiers)
(display-buffer-even-window-sizes, display-buffer-set-height)
(display-buffer-set-width, display-buffer-in-window)
(display-buffer-reuse-window, display-buffer-split-specifiers)
(display-buffer-side-specifiers, display-buffer-split-window-1)
(display-buffer-split-window, display-buffer-split-atom-window)
(display-buffer-pop-up-window, display-buffer-pop-up-frame)
(display-buffer-pop-up-side-window, display-buffer-in-side-window)
(display-buffer-other-window-means-other-frame)
(display-buffer-normalize-special)
(display-buffer-normalize-default)
(display-buffer-normalize-argument)
(display-buffer-normalize-alist-1, display-buffer-normalize-alist)
(display-buffer-normalize-specifiers, display-buffer-frame)
(display-buffer-same-window, display-buffer-same-frame)
(display-buffer-other-window)
(display-buffer-same-frame-other-window)
(display-buffer-other-frame, pop-to-buffer-same-window)
(pop-to-buffer-same-frame, pop-to-buffer-other-window)
(pop-to-buffer-same-frame-other-window, pop-to-buffer-other-frame)
(switch-to-buffer-same-frame)
(switch-to-buffer-other-window-same-frame)
(display-buffer-alist-of-strings-p, display-buffer-alist-add)
(display-buffer-alist-set-1, display-buffer-alist-set-2)
(display-buffer-alist-set): Remove.
(display-buffer-function, special-display-buffer-names)
(special-display-regexps, special-display-function): In
doc-string refer to display-buffer-window and quit-restore
parameter.
(pop-up-frame-alist, pop-up-frame-function, special-display-p)
(special-display-frame-alist, special-display-popup-frame)
(same-window-buffer-names, same-window-regexps, same-window-p)
(pop-up-frames, display-buffer-reuse-frames, pop-up-windows)
(split-window-preferred-function, split-height-threshold)
(split-width-threshold, window-splittable-p)
(split-window-sensibly, window--try-to-split-window)
(window--frame-usable-p, even-window-heights)
(window--even-window-heights, window--display-buffer-1)
(window--display-buffer-2, display-buffer-other-frame): Restore
old Emacs 23 code, order and doc-strings where applicable.
(display-buffer-default, display-buffer-assq-regexp): New functions.
(display-buffer-alist): Rewrite doc-string.
(display-buffer-default-action)
(display-buffer-overriding-action): New variables.
(display-buffer, switch-to-buffer): Rewrite.
(pop-to-buffer): Restore Emacs 23 behavior but use
window-normalize-buffer-to-display.
(switch-to-buffer-other-window, switch-to-buffer-other-frame):
Restore Emacs 23 behavior but use
window-normalize-buffer-to-switch-to.
(pop-to-buffer-same-window): Rewrite.
(pop-to-buffer-other-window, pop-to-buffer-other-frame): Rewrite
using Emacs 23 options.

* org-compat.el (org-pop-to-buffer-same-window): Remove LABEL
argument from pop-to-buffer-same-window call.

* net/tramp.el (tramp-root-regexp): Remove.
(tramp-completion-file-name-regexp-unified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-url): Don't use leading volume
letter on win32 systems.  (Bug#5303, Bug#9311)
(tramp-drop-volume-letter): Simplify definition.  Suggested by
Stefan Monnier <monnier@iro.umontreal.ca>.

Avoid the use of snprintf.

* font.c (APPEND_SNPRINTF): Remove.
(font_unparse_xlfd):
* xterm.c (x_io_error_quitter):
Use esnprintf, not snprintf.  That way, we don't have to worry
about porting to ancient platforms that lack snprintf.
(x_term_init): Use sprintf, not snprintf.

auth-source.el: Autoload help-mode.

Add Bug#.

Merge changes from emacs-23 branch

Fix syntax scanning bug causing fontification crashes.

* src/syntax.c (find_defun_start): Update all cache variables if
exiting early.

Fixes: debbugs:9401

gnus-group.el (gnus-group-name-charset): Don't bug out on server names.

Fix misworded comment.

Merge from trunk.

* configure.in: Remove no-longer used HP patterns.

(opsys): Remove unreachable pattern hppa*-*-linux-gnu*.
Also, remove ia64*-hp-hpux1[1-9]*, as it also sets machine=hp800,
and that can't possibly work now that src/m/hp800.h no longer exists.

* configure.in (opsys): Change pattern to *-*-linux*.