* src/keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

* lisp/emacs-lisp/smie.el: Improve warnings and conflict detection.
(smie-warning-count): New var.
(smie-set-prec2tab): Use it.
(smie-bnf->prec2): Improve warnings.  Add docstring.
(smie-bnf--closer-alist): Rename from smie-bnf-closer-alist.
(smie-bnf--set-class): New function.
(smie-bnf--classify): Rename from smie-bnf-classify.  Rewrite to fix
corner case.

* src/intervals.c: Fix grafting over the whole buffer.
(graft_intervals_into_buffer): Simplify.

Fixes: debbugs:10071

* lisp/progmodes/compile.el: Obey compilation-first-column in dest buffer.
(compilation-error-properties, compilation-move-to-column):
Handle compilation-first-column while in the target buffer.

* lisp/progmodes/cc-engine.el (c-remove-stale-state-cache-backwards):
Don't hardcode point-min==1.

* lisp/eshell/esh-cmd.el (eshell-do-eval): Handle `setq'.
(eshell-rewrite-for-command): Remove workaround.
(eshell-do-pipelines, eshell-do-pipelines-synchronously)
(eshell-do-eval, eshell-exec-lisp): Avoid gratuitous setq.
* lisp/eshell/esh-util.el (eshell-condition-case, eshell-for): Use declare.

Fixes: debbugs:9907

* lisp/files-x.el (modify-file-local-variable): Obey commenting conventions.

Add assertion for hash values of rows.

 src/dispnew.c (add_row_entry): Add xassert to verify that ROW's hash code
 is valid.

Fix another crash due to incorrect hash value of glyph rows, bug #10035.

 src/dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the
 hash values of the two rows.
 (copy_row_except_pointers): Preserve the used[] arrays and the
 hash values of the two rows.
 src/xdisp.c (row_hash): New function, body extracted from
 compute_line_metrics.
 (compute_line_metrics): Call row_hash, instead of computing the
 hash code inline.
 src/dispnew.c (verify_row_hash): Call row_hash for computing the
 hash code of a row, instead of duplicating code from xdisp.c.
 src/dispextern.h (row_hash): Add prototype.

Work around GTK bug crashing emacs GTK builds.

* frame.c (delete_frame): Don't delete the terminal when the last
X frame is closed if emacs is built with GTK toolkit.

Spelling fixes.

Typo fix.

autoload.el fix for bug#10049

* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads):
Ignore buffer-local generated-autoload-file if it is the same
as the global value.

Spelling fixes.

Fix typos.

Auto-commit of loaddefs files.

Rename window-splits to window-combination-resize.

* window.c (Vwindow_splits): Rename to
Vwindow_combination_resize.  Suggested by Juri Linkov.
(Fsplit_window_internal): Use Vwindow_combination_resize instead
of Vwindow_splits.
* window.el (window-resize, delete-window, split-window):
Replace window-splits by window-combination-resize.
* cus-start.el (window-splits): Replace by
window-combination-resize.
* windows.texi (Resizing Windows, Splitting Windows)
(Deleting Windows): Use term window-combination-resize instead
of window-splits.

Spelling fixes.

* doc/emacs/regs.texi (Bookmarks): Small fixes related to saving.  (Bug#10058)

Small fix for sh-font-lock-keywords-var bash entry.

* lisp/progmodes/sh-script.el (sh-font-lock-keywords-var):
Make bash entry derive from sh entry, not shell entry.

* net/tramp.el (tramp-handle-file-truename): Cache only the local
file name.

* net/tramp-cache.el (tramp-flush-file-property): Flush also
properties of linked files.  (Bug#9879)

ChangeLog fixes:

python-pdbtrack-stack-entry-regexp was not changed.
Mark an odd kind of change with no real attribution as tiny.
Remove conflict marker.

Fix typos.

* python.el (python-pdbtrack-stack-entry-regexp)
(python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file):
Adjust to recognize ipdb as well as regular python pdb prompts.
Adjustments shamelessly taken exactly as suggested in EmacsWiki
page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14

* allout-widgets.el: (file metadata): Attribute copyright to FSF
and collapse date sequence, obscure author/maintainer email
address better, remove extra version line, track relocation of
author's allout webpage.

* allout.el: (file metadata): Attribute copyright to FSF
and collapse date sequence, obscure author/maintainer email
address better, track relocation of author's allout webpage.

* python.el (python-pdbtrack-stack-entry-regexp)
(python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file):
Adjust to recognize ipdb as well as regular python pdb prompts.
Adjustments shamelessly taken exactly as suggested in EmacsWiki
page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14

Fix typos.

Auto-commit of loaddefs files.

Rename window-nest to window-combination-limit.

* window.h (window): Rename slot "nest" to "combination_limit".
* window.c (Fwindow_nest): Rename to Fwindow_combination_limit.
(Fset_window_nest): Rename to Fset_window_combination_limit.
(Vwindow_nest): Rename to Vwindow_combination_limit.
(recombine_windows, make_parent_window, make_window)
(Fsplit_window_internal, saved_window)
(Fset_window_configuration, save_window_save): Rename all
occurrences of window_nest to window_combination_limit.
* window.el (split-window, window-state-get-1)
(window-state-put-1, window-state-put-2): Rename occurrences of
window-nest to window-combination-limit.
* cus-start.el (window-nest): Rename to
window-combination-limit.
* windows.texi (Resizing Windows, Splitting Windows): Rename
occurrences of window-nest to window-combination-limit.

* autoconf.el (autoconf-mode): Fix comment-start-skip regexp.

Fixes: debbugs:10033

* lisp/tmm.el (tmm-prompt): Use minibuffer-with-setup-hook.
`completing-read' will remove *Completions* and will preserve
current-buffer for us.
(tmm-add-prompt): Users of *Completions* will always (re)set its
major mode.
(tmm-old-comp-map): Remove.

