* lisp/emacs-lisp/bytecomp.el: Use lexical-binding.
(byte-recompile-directory): Remove unused var `bytecomp-dest'.
(byte-recompile-file): Use derived-mode-p.
(byte-compile-from-buffer): Remove arg `bytecomp-filename'.
Use byte-compile-current-file instead.
(byte-compile-file): Adjust call accordingly.
(bytecomp-outbuffer): Move declaration before first use.
(for-effect): Declare dynamic.
(byte-compile-file-form-defmumble): Use byte-compile-current-file.
(byte-compile-top-level, byte-compile-out-toplevel, byte-compile-form):
Move dyn-binding of for-effect from function argument to let binding.
(byte-compile-out-toplevel): Don't both passing for-effect to
byte-optimize-lapcode.
(byte-compile-top-level-body, byte-compile-body):
Rename for-effect -> for-effect-arg so it's lexical.
* lisp/subr.el (functionp): Remove, now that it's in src/eval.c.

* lisp/emacs-lisp/byte-opt.el: Use lexical binding.
(for-effectm byte-compile-tag-number): Declare dynamic.
(byte-optimize-form-code-walker, byte-optimize-form): Move dynamic
binding of for-effect from function argument to let binding.
(byte-decompile-bytecode-1): Move dynamic binding of bytedecomp-bytes
from function argument to let binding.

Rewrite the cconv conversion algorithm, for clarity.
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand): Adjust check for
new byte-code representation.
* lisp/emacs-lisp/cconv.el (cconv--convert-function): Rename from
cconv-closure-convert-function.
(cconv-convert): Rename from cconv-closure-convert-rec.
(cconv--analyse-use): Rename from cconv-analyse-use.
(cconv--analyse-function): Rename from cconv-analyse-function.
(cconv--analyse-use): Change some patterns to silence compiler.
(cconv-convert, cconv--convert-function): Rewrite.
* test/automated/lexbind-tests.el: New file.

Merge from trunk

Bind C-y in Isearch to isearch-yank-kill.

* lisp/isearch.el (isearch-mode-map): Bind C-y to isearch-yank-kill,
and move isearch-yank-line to M-s C-e.

* doc/emacs/search.texi (Isearch Yank): C-y now bound to isearch-yank-kill.

(c-guess-basic-syntax): Move CASE 19 to a different place, correctly to
process template-args-cont lines.

progmodes/cc-engine.el (c-guess-basic-syntax): Reindent.

Improve packaging documentation.

* package.texi (Packaging, Packaging Basics, Simple Packages)
(Multi-file Packages): Expand and clarify.
(Package Archives): Temporary placeholder node.

* elisp.texi (Top): Update node listing.

Merge: current_column: Now returns EMACS_INT, fixing some iftc
that was introduced in the 2002-06-02 change "temporarily"; see
<http://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
* bytecode.c (Fbyte_code): Don't cast current_column () to int.
* cmds.c (internal_self_insert): Likewise.
* indent.c (Fcurrent_column): Likewise.
* keymap.c (describe_command): Likewise.
* minibuf.c (read_minibuf): Likewise.
* indent.c (Fcurrent_indentation): Don't cast position_indentation ()
to int.
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
Likewise.
* cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
not int or double, if they might contain a column number.
* indent.c (current_column, Findent_to, indented_beyond_p):
(compute_motion, vmotion): Likewise.
* keymap.c (describe_command): Likewise.
* xdisp.c (pint2str): Likewise.
* indent.c (last_known_column): Now EMACS_INT, not int.
* minibuf.c (minibuf_prompt_width): Likewise.
* indent.c (current_column, current_column_1, position_indentation):
Return EMACS_INT, not double.
* lisp.h (current_column): Likewise.
* indent.c (indented_beyond_p): Last arg is now EMACS_INT, not double.
All callers changed.
* lisp.h (indented_beyond_p): Likewise.

* minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here
from xdisp.c, and make static, since these are used only here.
* window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
Remove decls.
* xdisp.c (redisplay_window): Reindent to match Emacs style.

current_column: Now returns EMACS_INT, fixing some iftc.

