* lisp/Makefile.in (autoloads): Do not use abs_lisp.

This should stop recent weirdness, eg:
http://lists.gnu.org/archive/html/emacs-diffs/2013-10/msg00381.html

* lisp/emacs-lisp/autoload.el: Comment.

* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads):
`newline' does not respect `standard-output', so use `princ'.

Otherwise you can get \n inserted in the wrong buffer, eg
http://lists.gnu.org/archive/html/emacs-diffs/2013-10/msg00379.html

htmlfontify.el: remove duplicate Version: header

Ensure unmarking in buffer menu clears 'S' marks.  (Bug#15761)
* buff-menu.el (Buffer-menu--unmark): New function.
  (Buffer-menu-unmark, Buffer-menu-backup-unmark): Use it.

hfy-cmap.el: Remove duplicate Package: header

* lisp/Makefile.in (AUTOGENEL): Add org/org-loaddefs.el.

Fix up previous admin/unidata clean rules

Revert auto-commit loaddefs weirdness

Fix weirdness caused by autoload generation...

Auto-commit of loaddefs files.

* doc/lispref/display.texi (Abstract Display): Improve indexing.

Simplify admin/unidata Makefile rules

* admin/unidata/unidata-gen.el (unidata-gen-files): Use pop.
Also take the output directory as an argument.

* admin/unidata/Makefile.in: Simplify now that unidata-gen-files takes
the output directory as an argument (no need to cd, etc).
(abs_srcdir, abs_builddir): Remove.
(abs_top_builddir): Replace by top_builddir.
(${DSTDIR}/charprop.el): No need to cd.  Pass dest as argument.
(${DSTDIR}/charprop.el, charprop.el):
No need to pass unidata.txt as argument.

* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/unidata, if present.

* admin/unidata/Makefile.in (bootstrap-clean): New rule.

* lisp/gnus/gnus-int.el (gnus-start-news-server): Silence compiler
obsolescence warning.

* lisp/gnus/gnus-group.el (gnus-group-browse-foreign-server): Silence compiler
obsolescence warning.

* lisp/cedet/semantic/grammar.el (semantic-grammar-mode-keywords-2)
(semantic-grammar-mode-keywords-3): Handle renamed font-lock vars.

* lisp/emacs-lisp/package.el (lm-homepage): Declare.

* lisp/eshell/em-ls.el (eshell-ls-directory, eshell-ls-symlink): Fix doc typos.

* lisp/vc/pcvs.el (cvs-status-cvstrees): Autoload to silence compiler.

etc/TODO small updates

* admin/unidata/unidata-gen.el (unidata--ensure-compiled): New function.
(unidata-gen-table-name, unidata-gen-table-decomposition)
(unidata-gen-files): Use unidata--ensure-compiled.

Add FSF copyright years based on when this file first appeared in
Emacs trunk.

* admin/unidata/Makefile.in (abs_srcdir): New, set by configure.
(${DSTDIR}/charprop.el, charprop.el): Update for srcdir not absolute.
(clean): Delete all .elc files.

lisp/Makefile.in trivia

* lisp/Makefile.in (finder-data, autoloads, update-subdirs)
(compile-main, compile-clean, compile-always, bootstrap-clean):
Check return value of cd.
(compile-calc): Remove.

Cleanup namespace of dos-w32.el.
* lisp/dos-w32.el (minibuffer-history-case-insensitive-variables)
(path-separator, null-device, buffer-file-coding-system)
(lpr-headers-switches): Check system-type before modifying them.
(find-buffer-file-type-coding-system): Mark obsolete.
(w32-find-file-not-found-set-buffer-file-coding-system): Rename from
find-file-not-found-set-buffer-file-coding-system.
(w32-untranslated-filesystem-list, w32-untranslated-canonical-name):
(w32-add-untranslated-filesystem, w32-remove-untranslated-filesystem)
(w32-direct-print-region-use-command-dot-com, w32-untranslated-file-p):
(w32-direct-print-region-helper, w32-direct-print-region-function)
(w32-direct-ps-print-region-function): Rename by adding a "w32-" prefix.
* lisp/startup.el (normal-top-level-add-subdirs-to-load-path):
* lisp/ps-print.el (ps-print-region-function):
* lisp/lpr.el (print-region-function): Use new name.

* lisp/simple.el (copy-region-as-kill): Fix call to region-extract-function.

* lisp/emacs-lisp/bytecomp.el (byte-defop-compiler): Add new `2-and' handler.
(byte-compile-and-folded): New function.
(=, <, >, <=, >=): Use it.

* lisp/subr.el (custom-declare-variable-early): Remove function.
(custom-declare-variable-list): Remove var.
(error, user-error): Remove `while' loop.
(read-quoted-char-radix, read-quoted-char): Move to simple.el.
(user-emacs-directory-warning, locate-user-emacs-file):
Move to files.el.
* lisp/simple.el (read-quoted-char-radix, read-quoted-char):
* lisp/files.el (user-emacs-directory-warning, locate-user-emacs-file):
Move from subr.el.
* lisp/custom.el (custom-declare-variable-list): Don't process
custom-declare-variable-list.

* lisp/progmodes/python.el (python-shell-get-buffer): New function.
(python-shell-get-process): Use it.
(python-shell-send-string): Always use utf-8 and add a cookie to tell
Python which encoding was used.  Don't split-string since we only care
about the first line.  Return the temp-file, if applicable.
(python-shell-send-region): Tell compile.el how to turn locations in
the temp-file into locations in the source buffer.

* src/keyboard.c (command_loop_1): If command is nil, call `undefined'.
* lisp/subr.el (undefined): Add missing behavior from the C code for
unbound keys.

* insdel.c: Fix minor problems found by static checking.

(Qregion_extract_function): Now static.
(prepare_to_modify_buffer_1): Remove unused locals.

Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding.  Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.

* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.

Prefer 'unsigned long' to 'long unsigned int' and 'unsigned long int'.
* ftxfont.c (ftxfont_get_gcs):
* gtkutil.c (xg_set_widget_bg, xg_set_background_color):
* xfaces.c (x_free_colors, x_free_dpy_colors)
(x_create_gc, unload_color):
* xselect.c (x_property_data_to_lisp):
* xsettings.c (parse_settings):
* xterm.c (x_copy_color, x_alloc_lighter_color, x_setup_relief_color)
(get_bits_and_offset): Adjust definition.
* frame.c (XParseGeometry): Adjust locals.
* lisp.h (toplevel): Adjust EMACS_UINT type definition.
* regex.h (toplevel): Likewise for reg_syntax_t.

* doc/lispref/display.texi (Selective Display): Discourage the use of explicit
selective display.

* lisp/emacs-lisp/package.el (package--download-one-archive)
(describe-package-1): Don't query the user about final newline.

* src/eval.c (run_hook_with_args): Use FUNCTIONP.
* test/indent/css-mode.css (.x2): Test alignement inside braces.
* test/indent/prolog.prolog: Test alignment of ->; with operator at bol.

* doc/lispref/display.texi (Abstract Display): Explain the meaning of Ewoc.

Fix a typo.

Use @code instead of @var for a normal variable.

* doc/lispref/display.texi (Button Buffer Commands): Use @code instead
  of @var for a normal variable.

lisp/gnus/nnimap.el: Search the netrc entries for the logical server name, then the actual

* doc/lispref/display.texi (Multi-Frame Images): Improve indexing.

Add an index for multi-frame images.

* doc/lispref/display.texi (Multi-Frame Images): Add an index for multi-frame images.

Use @code instead of @var for a normal variable, since @var should
indicate metasyntactic variables.

Add an index for image-size.

* doc/lispref/display.texi (Showing Images): Add an index for image-size.

Fix typo in ido-use-virtual-buffers.

* xterm.h (struct x_output): For 'black_relief' and 'white_relief'
fields, drop 'allocated_p' member and use -1 for uninitialized value.
* w32term.h (struct w32_output): Similarly but do not use -1 because...
* xfaces.c (unload_color) [HAVE_X_WINDOWS]: ...this function is a no-op
on MS-Windows anyway.
(free_face_colors): Define only if HAVE_X_WINDOWS and...
(free_realized_face): ...adjust user.
* xfns.c (Fx_create_frame, x_create_tip_frame): Initialize black and
white relief pixels to -1.
* xterm.c (x_setup_relief_color, x_free_frame_resources): Adjust users.
* w32term.c (w32_setup_relief_color, x_free_frame_resources): Likewise.
* dispextern.h (unload_color): Move prototype under HAVE_X_WINDOWS.

Tweak Tramp method definition syntax to allow overriding check for localhost-only methods

* dispextern.h, image.c (x_bitmap_height, x_bitmap_width): Now static.

* xfaces.c (load_pixmap): Omit last two args, which are always NULL
in practice now.  All callers changed.

* net/tramp-sh.el (tramp-sh-handle-copy-directory):
* net/tramp-smb.el (tramp-smb-handle-copy-directory):
Handle COPY-CONTENTS.  (Bug#15737)

* dispextern.h (struct face): Use bitfields for 'underline_type'
and 'box' members.  Remove set-but-unused members 'pixmap_w' and
'pixmap_h'.  If not HAVE_WINDOW_SYSTEM, also remove dummy
'stipple' member.  Move 'lface' member up to help...
* xfaces.c (make_realized_face): ...this function to find and
clear just the members that need clearing.
(load_face_colors, realize_x_face):
* xdisp.c (extend_face_to_end_of_line): Adjust user.

Auto-commit of generated files.

Document insecure elisp password caching is not usable with GnuPG 2.0.

* lisp/image.el (image-load-path): Doc fix.

* lisp/image.el (defimage): Doc fix.

Indent statements in macros following "##" correctly.
* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Modify
the "#" arm of a cond form to handle "#" and "##" operators.

* configure.ac: It seems installing in non-ASCII is not, in fact, ok.

Mark tiny change from author without assignment

Comment

Add an index for image maps.

Auto-commit of loaddefs files.

* xftfont.c (struct xftfont_info): Remove set-but-unused
'screen' member.
(xftfont_open): Adjust user.
(xftfont_get_colors): Remove useless prototype.

Add an index for edge-detection algorithms.

* doc/lispref/display.texi (Image Descriptors): Add an index for edge-detection algorithms.

* lisp/linum.el (linum-update-window): Fix boundary test.

Fixes: debbugs:13446

* lisp/progmodes/ruby-mode.el (ruby-smie--bosp): Anything that goes
after `=' is probably a new expression.

Add menu for M-x man

* lisp/man.el (man-imenu-title): New option.
(Man-mode-map): Add menu.
(Man-mode): Add imenu to menu.

Fixes: debbugs:15722

Fix part of bug #15260 with from directory with a non-ASCII name.

 src/emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments
 before passing them to 'unexec'.

Doc fix for set-fringe-bitmap-face.

* src/fringe.c (set_fringe_bitmap_face): Add usage note from lispref.

Add an index for customizing fringe bitmaps.

* doc/lispref/display.texi (Fringe Indicators): Add indexes for fringe indicators.

Comment

* test/indent/ruby.rb: New failing example.

* lisp/progmodes/ruby-mode.el (ruby-smie--args-separator-p): Be more
specific in what the first arg can be: a non-keyword word,
string/regexp/percent literal opener, opening paren, or unary
operator followed directly by word.

* test/automated/ruby-mode-tests.el (ruby-toggle-block-to-brace): Fix
the test, in respect to adding the space after the curly.

* lisp/progmodes/prolog.el: Remove old indent; use post-self-insert-hook.
(prolog-align-comments-flag, prolog-indent-mline-comments-flag)
(prolog-object-end-to-0-flag, prolog-electric-newline-flag)
(prolog-electric-tab-flag, prolog-use-prolog-tokenizer-flag):
Remove vars, they do not apply any more.
(prolog-mode-abbrev-table): Remove redundant declaration.
(prolog-upper-case-string, prolog-lower-case-string): Remove.
(prolog-use-smie): Remove.
(prolog-smie-rules): Add indentation rule for the if-then-else layout
supported by prolog-electric-if-then-else-flag.
(prolog-mode-variables, prolog-menu): Use setq-local.
(prolog-mode-keybindings-edit): Don't rebind M-C-p and M-C-n.
Remove binding to `Backspace' since this key doesn't exist anyway.
Remove bindings for electric self-inserting keys.
(prog-mode): Assume it's defined.
(prolog-post-self-insert): New function.
(prolog-mode): Use it.
(prolog-indent-line, prolog-indent-level)
(prolog-find-indent-of-matching-paren)
(prolog-indentation-level-of-line, prolog-goto-comment-column)
(prolog-paren-is-the-first-on-line-p, prolog-region-paren-balance)
(prolog-goto-next-paren, prolog-in-string-or-comment)
(prolog-tokenize, prolog-inside-mline-comment)
(prolog-find-start-of-mline-comment): Remove functions.
(prolog-find-unmatched-paren, prolog-clause-end)
(prolog-guess-fill-prefix, prolog-get-predspec): Use syntax-ppss.
(prolog-electric--if-then-else): Rename from
prolog-insert-spaces-after-paren; use prolog-electric-if-then-else-flag.
(prolog-tokenize-searchkey): Remove const.
(prolog-clause-info): Use forward-sexp.
(prolog-forward-list, prolog-backward-list, prolog-electric-delete)
(prolog-electric-if-then-else): Remove commands.
(prolog-electric--colon): Rename from prolog-electric-colon; adapt it
for use in post-self-insert-hook.
(prolog-electric--dash): Rename from prolog-electric-dash; adapt it
for use in post-self-insert-hook.
(prolog-electric--dot): Rename from prolog-electric-dot; adapt it
for use in post-self-insert-hook.
(prolog-electric--underscore): Rename from prolog-electric--underscore;
adapt it for use in post-self-insert-hook.

Improve indexing.

Continuation of previous change.

* doc/lispref/display.texi (Low-Level Font): Improve indexing.

* doc/lispref/nonascii.texi (Character Properties): Add an index for
  script symbols.

* emacs-lisp/ert.el (ert-run-tests-interactively):
Use `completing-read'.  (Bug#9756)

* doc/lispref/display.texi (Fontsets): Minor wording fix.

Auto-commit of generated files.

Another fix for the MS-Windows build broken 4 revisions ago.

 src/w32uniscribe.c (uniscribe_close): Adjust the argument list to
 the changed signature of the font driver's 'close' method.

Fix bug #15712 with vertical motion when the goal column needs to hscroll.

 lisp/simple.el (line-move): Call line-move-1 instead of
 line-move-visual when the current window hscroll is zero, but
 temporary-goal-column indicates we will need to hscroll as result
 of the movement.

Fix the MS-Windows build broken 2013-10-25T04:35:56Z!dgutov@yandex.ru.

 src/w32font.h (w32font_close): Adjust the prototype to the change in
 function definition.
 src/w32font.c (w32font_close): Reintroduce deleted declaration of i.
 src/w32uniscribe.c (uniscribe_close): Adapt the call to
 w32font_close to its new prototype.

Perform font-specific cleanup when font object is swept by GC.  See
http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00740.html.
* alloc.c (cleanup_vector): New function.
(sweep_vector): Call it for each reclaimed vector object.
* font.h (struct font): Adjust comment.

Omit unused frame argument of font API's close function.
* font.h (struct font): Drop frame argument.  Adjust comment.
* font.c (font_clear_cache, font_close_object): Adjust users.
* ftfont.c (ftfont_close):
* ftxfont.c (ftxfont_close):
* macfont.m (macfont_close):
* nsfont.m (nsfont_close):
* w32font.c (w32font_close):
* xfont.c (xfont_close):
* xftfont.c (xftfont_close): Adjust driver-specific close
functions, tweak comments and make functions safe if called
more than once for the same font object.

* lisp/progmodes/ruby-mode.el (ruby-mode-menu): Use proper
capitalization.  Use :visible instead of :active.  Fix
`ruby-indent-exp' reference.  Add menu items for the generic
commands that are used with SMIE.
(ruby-do-end-to-brace): Insert space after `{'.

* lisp/progmodes/ruby-mode.el (ruby-mode-menu): Add a menu

Fixes: debbugs:15600

* lisp/progmodes/inf-lisp.el (inferior-lisp-menu): Add menu.

Fixes: debbugs:15599

* lisp/vc/vc.el (vc-print-log): Don't use a working revision unless
one was explicitly specified.

Fixes: debbugs:15322

* configure.ac: It seems _installing_ in non-ASCII is ok, not building.

* lisp/subr.el (add-to-list): Preserve return value in compiler-macro.

Fixes: debbugs:15692

Small fix to last change

* progmodes/octave.el (octave-lookfor): Handle empty lookfor
result.  Ask user to retry using '-all' flag.

Fixes: debbugs:15701

Avoid non-portable "` ... \"...\" ... `" nesting

* configure.ac:
* Makefile.in (install-arch-indep, install-etcdoc, install-info):
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
* nt/Makefile.in ($(DESTDIR)${archlibdir}):
Avoid non-portable "`\" nesting.

* lisp/emacs-lisp/smie.el: New smie-config system.
(smie-config): New defcustom.
(smie-edebug, smie-config-show-indent, smie-config-set-indent)
(smie-config-guess, smie-config-save): New commands.
(smie-config--mode-local, smie-config--buffer-local)
(smie-config--trace, smie-config--modefuns): New vars.
(smie-config--advice, smie-config--mode-hook)
(smie-config--setter, smie-config-local, smie-config--get-trace)
(smie-config--guess-value, smie-config--guess): New functions.
(smie-indent-forward-token, smie-indent-backward-token): Don't copy
text properties.  Treat "string fence" syntax like string syntax.

* lisp/progmodes/sh-script.el (sh-use-smie): Change default.
(sh-smie-sh-rules, sh-smie-rc-rules): Obey legacy sh-indent-* vars.
(sh-var-value): Simplify by CSE.
(sh-show-indent, sh-set-indent, sh-learn-line-indent)
(sh-learn-buffer-indent): Redirect to their SMIE equivalent when SMIE
is used.
(sh-guess-basic-offset): Use cl-incf.
(sh-guess-basic-offset): Use push+nreverse to avoid O(n^2).

* lisp/emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste.

Fixes: debbugs:15699

* lisp/Makefile.in (abs_top_srcdir): Remove.
(update-subdirs): Use relative path to update-subdirs.

Fix last changes to support whitespace in directory names.

 lisp/Makefile.in ($(MH_E_DIR)/mh-loaddefs.el)
 ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
 ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): Call
 unmsys--file-name before expand-file-name, not after it.

Improve indexing.

* doc/lispref/display.texi (Low-Level Font): Add an index for font registry.

* doc/lispref/display.texi (Font Selection): Add indexes for font selection.

* doc/lispref/display.texi (Face Remapping): Add indexes for face remapping.

Auto-commit of generated files.