* find-func.el (find-function-C-source-directory): Use file-accessible-directory-p

ps-samp.el: Make it slightly less awful

* lisp/ps-samp.el (ps-rmail-mode-hook, ps-gnus-article-prepare-hook)
(ps-vm-mode-hook, ps-gnus-summary-setup, ps-info-mode-hook):
Use [print] key.  Only set local values.
(ps-article-subject, ps-article-author): Use standard functions
like mail-fetch-field.
(ps-info-file, ps-info-node): Use match-string.
(ps-jts-ps-setup, ps-jack-setup): Remove, merging into...
(ps-samp-ps-setup): ... new function.

* lisp/progmodes/idlw-shell.el (idlwave-shell-make-temp-file): Optimize
away code unneeded on any modern Emacs.

Move lisp/emacs-lisp/authors.el to admin/
It is not useful for anything other than maintaining Emacs.

* etc/NEWS: Maybe ert-summarize-tests-batch-and-exit worth mentioning.

lib-src/Makefile trivial simplifications

* lib-src/Makefile.in (blessmail): Depend on lisp/mail/blessmail.el.
Use $<, $@.
(regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT})
(profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
(pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT}, ntlib.o)
(hexl${EXEEXT}, update-game-score${EXEEXT}, emacsclient.res): Use $<.
(ctags${EXEEXT}): Add $srcdir to dependency rather than using VPATH.

Disable byte-compilation in two test/automated files

* test/automated/eieio-tests.el (no-byte-compile): Set it.

* test/automated/ert-tests.el (no-byte-compile): Set it.

Fixes: debbugs:17851 debbugs:17852

Simplify and parallize test/automated Makefile

* Makefile.in (mostlyclean, clean): Maybe clean test/automated.

* lisp/emacs-lisp/ert.el (ert-summarize-tests-batch-and-exit): New.

* test/automated/Makefile.in: Simplify and parallelize.
(XARGS_LIMIT, BYTE_COMPILE_EXTRA_FLAGS)
(setwins, compile-targets, compile-main, compile-clean): Remove.
(GREP_OPTIONS): Unexport.
(.el.elc): Replace with pattern rule.
(%.elc, %.log): New pattern rules.
(ELFILES, LOGFILES): New variables.
(check): Depend on LOGFILES.  Call ert-summarize-tests-batch-and-exit.
(clean, mostlyclean): New rules.
(bootstrap-clean): Simplify.
(bootstrap-clean, distclean): Depend on clean.