* bytecode.c (Fbyte_code): Don't cast current_column () to int.
* cmds.c (internal_self_insert): Likewise.
* indent.c (Fcurrent_column): Likewise.
* keymap.c (describe_command): Likewise.
* minibuf.c (read_minibuf): Likewise.
* indent.c (Fcurrent_indentation): Don't cast position_indentation ()
to int.
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
Likewise.
* cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
not int or double, if they might contain a column number.
* indent.c (current_column, Findent_to, indented_beyond_p):
(compute_motion, vmotion): Likewise.
* keymap.c (describe_command): Likewise.
* xdisp.c (pint2str): Likewise.
* indent.c (last_known_column): Now EMACS_INT, not int.
* minibuf.c (minibuf_prompt_width): Likewise.
* indent.c (current_column, current_column_1, position_indentation):
Return EMACS_INT, not double.
* lisp.h (current_column): Likewise.
* indent.c (indented_beyond_p): Last arg is now EMACS_INT, not double.
All callers changed.
* lisp.h (indented_beyond_p): Likewise.

* xdisp.c (redisplay_window): Likewise.

* minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here

from xdisp.c, and make static, since these are used only here.
* window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
Remove decls.

* cmds.c (internal_self_insert): Reindent to match Emacs style.

* xdisp.c (SKIP_GLYPHS): Removed unused macro.

* xdisp.c (update_window_cursor):  Now static, since it's not used elsewhere.

* xdisp.c (produce_glyphless_glyph): Make a pointer "const"

since it might point to immutable storage.

* xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var.

Merge from mainline.

* xdisp.c: Rename or move local decls to avoid shadowing.

(init_iterator, handle_fontified_prop, handle_single_display_spec):
(message_dolog, message_with_string, redisplay_internal):
(redisplay_window, try_window_reusing_current_matrix, try_window_id):
(compute_line_metrics, highlight_trailing_whitespace, cursor_row_p):
(display_line, display_string, rows_from_pos_range):
(mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
Rename or move local decls.

Add package.texi to doc/lispref/Makefile.in.

Missing file in last commit.
* src/eval.c (funcall_lambda): Adjust arglist test accordingly.

Fix pcase memoizing; change lexbound byte-code marker.
* src/bytecode.c (exec_byte_code): Remove old lexical binding slot handling
and replace it with the a integer args-desc handling.
* eval.c (funcall_lambda): Adjust arglist test accordingly.
* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-signature):
Handle integer arglist descriptor.
(byte-compile-make-args-desc): Make integer arglist descriptor.
(byte-compile-lambda): Use integer arglist descriptor to mark lexical
byte-coded functions instead of an extra slot.
* lisp/help-fns.el (help-add-fundoc-usage): Don't add a dummy doc.
(help-split-fundoc): Return a nil doc if there was no actual doc.
(help-function-arglist): Generate an arglist from an integer arg-desc.
* lisp/emacs-lisp/pcase.el (pcase--memoize): Rename from pcase-memoize;
Make only the key weak.
(pcase): Change the key used in the memoization table, so it does not
always get GC'd away.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Slight change to the
pcase pattern to generate slightly better code.

* calc/calc-units.el (math-midi-round): Translate calc-note-threshold
  to an appropriate fraction.

* calc/calc-units.el (math-midi-round, math-freqp, math-midip)
  (math-spnp, math-spn-to-midi, math-midi-to-spn, math-freq-to-spn)
  (math-midi-to-freq, math-spn-to-freq, calcFunc-spn, calcFunc-midi)
  (calcFunc-freq, calc-freq, calc-midi, calc-spn): New functions.
  (math-notes): New variable.

* calc/calc.el (calc-note-threshold): New variable.

* calc/calc-ext.el (calc-init-extensions): Add keybindings for
  calc-spn, calc-midi, calc-freq.  Add autoloads for calcFunc-spn,
  calcFunc-midi, calcFunc-freq, calc-spn, calc-midi and calc-freq.

* doc/misc/calc.tex (Musical Notes): New section.
  (Customizing Calc): Mention calc-note-threshold.

* doc/misc/calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-ext.el (calc-init-extensions): Rename calc-logunits-dblevel
  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-units.el (calc-dblevel): Rename from calc-logunits-dblevel.
  (calc-nplevel): Rename from calc-logunits-nplevel.

Allow specifying local ELPA mirrors in package-archives.

* emacs-lisp/package.el (package-archives): Accept either ordinary
directory names, in addition to HTTP URLs.
(package--with-work-buffer): New macro.   Handle normal directories.
(package-handle-response): Don't display the failing buffer.
(package-download-single, package-download-tar)
(package--download-one-archive): Use package--with-work-buffer.
(package-archive-base): Rename from package-archive-url.

Mention xmodmap-generic-mode in NEWS.

generic-x trivia.

* lisp/generic-x.el (generic-unix-modes): Add xmodmap-generic-mode.
(xmodmap-generic-mode): Respect generic-extras-enable-list.