Fixes: debbugs:10053

Try to stop rmailedit destroying mime messages (bug#9840)

* lisp/mail/rmailedit.el: Require rmailmm when compiling.
(rmail-old-mime-state): New declaration.
(rmail-edit-current-message): If editing a mime message,
edit the "raw" message from the mbox buffer.
(rmail-cease-edit): Handle mime messages.

Add optional arguments to rmailmm to force state, not just toggle.

* lisp/mail/rmailmm.el (rmail-mime-toggle-raw): Remove entity arg,
which wasn't being used.  Add optional arg to force given state.
(rmail-mime): Add optional arg to force given state.

Update information about PNG libraries for MS-Windows.

 admin/nt/README-ftp-server: Update the information about PNG libraries.
 nt/README.W32: Update the GTK Windows download URL for libpng.

Undo a bad spelling fix.

I did not realize the comment was in Latin.

Fix typos.

Auto-commit of loaddefs files.

Small rmail and rmailmm changes, many doc fixes.

* lisp/mail/rmail.el (rmail-file-coding-system): It's only ever used
in a boolean sense, so just make it a boolean, and fix the doc.
(rmail-show-mime-function, rmail-mime-feature)
(rmail-require-mime-maybe): Doc fixes.
(rmail-show-message-1): Check rmail-show-mime-function is non-nil.

* lisp/mail/rmailmm.el (rmail-show-mime): Doc fix.

Spelling fixes.

rmailmm doc fixes.

* lisp/mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-segment)
(rmail-mime-shown-mode, rmail-mime-hidden-mode, rmail-mime-raw-mode)
(rmail-mime-toggle-hidden, rmail-mime-insert-tagline)
(rmail-mime-insert-header, rmail-mime-handle, rmail-mime-parse)
(rmail-mime, rmail-show-mime): Doc fixes.

ns-win.el fix for bug#10051

* lisp/term/ns-win.el (mode-line-frame-identification): Leave it alone.

Fix typos.