* .bzrignore: Ignore test/automated/*.log.

Fixes: debbugs:15991

HideIfDef mode bug fixes and enhancements. This is #2 of 3 patches based
on the completed work posted on http://www.emacswiki.org/emacs/HideIfDef.

- Supporting argumented macro expansion.
- Stringification, tokenization and concatenation of strings and tokens.
- Add functions to find defines and parse argumented macros into a macro
  tree containing macro name, formal parameters and macro body.
- On macro evaluation, macros will be applied with actual parameters and
  then got expanded recursively.
- Apply review changes.

* lisp/progmodes/hideif.el (hif-string-to-number): Fix return value bug.
(hif-simple-token-only, hif-tokenize): Commentted in detail mainly for
performance enhancements.
(hif-parse-if-exp): Rename to `hif-parse-exp'. Enhanced for macro
expansion.
(hif-factor, hif-string-concatenation, intern-safe): Support string
concatenation and argumented macro expansion.
(hif-if-valid-identifier-p, hif-define-operator, hif-flatten)
(hif-expand-token-list, hif-get-argument-list, hif-define-macro)
(hif-delimit, hif-macro-supply-arguments, hif-invoke, hif-canonicalize)
(hif-canonicalize-tokens, hif-looking-at-elif, hif-place-macro-invocation)
(hif-parse-macro-arglist): Mostly new functions for supporting argumented
macro expansion.
(hif-string-concatenation, hif-stringify, hif-token-concat)
(hif-token-stringification, hif-token-concatenation): Stringify and
concatentation.
(hif-find-next-relevant): Fix comments
(hif-ifdef-to-endif, hif-looking-at-elif, hif-hide-line): Bug fix for
some cases involving #elif.
(hif-find-define, hif-add-new-defines): New functions for automatically
scanning of defined symbols.
(hide-ifdef-guts): Fix for auto defined symbol scanning.
(hide-ifdef-undef): Fix behavior to match CPP.

lisp/Makefile: Remove cc-*.el dependencies on non-cc files

* lisp/Makefile.in ($(lisp)/progmodes/cc-defs.elc)
($(lisp)/progmodes/cc-fonts.elc, $(lisp)/progmodes/cc-langs.elc)
($(lisp)/progmodes/cc-vars.elc): Drop hand-written deps on non-cc files.
They are not relevant to the original issue (bug#1004),
and cause unnecessary recompilation (bug#2151).

* flymake-tests.el (flymake-tests--current-face): Tweak previous sleep change.
Using the time-honored principle of "if it doesn't when you do X,
do it again and see what happens".

Try to fix some flymake-tests weirdness

* test/automated/flymake-tests.el (flymake-tests--current-face):
Sleep for longer.  Avoid querying.

* lisp/play/landmark.el: Use lexical-binding and avoid `intangible'.
(landmark--last-pos): New var.
(landmark--intangible-chars): New const.
(landmark--intangible): New function.
(landmark-mode, landmark-move): Use it.
(landmark-mode): Remove properties.
(landmark-plot-square, landmark-point-square, landmark-goto-xy)
(landmark-cross-qtuple):
Don't worry about `intangible' any more.
(landmark-click, landmark-point-y): Same; and don't assume point-min==1.
(landmark-init-display): Don't set `intangible' and `point-entered'.
(square): Remove.  Inline it instead.
(landmark--distance): Rename from `distance'.
(landmark-calc-distance-of-robot-from): Rename from
calc-distance-of-robot-from.
(landmark-calc-smell-internal): Rename from calc-smell-internal.

Fix ChangeLog entry.

Consistently use validate_subarray to verify substring.
* fns.c (validate_substring): Not static any more.  Adjust to
use ptrdiff_t, not EMACS_INT, becase string and vector limits
can't exceed ptrdiff_t even if EMACS_INT is wider.
* lisp.h (validate_subarray): Add prototype.
* coding.c (Fundecodable_char_position):
* composite.c (Fcomposition_get_gstring, Fcompose_string_internal):
Use validate_subarray.  Adjust comment to mention substring.

Do not allow out-of-range character position in Fcompare_strings.
* src/fns.c (validate_subarray): Add prototype.
(Fcompare_substring): Use validate_subarray to check ranges.
Adjust comment to mention that the semantics was changed.  Also see
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00447.html.
* lisp/files.el (dir-locals-find-file, file-relative-name):
* lisp/info.el (Info-complete-menu-item):
* lisp/minibuffer.el (completion-table-subvert): Prefer string-prefix-p
to compare-strings to avoid out-of-range errors.
* lisp/subr.el (string-prefix-p): Adjust to match strict range
checking in compare-strings.
* test/automated/fns-tests.el (fns-tests-compare-string): New test.

Auto-commit of loaddefs files.

nextstep: trivial Makefile simplification

* nextstep/Makefile.in (${ns_appbindir}): New.
(${ns_appbindir}/Emacs): Use order-only prereq to create output dir.

admin/grammars: Use pattern rules in Makefile

* admin/grammars/Makefile.in (${bovinedir}/c-by.el, ${bovinedir}/make-by.el):
(${wisentdir}/js-wy.el, ${wisentdir}/python-wy.el): Replace with pattern rules.
(${bovinedir}/scm-by.el, ${wisentdir}/javat-wy.el)
(${cedetdir}/srecode/srt-wy.el): Use $<.

admin/unidata: small Makefile simplifications

* admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc.
(.el.elc): Replace with pattern rule.
(%.elc): New.
(unidata.txt): Use $<.
(compile): Remove.
(${DSTDIR}/charprop.el): Use order-only prereqs rather than a sub-make.

* admin/unidata/uvs.el (uvs-print-table-ivd): Fix free variable typo.

ChangeLog fix

Make search in reftex-using-biblatex-p non-greedy.

* textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search
for comment lines non-greedy and stopping at newlines to fix stack
overflows with large files.

Be more consistent about the 'Qfoo' naming convention.

* image.c (Fimagemagick_types):
* lisp.h (lisp_h_CHECK_TYPE, CHECK_TYPE, CHECK_ARRAY):
* process.c (Fmake_network_process):
Rename C local identifier 'Qfoo to avoid giving the false
impression that it stands for the symbol 'foo'.

lisp/calculator.el (calculator-last-input): drop 'ascii-character property
lookup.
etc/NEWS: calculator.el user-visible changes.

* automated/tramp-tests.el (tramp-test26-process-file): Extend test
according to Bug#17815.

Merge from emacs-24; up to 2014-06-08T18:27:22Z!eggert@cs.ucla.edu

Backport Unicode 7 update of character- and script-related databases

* lisp/international/characters.el (char-script-table):
Update for scripts added and codepoint ranges changed in Unicode 7.0.

* lisp/international/fontset.el (script-representative-chars):
Add representative characters for scripts added in Unicode 7.0.
(otf-script-alist): Synchronize with the latest registry of OTF script tags.

Backport unicode 7.0 data files update from trunk

* admin/unidata/BidiMirroring.txt: Update to 7.0.0 (only comment changes).

* admin/unidata/UnicodeData.txt: Update to 7.0.0.

* admin/unidata/IVD_Sequences.txt: Update to 2014-05-16 version.

* align.el (align-adjust-col-for-rule): Unbreak due to defaulting
tab-stop-list to nil.

* indent.el (indent-next-tab-stop): Rename from indent--next-tab-stop.
(indent-rigidly-left-to-tab-stop)
(indent-rigidly-right-to-tab-stop, tab-to-tab-stop)
(move-to-tab-stop): Change callers.

Fixes: debbugs:16381

Optionally, undo several consequential deletion in one step.

* lisp/simple.el (kill-append): Remove undo boundary depending on ...
(kill-append-merge-undo): New user option.

* lisp/simple.el (handle-shift-selection, exchange-point-and-mark)
(activate-mark): Set transient-mark-mode buffer-locally.
(transient-mark-mode): Use&set the global value.
* lisp/mouse.el (mouse-set-region-1, mouse-drag-track): Idem.
* lisp/org/org-compat.el (activate-mark): Idem.
* lisp/emulation/edt.el (edt-emulation-off): Save&restore the global
transient-mark-mode setting.
* lisp/obsolete/pc-select.el (pc-selection-mode): Use the
transient-mark-mode function.

Fixes: debbugs:6316

Update various character- and script-related databases per Unicode 7.0.

 lisp/international/fontset.el (script-representative-chars): Add
 representative characters for scripts added in Unicode 7.0.
 (otf-script-alist): Synchronize with the latest registry of OTF
 script tags.
 lisp/international/characters.el (char-script-table): Update for
 scripts added and codepoint ranges changed in Unicode 7.0.

* doc/misc/dired-x.texi (Omitting Files in Dired, Omitting Variables): Fix
key binding to dired-omit-mode.

Fixes: debbugs:16354

Misc small doc/ Makefile cleanup

* emacs/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with pattern rule.
(${buildinfodir}): New rule.
($(buildinfodir)/emacs.info): Use order-only prereq for output dir.  Use $<.
(emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf): Use $<.
(%.ps): New rule.

* lispintro/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(${buildinfodir}): New rule.
(${buildinfodir}/eintr.info): Use order-only prereq for output dir.  Use $<.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
(emacs-lisp-intro.ps): New rule.

* lispref/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(html): Declare as PHONY.
(${buildinfodir}): New rule.
($(buildinfodir)/elisp.info): Use order-only prereq for output dir.  Use $<.
(elisp.dvi, elisp.html, elisp.pdf): Use $<.
(elisp.ps): New rule.

Disable implicit texi rules in doc/

* doc/emacs/Makefile.in (%.texi):
* doc/lispintro/Makefile.in (%.texi):
* doc/lispref/Makefile.in (%.texi):
* doc/misc/Makefile.in (%.texi):
Disable implicit rules.

* calculator.el (calculator-standard-displayer): Fix bug in use of
`calculator-groupize-number'.
(calculator-funcall): Fix broken `cl-flet' use by moving it into the
`eval' code, so it works in v24.3.1 too.
(calculator-last-input): Comment to clarify purpose.

Also add back a ChangeLog blurb for previous commit 2014-06-15T04:52:34Z!eli@barzilay.org.

Simplify and cleanup character conversion stuff.
* lisp.h (multibyte_char_to_unibyte, multibyte_char_to_unibyte_safe):
Remove prototypes.
* character.c (multibyte_char_to_unibyte)
(multibyte_char_to_unibyte_safe): Remove; no longer used.
* character.h (make_char): Remove; unused.
(CHAR_TO_BYTE8, CHAR_TO_BYTE_SAFE): Simplify.
(ASCII_BYTE_P): Remove; ASCII_CHAR_P does the same thing.
* buffer.c, charset.c, charset.h, cmds.c, coding.c, editfns.c:
* fileio.c, indent.c, insdel.c, keyboard.c, lread.c, print.c:
* search.c, term.c, xdisp.c, xterm.c: Related users changed.

"the the", "from from" and "and and".

* html2text.el (html2text-get-attr): Rewrite to handle spaces in quoted
attribute values.  (Bug#17834)

More tweaks of skeleton documentation wrt \n behavior at bol/eol.

 lisp/skeleton.el (skeleton-insert): Yet another fix of the doc string
 wrt behavior of \n as the first/last element of a skeleton.

 doc/misc/autotype.texi (Skeleton Language): Document the \n feature
 better.

* net/tramp-adb.el (tramp-adb-handle-process-file):
* net/tramp-sh.el (tramp-sh-handle-process-file):
* net/tramp-smb.el (tramp-smb-handle-process-file): Do not raise
the output buffer when DISPLAY is non-nil.

Fixes: debbugs:17815

* lisp/electric.el (electric-layout-post-self-insert-function):
* lisp/emacs-lisp/ert.el (ert--insert-infos):
* lisp/obsolete/vi.el (vi-set-mark):
* lisp/term.el (term-handle-scroll):
* lisp/textmodes/bibtex.el (bibtex-fill-field, bibtex-fill-entry):
* lisp/gnus/gnus-sum.el (gnus-summary-edit-article-done):
* lisp/org/org-mouse.el (org-mouse-do-remotely):
* lisp/wid-edit.el (widget-editable-list-value-create): Prefer
point-marker to copy-marker of point.
* lisp/ob-core.el (org-babel-insert-result): Prefer point-min-marker
and point-max-marker.

* xmenu.c (mouse_position_for_popup):
* xselect.c (mouse_position_for_drop): Do not duplicate ...
* xfns.c (x_relative_mouse_position): ... and prefer this function.
* menu.c (Fx_popup_menu):
* xselect.c (x_handle_dnd_message): Adjust users.
* menu.h (mouse_position_for_popup): Remove prototype.
* xterm.h (x_relative_mouse_position): Add prototype.
* xterm.c (x_find_topmost_parent): Break from the loop and do not
call XFree if XQueryTree returns zero.

Update admin/unidata data files to latest versions

* admin/unidata/BidiMirroring.txt: Update to 7.0.0 (only comment changes).

* admin/unidata/UnicodeData.txt: Update to 7.0.0.

* admin/unidata/IVD_Sequences.txt: Update to 2014-05-16 version.

* admin/unidata/README: Update for above changes.

* landmark.el: Commentary fixes.

Fix landmark, broken since Emacs 23.1

* play/landmark.el (landmark-move-down, landmark-move-up):
Fix 2007-10-20 change - preserve horizontal position.

ChangeLog fix (no need to merge to trunk)

Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca

doc/misc/autotype.texi (Skeleton Language): Fix last change.

Fix completion retrieval parsing.
* progmodes/python.el (python-mode):
(python-util-strip-string): New function.
(python-shell-completion-get-completions): Use it.

* automated/python-tests.el (python-util-strip-string-1): New test.

Fixes: debbugs:17209

lisp/skeleton.el (skeleton-insert): Fix last change.

src/dispextern.h: Fix commentary to it's hpos member.

Fix bug #17823 with vertical-motion in lines with line-prefix.

 src/indent.c (Fvertical_motion): Move to the goal column, if any,
 with a single call to move_it_in_display_line, not in two calls.
 Doing this with two calls causes move_it_in_display_line apply the
 line-prefix handling twice instead of just once.

Enhancements for outline integration.
* lisp/progmodes/python.el (python-mode): Properly set
outline-heading-end-regexp so that comments after colons for
defuns are supported.

Fixes: debbugs:17796

Improve documentation of how vertical-motion interprets columns.

 src/indent.c (Fvertical_motion): Doc fix.

 doc/lispref/positions.texi (Screen Lines): Clarify how columns are counted
 by vertical-motion.

Improve documentation of \n in a skeleton.

 doc/misc/autotype.texi (Skeleton Language): Document the feature of \n
 when at eol.

lisp/skeleton.el (skeleton-insert): Doc fix.

Port to OS X ACLs.

* fileio.c (Ffile_acl): Port to OS X, where acl_get_file (...,
ACL_TYPE_ACCESS) doesn't work.

Fixes: debbugs:17810

* lisp/emacs-lisp/smie.el (smie-config--guess): Fix typo.
(smie-config-guess): Use smie-config-local so the rules are obeyed.

Fixes: debbugs:17818

* configure.ac: Warn about --enable-link-time-optimization's issues

in --help message.

Fixes: debbugs:17806

* lisp/mouse.el (mouse-drag-line): Don't re-add to unread-comment-events,
since it's already done inside the loop (bug#17819).

In mouse-drag-line remove inadvertently reintroduced code (Bug#17819).

* mouse.el (mouse-drag-line): Re-remove code initially removed
on 2013-03-09 and inadvertently reintroduced on 2013-11-30
(Bug#17819).

Diagnose failures due to colons in directory names.

* Makefile.in (epaths-force): Don't allow ':' in directories whose
names go into a colon-separated path.
* configure.ac: Fail if submake fails.

Fixes: debbugs:17278

* lisp/progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't
align with the surrounding parent.

Fixes: debbugs:17721

Fix bug #17801 with extraneous newlines after inserting markup in Texinfo mode.

 lisp/textmodes/texinfo.el (texinfo-mode): Set skeleton-end-newline
 locally to nil.
 (texinfo-insert-block, texinfo-insert-@end)
 (texinfo-insert-@example, texinfo-insert-@quotation): Adjust to
 local setting of skeleton-end-newline by adding an explicit \n to
 the skeletons where appropriate.

Port to GCC 4.9.0 with link time optimization.

* configure.ac (CFLAGS): With link time optimization,
use -ffat-lto-objects if supported; otherwise Emacs won't
build with GCC 4.9.0.

Fixes: debbugs:17806

* lisp/emacs-lisp/smie.el (smie--hanging-eolp-function): New var.
(smie-indent--hanging-p): Use it.
* lisp/progmodes/sh-script.el (sh-set-shell): Set it.

Fixes: debbugs:17621

* simple.el (read-quoted-char): Don't let help chars pop up help
buffer.

Fixes: debbugs:16617

* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as
for |.

Fixes: debbugs:17621

* cedet/semantic/ia.el (semantic-ia-complete-symbol-menu): Use posn-at-point
instead of senator-completion-menu-point-as-event; un-comment, tho keep
the "no smart completion" fallback commented since it still doesn't work.

* lisp/progmodes/hideif.el (hif-string-to-number): Don't return float for
hex integer constants.

Fixes: debbugs:17807

Update comments in erc-format-@nick to reflect changes in last merge.

Merge commit for debbugs:17755

ERC: Better user mode support

Fixes: debbugs:17755

Minor cleanup of fonset code.
* fontset.c (FONTSET_ID, set_fontset_id, FONTSET_NAME)
(set_fontset_name, FONTSET_ASCII, set_fontset_ascii)
(FONTSET_BASE, set_fontset_base, FONTSET_FRAME)
(set_fontset_frame, FONTSET_NOFONT_FACE, set_fontset_nofont_face)
(FONTSET_DEFAULT, set_fontset_default, FONTSET_FALLBACK)
(set_fontset_fallback): Reorder extra slots and avoid unused slots.
(free_realized_fontset): Remove because a no-op since 2008.
(free_face_fontset): Adjust user.
(syms_of_fontset): Shrink fontset by one extra slot.

* lisp/international/mule-util.el (truncate-string-ellipsis): New var.
(truncate-string-to-width): Use it.

* etc/NEWS: New Tramp method "nc".

* lisp/emacs-lisp/lisp-mode.el (lisp-string-after-doc-keyword-p): New fun.
(lisp-string-in-doc-position-p): New function, extracted from
lisp-font-lock-syntactic-face-function.
(lisp-font-lock-syntactic-face-function): Use them.

Fixes: debbugs:9130

* net/rcirc.el (rcirc-omit-mode): Fix recenter error.

Fixes: debbugs:17769

* src/keyboard.c (read_key_sequence): Don't invoke Vprefix_help_command
before checking key-translation-map.

Fixes: debbugs:17659

* font.c (font_make_object): Avoid dangling pointer which may
crash GC (Bug#17771).

* lisp/xt-mouse.el (xterm-mouse-translate-1): Fix last change.
(xterm-mouse--read-event-sequence-1000): Drop unknown events instead of
burping.

Fixes: debbugs:17776

* lisp/play/bubbles.el (bubbles--initialize, bubbles--show-scores)
(bubbles--game-over): Don't add `intangible' properties since they
didn't work anyway.

src/image.c: Yet another fix for last commit.

Fixes: debbugs:17790

src/image.c: Another fix for last commit.

Fixes: debbugs:17790

src/image.c: Fix last commit.

Fixes: debbugs:17790

Fix bug #17790 with compilation against giflib 5.1.0 and later.

 src/image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the
 prototype of DGifCloseFile as appropriate for older and newer
 versions of giflib.
 (gif_close): New function, encapsulates the differences in the
 calling sequence of DGifCloseFile before v5.1.0 and after it.
 (gif_load): Call gif_close instead of DGifCloseFile.  Divulge the
 error string where appropriate.

 lisp/term/w32-win.el (dynamic-library-alist): Support giflib 5.1.0
 and later.

* lisp/vc/ediff-init.el (ediff-current-diff-Ancestor)
(ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B)
(ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
(ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
Add `min-colors 88' version with removed black/white foregrounds.

Fixes: debbugs:10181

* lisp/vc/diff-mode.el (diff-changed): Empty face definition
to use `diff-removed' and `diff-added' on tty as well.
(diff-context): Use darker color on light background and
lighter color on dark background.

Fixes: debbugs:10181

* lisp/vc/diff-mode.el (diff-refine-changed): Rename from
`diff-refine-change' for consistency with `diff-changed'.
(diff-refine-change): Add obsolete face alias.

* lisp/vc/smerge-mode.el (smerge-refined-changed): Rename from
`smerge-refined-change'.
(smerge-refined-change): Add obsolete face alias.

Fixes: debbugs:10181

* lisp/dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated to `soft'.

Fixes: debbugs:17554

* lisp/rect.el (rectangle-preview): New custom.
(rectangle): New group.
(rectangle--pos-cols): Add `window' argument.
(rectangle--string-preview-state, rectangle--string-preview-window):
New vars.
(rectangle--string-flush-preview, rectangle--string-erase-preview)
(rectangle--space-to, rectangle--string-preview): New functions.
(string-rectangle): Use them.
(rectangle--inhibit-region-highlight): New var.
(rectangle--highlight-for-redisplay): Obey it.  Make sure
`apply-on-region' uses the point-crutches of the right window.
Use :align-to rather than multiple spaces.

Omit redundant extern decls.

Most of this patch is from Dmitry Antipov, in:
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html
* configure.ac (WERROR_CFLAGS): Add -Wredundant-decls.
* lib-src/emacsclient.c (getenv): Remove decl.
* lib-src/make-docfile.c (write_globals): Add ATTRIBUTE_CONST for
Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity.
* lwlib/lwlib-Xm.c (lw_motif_widget_p, xm_update_one_value)
(xm_create_dialog, xm_destroy_instance, xm_popup_menu)
(xm_set_keyboard_focus, xm_set_main_areas): Remove decls.
* src/commands.h (update_mode_lines):
* src/frame.h (Qbackground_color, Qforeground_color)
(x_set_menu_bar_lines):
* src/ftfont.c (ftfont_font_format):
* src/intervals.h (Qkeymap, Qfont):
* src/keyboard.c (timer_check, safe_run_hooks, Qregion_extract_function):
* src/lisp.h (Ffboundp, Qnil, Qt, Qlambda, Qintegerp, Qwholenump)
(Qsymbolp, Qlisp, Qconsp, Qstringp, Qarrayp, Qbufferp, Qmarkerp)
(Qvectorp, Qbuffer_or_string_p, Qchar_table_p, Qvector_or_char_table_p)
(Qfloatp, Qnumberp, Qfont_spec, Qfont_entity, Qfont_object)
(Fbyteorder, wrong_type_argument, Fmax_char, syms_of_composite)
(Fidentity, extract_float, init_display, syms_of_display, Qdisplay):
(Qimage, Qbox, redisplay_preserve_echo_area, char_table_ref)
(char_table_set, char_table_translate, Qautoload, Qbottom, Qtop)
(Qvisible, Qfont, Qfront_sticky, Qrear_nonsticky, init_sigio)
(Qtool_bar, Qheader_line):
* src/macros.c (Fexecute_kbd_macro):
* src/xdisp.c (Ftool_bar_height, Ftool_bar_height):
* src/xterm.c (x_delete_terminal, XSetIMValues):
* src/xterm.h (x_set_window_size, x_query_color, x_get_focus_frame)
(x_implicitly_set_name, popup_activated)
(widget_store_internal_border):
Remove redundant decls.
* src/frame.c [USE_X_TOOLKIT]: Include widget.h.
* src/keyboard.c (Fexit_recursive_edit, Fabort_recursive_edit):
Remove _Noreturn, as make-docfile now does that for us.
* src/lisp.h (DEFUN): Don't declare fnname here; rely on make-docfile.
(Qregion_extract_function): New decl.
* src/window.c, src/xfns.c: Include menu.h.

* src/callint.c (Fcall_interactively): Fix up last change.

Fixes: debbugs:17701

* lisp.h (STRING_COPYIN): Remove; unused.
* ccl.c (Fccl_execute_on_string):
* font.c (fon_intern_prop): Use make_specified_string.

* lisp/delsel.el (electric-newline-and-maybe-indent): Mark it as well.

Fixes: debbugs:17737

* eval.c (toplevel): Remove redundant #include directives.
* xterm.c (x_initialize): Add static to match prototype.

* fileio.c (Fread_file_name): Do not pass redundant args and ...
* callint.c (read_file_name): ... convert to static here.
* lisp.h (Fread_file_name): Do not EXFUN it.
* composite.c (CHAR_COMPOSABLE_P): Replace unsafe macro with ...
(char_composable_p): ... static function.  All users changed.

* Makefile.in (ns-app): Fix typo that broke build on OS X.

Reported by David Caldwell in:
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00251.html

* notes/elpa: Use "git" instead of "bzr" in the name of machine to
clone the repository from.