* lisp/generic-x.el (xmodmap-generic-mode): New.  (Bug#2065)  (tiny change)

Fix typos.

* etc/srecode/el.srt: Fix typo.

* lisp/allout.el (allout-init, allout-prefixed-keybindings)
  (allout-unprefixed-keybindings):
* lisp/progmodes/prolog.el (prolog-find-term):
  Fix typos in docstrings.

* lisp/org/org.el (org-blank-before-new-entry, org-context-in-file-links)
  (org-refile-targets, org-log-repeat, org-insert-link)
  (org-speed-command-default-hook, org-speed-command-hook)
  (org-in-regexps-block-p, org-yank-generic, org-goto-first-child):
  Fix typos in docstrings.
  (org-toggle-pretty-entities): Fix typo in message.

* lisp/emacs-lisp/elp.el (elp-results): Fix off-by-one in header.  (Bug#2746)

* lisp/textmodes/sgml-mode.el (sgml-fill-nobreak): Give it a doc.  (Bug#5326)

Doc fixes for bug#5567 (tiny change)

* lisp/window.el (one-window-p, walk-windows, display-buffer): Doc fixes.
* src/window.c (Fnext_window): Doc (and comment) fixes.

* cus-edit.el (custom-prompt-variable):  Use the `custom-get' property
  of the variable if it exists.

NEWS.

Regenerate autotools stuff, grumble.

* configure.in (FREETYPE_LIBS): Actually set it to something.

This was needed for linking a lucid toolkit build on a recent
Debian testing system.  Without this, it failed with:
ftfont.o: undefined reference to symbol 'FT_New_Face'

* lisp/bookmark.el:
* lisp/desktop.el:
* lisp/emacs-lock.el:
* lisp/ps-print.el:
* lisp/saveplace.el:
* lisp/net/tramp-cache.el:
* lisp/textmodes/reftex.el:
* lisp/org/org-id.el: Don't set `kill-emacs-hook' on noninteractive sessions.

Fixes: debbugs:8137

gnus-uu.el (gnus-uu-decode-save): Typo fix.

Fix last change.

* nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.

Remove "tiny change" ChangeLog tags for Antoine Levitt, who signed papers.

Replace many instances of read-file-name with read-directory-name.

* lisp/files.el (delete-directory, copy-directory, list-directory): Use
read-directory-name.

* lisp/find-file.el (ff-find-the-other-file):
* lisp/net/ange-ftp.el (ange-ftp-make-directory):
* lisp/printing.el (pr-interactive-dir):
* lisp/progmodes/ada-prj.el (ada-prj-load-directory):
* lisp/progmodes/ebnf2ps.el (ebnf-print-directory)
(ebnf-spool-directory, ebnf-eps-directory)
(ebnf-syntax-directory):
* lisp/shell.el (shell):
* lisp/speedbar.el (speedbar-create-directory):
* lisp/vc/emerge.el (emerge-merge-directories):
* lisp/vc/vc-dir.el (vc-dir):
* lisp/vc/vc.el (vc-create-tag, vc-retrieve-tag): Likewise.

* lisp/gnus.el (gnus-interactive): Use read-directory-name.

* lisp/gnus-uu.el (gnus-uu-decode-uu-and-save)
(gnus-uu-decode-unshar-and-save, gnus-uu-decode-save)
(gnus-uu-decode-binhex, gnus-uu-decode-yenc)
(gnus-uu-decode-save-view, gnus-uu-decode-postscript-and-save):
Likewise.

* lisp/mh-funcs.el (mh-store-msg, mh-store-buffer):
* lisp/mh-mime.el (mh-mime-save-parts): Use read-directory-name.

* lisp/dired.el: Clarify comment.

Fix to help-buffer to ensure it returns a valid buffer (Bug#8147).

* lisp/help-mode.el (help-buffer): If we are to return the current
buffer, signal an error if it's not in Help mode.

* processes.texi (Synchronous Processes): Minor clarification (Bug#8149).

Add ChangeLog bug ref.

Handle git-style backup names in file-name-version-regexp (Bug#8159).

* files.el (file-name-version-regexp): Handle backup files of the
form `foo.js.~HEAD~1~' (Bug#8159).

ChangeLog fix.

Move eshell's self-tests to the test/ directory.

* lisp/eshell/esh-var.el: Don't require esh-test when compiling.
* lisp/eshell/em-banner.el, lisp/eshell/esh-cmd.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-var.el, lisp/eshell/eshell.el: Move tests to esh-test.
* lisp/eshell/esh-test.el: Move to ../../test/eshell.el

* test/eshell.el: Move here from lisp/eshell/esh-test.el.

Make save-some-buffers message more informative (Bug#8134).

* files.el (save-some-buffers): Report the names of buffers saved
automatically due to buffer-save-without-query.

* lisp/eshell/esh-proc.el (eshell-kill-process-function): Fix typo in previous.

* lisp/net/rcirc.el: Add QuakeNet authentication support.
(rcirc-authinfo, rcirc-check-auth-status)
(rcirc-authenticate): Support QuakeNet.

* lisp/net/rcirc.el: Add functionality to authenticate before autojoining channels.
(rcirc-authenticate-before-join): New option.
(rcirc-authenticated-hook): New variable.
(rcirc-connect): Make local variable rcirc-user-authenticated.
(rcirc-handler-001): Respect rcirc-authenticate-before-join.
(rcirc-check-auth-status, rcirc-join-channels-post-auth): New
functions.
(rcirc-handler-PRIVMSG, rcirc-handler-NOTICE): Call
rcirc-check-auth-status.

Merge changes made in Gnus trunk.

gnus-sum.el (gnus-update-read-articles): Fix typo.
gnus.el (gnus-valid-select-methods): Mark nnimap as a backend that really have server-side marks.
gnus-sum.el (gnus-propagate-marks): Change default back to nil again, since most backends do not usefully have server-side marks.
 (gnus-update-read-articles): Propagate marks to all backends that really have server-side marks.
message.el (message-cite-reply-position, message-cite-style): New variables.
 (message-yank-original): Use the new citation styles.

Add package name. Fix author email address.

* net/soap-client.el (soap-namespace-put-link): Check if the target
name is fully qualified -- use only the name part.
(soap-parse-complex-type, soap-parse-sequence): Recognize xsd:all
types, treated the same as xsd:sequence.  (Bug#8166)

Fix bug #8177 with re-visiting image files.

 files.el (find-file-noselect): Don't ask about re-visiting
 non-literally if the file is already visited in image-mode.

esh-util.el comment fix.

Default all eshell hooks to nil (bug#5375)

* eshell/esh-mode.el (eshell-kill-buffer-function): New function.
(eshell-mode): Use eshell-kill-buffer-function.
Run the -initialize functions independently of the -load-hooks.
* eshell/esh-proc.el (eshell-kill-process-function): New function.
(eshell-gather-process-output, eshell-sentinel)
(eshell-interrupt-process, eshell-kill-process, eshell-quit-process):
Use eshell-kill-process-function.
* eshell/em-alias.el (eshell-alias-load-hook):
* eshell/em-banner.el (eshell-banner-load-hook):
* eshell/em-cmpl.el (eshell-cmpl-load-hook):
* eshell/em-dirs.el (eshell-dirs-load-hook):
* eshell/em-glob.el (eshell-glob-load-hook):
* eshell/em-hist.el (eshell-hist-load-hook):
* eshell/em-pred.el (eshell-pred-load-hook):
* eshell/em-prompt.el (eshell-prompt-load-hook):
* eshell/em-rebind.el (eshell-rebind-load-hook):
* eshell/em-script.el (eshell-script-load-hook):
* eshell/em-smart.el (eshell-smart-load-hook):
* eshell/em-term.el (eshell-term-load-hook):
* eshell/em-unix.el (eshell-unix-load-hook):
* eshell/esh-arg.el (eshell-arg-load-hook):
* eshell/esh-cmd.el (eshell-cmd-load-hook):
* eshell/esh-ext.el (eshell-ext-load-hook):
* eshell/esh-io.el (eshell-io-load-hook):
* eshell/esh-mode.el (eshell-exit-hook):
* eshell/esh-proc.el (eshell-proc-load-hook, eshell-kill-hook):
* eshell/esh-var.el (eshell-var-load-hook):
Set default hook values to nil.  (Bug#5375)

esh-module doc fixes.

* lisp/eshell/esh-module.el (eshell-module-unload-hook)
(eshell-modules-list): Remove leading * from defcustom docs.

message.el (message-options): Don't mark it buffer-local when running under XEmacs.

Make eshell-for obsolete (replaced by dolist)

* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.

* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0.  (Bug#8170)

* progmodes/gud.el (gdb-script-mode): Derive from prog-mode.

message.el (message-options): Revert the change that's a workaround for XEmacs buffer-local issue.

outline.el fix for bug#7619.

It turns out the use of nil in the :type of outline regexp was for
very hysterical raisons.  Prior to 2001-09-12T20:42:08Z!rms@gnu.org, the
default value was nil, then it was initialized afterwards.
Everywhere in the code assumes it cannot be nil, so no need to allow
that any more.

* lisp/outline.el (outline-regexp): No longer allow nil.
(outline-heading-end-regexp): Add safety predicate.

browse-url fix for bug#6077.

* lisp/net/browse-url.el (browse-url): Handle deleted default-directory.

recentf.el fix for bug#5843.

* lisp/recentf.el (recentf-include-p): In case of a buggy predicate,
err on the side of including, not excluding.

* lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)

* calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
  variables as units.

Minor ewoc fix for bug#3261.

* lisp/emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error
if there is no node.

* lisp/erc/erc-track.el (erc-track-visibility): Fix :type.  (Bug#6369)

* lisp/time.el (display-time-world-list): Fix typo.

Fixes: debbugs:7571

ChangeLog fixes.

lisp/cus-edit.el (custom-buffer-create-internal): Fix bug#8136.
Split search string before passing it to `customize-apropos'.

lisp/image-dired.el (image-dired-cmd-read-exif-data-options): Fix typo.

Fixes: debbugs:8156

Fixing old typo.

* lisp/net/rcirc.el (rcirc-cmd-join): Accept comma-separated input.

Merge changes made in Gnus trunk.

nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with numbers too big to be `read'.
password-cache.el (password-in-cache-p): Add autoload.
message.el (message-options): Make buffer-local two ways to attempt to fix a XEmacs bug.

Merged an ERT fix and a speedup.

Added fast path to ERT explanation of `equal'.
* emacs-lisp/ert.el (ert--explain-equal): New function.
(ert--explain-equal-rec): Renamed from `ert--explain-not-equal'.
All callers changed.
(ert--explain-equal-including-properties): Renamed from
`ert--explain-not-equal-including-properties'.  All callers
changed.
* automated/ert-tests.el (ert-test-explain-not-equal-keymaps):
New test.

ediff-init.el fix for bug#1821. (tiny change)

Tiny change; note that author said he placed it in the public domain.
(If this wasn't a tiny change, we would still need paperwork.)

* lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
Move ediff-defvar-local calls after defcustoms.

Fix ERT bug related to quit handling.
* emacs-lisp/ert.el (ert--stats-set-test-and-result)
(ert-char-for-test-result, ert-string-for-test-result)
(ert-run-tests-batch, ert--print-test-for-ewoc):
Handle `ert-test-quit'.

Merge fix.

file-truename doc fix for bug#2341.

* lisp/files.el (file-truename): Doc fix.

* doc/lispref/files.texi (Truenames): Minor clarification.

Reduce some of the many, many variant spellings of NeXTstep.

http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00986.html

Info-gnustep.plist trivia.

* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
Refer to etc/NEXTSTEP rather than emacs-app.sf.net.

* lisp/vc/vc-rcs.el: Remove some ancient comments.

Anyone using rcs < 5.6.2 in 2011 probably has a functioning time
machine, so does not need hand-holding.

vc-dir fix for bug#7349.

* lisp/vc/vc-dir.el (vc-dir-mode-map):
Bind vc-dir-find-file to e, like in dired.

vc-svn fix for bug#7663 on MS Windows.  (tiny change)

* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
programs output backslashes.

* url.texi (Configuration): Update url-configuration-directory description.

url.texi doc fix for bug#6038.

* doc/misc/url.texi (Dealing with HTTP documents): Remove reference to
function url-decode-text-part; never seems to have existed in any version.

sendmail.el fix for bug#1776.

* lisp/mail/sendmail.el (mail-mode-map): Remove mail-sent-via.
(mail-mode): Remove mail-sent-via from the doc.
(mail-sent-via): Make it obsolete.

Fix typo in previous NEWS change.

* etc/NEWS: Mention emacsclient -q.

Add --quiet option for emacsclient (bug#663)  (tiny change)

* lib-src/emacsclient.c (longopts): Add quiet.
(decode_options): Handle q/quiet.
(print_help_and_exit): Add q/quiet.
(main): Suppress some messages if quiet option is used.

* doc/emacs/misc.texi (emacsclient Options): Add q/quiet.

grep.el fix for bug#8084.

* lisp/progmodes/grep.el (grep-highlight-matches): Doc fix.
(grep-process-setup): No highlighting without font-lock.

vc-bzr fix for bug#8025.

* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Handle dirstate entries with no parents.

* sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.

Comment fix.

Fix previous dired-x.el change.