* lisp/simple.el (mark-whole-buffer): Doc fix.  (Bug#10023)

rmailout fix for bug#9978.

* lisp/mail/rmailout.el (rmail-output-to-rmail-buffer):
Handle empty buffers.

Spelling fixes.

* lib-src/Makefile.in (all): Make sure "all" is the first target.

Fix typos.

Spelling fixes.

Fix bug #10035 with assertion violation in row_equal_p.

 src/xdisp.c (display_line): Move the call to
 highlight_trailing_whitespace before the call to
 compute_line_metrics, since the latter needs to see the final
 faces of all the glyphs to compute ROW's hash value.  Fixes
 assertion violations in row_equal_p.

Fix bug#10044
src/w32proc.c (reader_thread): Don't check pending input if cp->fd < 0,
just return.

Auto-commit of loaddefs files.

If the server hangs up while we're talking to it, just `message' the error instead of throwing an error.

rmail-summary fix.

* lisp/mail/rmailsum.el (rmail-summary): Remove movement to beginning
of message - not necessary, and causes problems.

I believe the call to rmail-summary-beginning-of-message was only
thought to be necessary due to a couple of bugs in rmail-new-summary
that are hopefully fixed now (`mesg' not being set,
rmail-summary-buffer's buffer locality not being considered).

Fixes: debbugs:9831

* mail/rmailsum.el (rmail-new-summary): Preserve message number.

Nothing was setting the local variable `mesg'.
Eg when looking at message 10, pressing h to get a summary would
send you to message 1.

Spelling fixes.

Small executable.el fix related to bug#9879.

* lisp/progmodes/executable.el
(executable-make-buffer-file-executable-if-script-p):
Handle file-modes returning nil.

* lisp/mail/rmail.el (rmail-no-mail-p): Remove mode-line N/M indicator.

Rmail summary fixes for empty summaries.

* lisp/mail/rmailsum.el (rmail-summary, rmail-new-summary)
(rmail-new-summary-1): Allow empty summaries.
(rmail-new-summary): Remember that rmail-summary-buffer is buffer-local.

Fixes: debbugs:9964

* inc/stdint.h (UINT64_MAX, UINT32_MAX): Fix values.

Spelling fixes.

* INSTALL: Tiny updates for disk space used during installation.

Allow building temacs with a larger heap on MS-Windows.

 src/makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
 with user-defined heap size.  Bump the default size of the temacs
 heap to 27MB, to avoid memory warning when running temacs.
 ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.

Verify glyph row's hash values.

 src/dispnew.c (verify_row_hash) [XASSERTS]: New function.
 (adjust_glyph_matrix, row_equal_p): Use it in xassert to verify
 that the hash value of glyph rows is correct.

dispnew.c (scrolling_window): Fix index usage.

 src/dispnew.c (scrolling_window): Fix incorrect indices in accessing
 current_matrix and desired_matrix.  (Bug#9990)

Don't handle splits status.

* window.h (window): Remove splits slot.
* window.c (Fwindow_splits, Fset_window_splits): Remove.
(Fdelete_other_windows_internal, make_parent_window)
(make_window, Fsplit_window_internal, Fdelete_window_internal)
(Fset_window_configuration, save_window_save): Don't deal with
split status of windows.
(saved_window): Remove splits slot.
(Vwindow_splits): Rewrite doc-string.
* window.el (window-resize, delete-window): Use window-splits
variable instead of function.
(window-state-get-1, window-state-put-2, window-state-put):
Don't deal with windows' splits status.
* windows.texi (Splitting Windows, Deleting Windows): Remove
references to splits status of windows.

apropos.el doc fixes.

* lisp/apropos.el (apropos-do-all, apropos-library, apropos-value)
(apropos-documentation): Doc fixes.

Fix more typos.

Fix typos.

* xfns.c (unwind_create_frame):
* nsfns.m (unwind_create_frame):
* w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in
Vframe_list.

Fixes: debbugs:9999

* lisp/electric.el: Make electric-indent-mode better behaved.
* lisp/electric.el (electric-indent-post-self-insert-function): Make it
possible for a char to only indent in some circumstances.
(electric-indent-mode): Simplify.

Further rename and clean up of functions in window.el.

* window.el (window-size-ignore, window-size-fixed-1)
(window-in-direction-2): Prefix with "window--".
(window-tree-1): Rename to window--subtree, fix doc-string.

Spelling fixes.

Rename and clean up functions in window.el.

* window.el (windows-with-parameter): Remove unused function.
(windows-at-side): Rename to window-at-side-list.
(window-check, window-atom-check, window-atom-check-1)
(window-side-check): Prefix with "window--".

* xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.

callproc.c (Fcall_process): Set the member dst_multibyte of process_coding.

merge trunk

xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496).

eval-after-load fix for bug#10009

* lisp/subr.el (eval-after-load): If FILE is already loaded,
evaluate FORM before it gets wrapped in more stuff.

Always use svn --non-interactive in vc-svn.el (bug#9993)

* lisp/vc/vc-svn.el (vc-svn-create-repo, vc-svn-modify-change-comment):
Call svn via vc-svn-command rather than vc-do-command.
(vc-svn-command): Add --non-interactive.
(vc-svn-update, vc-svn-merge-news): No need for --non-interactive.

toggle-read-only fixes for bugs#7292, 10006.

* doc/lispref/buffers.texi (Read Only Buffers): Expand a bit on why
toggle-read-only should only be used interactively.

* lisp/files.el (toggle-read-only): Mention that it should only
be used interactively.

* lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Add toggle-read-only.

Fix typos.

* lisp/progmodes/compile.el: Adjust regexp for OCaml warnings.
(compilation-error-regexp-alist-alist): OCaml warnings (can?) have a number.

Fixes: debbugs:9749

* lisp/electric.el (electric-pair-post-self-insert-function): Let user
turn it off buffer-locally.

Fixes: debbugs:9932

* lisp/progmodes/python.el (python-beginning-of-statement): Rewrite.

Fixes: debbugs:2703

Document window-pixel-edges etc in Lisp manual.

* doc/lispref/windows.texi (Window Sizes): Document window-pixel-edges,
window-inside-pixel-edges. window-absolute-pixel-edges, and
window-inside-absolute-pixel-edges.
(Resizing Windows): shrink-window-if-larger-than-buffer works on
non-full-width windows.

Disallow calling window-inside-edges and related functions on internal windows.

* src/window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges)
(Fwindow_inside_absolute_pixel_edges): Only allow live windows.

* lisp/progmodes/compile.el: Better handle TABs.
(compilation-internal-error-properties)
(compilation-next-error-function): Obey the target buffer's
compilation-error-screen-columns.

Fixes: debbugs:9749

Rewrite window-resizable.

* window.el (window-size-fixed-p): Rewrite doc-string.
(window-resizable-p): Rename to window--resizable-p.  Update
callers.
(window--resizable): New function.  Make all callers of
window-resizable call window--resizable instead.
(window-resizable): Rewrite in terms of window--resizable.
* windows.texi (Resizing Windows): Rewrite documentation of
window-resizable.

* doc/lispref/windows.texi (Splitting Windows): Simplify example.

Spelling fixes.

* s/gnu.h (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS (Bug#9926).

Avoid some portability problems by eschewing 'extern inline' functions.

The trivial performance wins aren't worth the portability hassles; see
<http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>
et seq.
* dispextern.h (window_box, window_box_height, window_text_bottom_y)
(window_box_width, window_box_left, window_box_left_offset)
(window_box_right, window_box_right_offset): Undo previous change,
by removing the "extern"s.
* intervals.c (adjust_intervals_for_insertion)
(adjust_intervals_for_deletion): Undo previous change,
making these static again.
(offset_intervals, temp_set_point_both, temp_set_point)
(copy_intervals_to_string): No longer inline.
* xdisp.c (window_text_bottom_y, window_box_width)
(window_box_height, window_box_left_offset)
(window_box_right_offset, window_box_left, window_box_right)
(window_box): No longer inline.

delphi syntax table fix for bug#9994

* lisp/progmodes/delphi.el (delphi-mode-syntax-table):
Let define-derived-mode define a proper syntax table.

Fix doc-string typo in window-min-delta

* lisp/window.el: Stay away from defsubst.
(window-list-no-nils): Remove.
(window-state-get-1, window-state-get): Use backquote instead.

* doc/lispref/windows.texi (Resizing Windows): Simplify introduction.
Don't document enlarge-window, shrink-window, enlarge-window-horizontally,
and shrink-window-horizontally; they are no longer preferred for calling
from Lisp, and are already documented in the Emacs manual.

Update changelog.

* emacs-lisp/find-func.el (find-function-read): Fix incorrect use of default argument in `completing-read'.

Remove stale references to help-setup parameter in doc-strings.

* window.el (display-buffer-function, special-display-function):
Mention display-buffer-record-window but do not mention
help-setup parameter in doc-strings.

Fix permissions inadvertently changed in 2011-10-31T00:37:09Z!viniciusjl@ig.com.br.

Edits to Window Sizes node of Lisp manual.

* doc/lispref/windows.texi (Window Sizes): Copyedits.  Document
window-text-height.  Remove window-min-height and window-min-width
discussion, referring instead to Emacs manual.
(Splitting Windows, Resizing Windows): Add xref to Emacs manual.