* lisp/frame.el (handle-focus-in, handle-focus-out): Move from frame.c.
Remove blink-cursor code.
(blink-cursor-timer-function, blink-cursor-suspend): Don't special-case GUIs.
(blink-cursor-mode): Use focus-in/out-hook.
* src/frame.c (Fhandle_focus_in, Fhandle_focus_out): Move to frame.el.
(syms_of_frame): Don't defsubr them.

Further tweaks to the setting of Vload_path
This is giving me a headache...

* src/lread.c (load_path_default): Change the sense of the argument.
(init_lread): When EMACSLOADPATH is set, do not ignore changes
from dump_path.  When it is not, avoid checking dump_path twice.

* lisp/vc/vc-git.el (vc-git-annotate-extract-revision-at-line): Make it
work when annotation is invisible.

Fixes: debbugs:13886

Makefile.in comment.

* src/lread.c (init_lread): Fix 2013-11-23 goof that was checking
uninstalled dump_path against installed Vload_path.

Fixes: debbugs:15964

Fixup two last lisp/ChangeLog entries

* lisp/json.el (json-alist-p): Only return non-nil if the alist has
simple keys.

Fixes: debbugs:13518

* lisp/progmodes/js.el (js--ctrl-statement-indentation): Fix indent
when control-statement is the first statement in a buffer.

Fixes: debbugs:15956

* lisp/imenu.el (imenu-generic-skip-comments-and-strings):
New option.
(imenu--generic-function): Use it.

Fixes: debbugs:15560

Export get_pos_property to Elisp.
* src/editfns.c (Fget_pos_property): Rename from get_pos_property.
(syms_of_editfns): Export it to Elisp.

* src/data.c (Fmake_variable_buffer_local): Mention `permanent-local'.

Scroll correct window when showing completion options.

* minibuffer.el (completion--in-region-1): Scroll the correct
window. (Bug#13898)

* lisp/emacs-lisp/helpers.el: Add some string helpers.

(string-trim-left): Removes leading whitespace.
(string-trim-right): Removes trailing whitespace.
(string-trim): Removes leading and trailing whitespace.

* lisp/subr.el (string-suffix-p): New function.

Stop some python tests leaving temp-files behind

* test/automated/python-tests.el (python-shell-make-comint-1)
(python-shell-make-comint-2, python-shell-get-process-1):
Suppress creation of some temp-files.

Use skip-unless in some python tests

* test/automated/python-tests.el (python-shell-parse-command-1)
(python-shell-make-comint-1, python-shell-make-comint-2)
(python-shell-get-process-1)
(python-shell-internal-get-or-create-process-1):
Skip rather than fail if prereqs not found.

* python.el (python-shell-send-file): Add option to delete file when done.
(python-shell-send-string, python-shell-send-region): Use it.

Fixes: debbugs:15647

Documentation for focus-in,out hooks (tiny change)

* doc/lispref/frames.texi (Input Focus):
* doc/lispref/hooks.texi (Standard Hooks):
Mention focus-in-hook, focus-out-hook.

* etc/NEWS: Copyedit.

Tweak previous change.

* etc/TODO: Minor update.

Really initialize `write_region_inhibit_fsync' when interactive.

* fileio.c (init_fileio): Move `write_region_inhibit_fsync'
initialization here ...
(syms_of_fileio): ... from here.

Revert previous python.el change

* src/lread.c (init_lread): Fix int/Lisp_Object mixup.
Please use --enable-check-lisp-object-type.

* lisp/progmodes/python.el (python-shell--save-temp-file): Tiny change
Delete temp-file when done.

Fixes: debbugs:15647

* src/process.c (get_process): Explicit error for dead buffers
That seems more in keeping with the existing behavior of this function
in other situations.

* vc/diff-mode.el (diff-mode): Tiny change re diff-default-read-only
Only allow diff-default-read-only to set buffer-read-only to t, never to nil.

Fixes: debbugs:15938

* textmodes/tex-mode.el (latex-noindent-environments): Add safe-local-variable
property.

Fixes: debbugs:15936

Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

* etc/enriched.txt: Rename from enriched.doc.
Misc small updates for this hardly being "new" any more.

* lisp/textmodes/enriched.el (enriched-mode): Doc fix.

* lisp/emacs-lisp/authors.el (authors-renamed-files-alist):
Add enriched.doc -> enriched.txt.

Fixes: debbugs:15947

Empty elements in EMACSLOADPATH now stand for the default

* src/lread.c (load_path_check): Take path to check as argument.
(load_path_default): New, split from init_lread.
(init_lread): Move calc of default load-path to load_path_default.
Empty elements in EMACSLOADPATH now stand for the default.
(load-path): Doc fix.

* src/emacs.c (decode_env_path): Add option to treat empty elements
as nil rather than ".".

* src/callproc.c (init_callproc_1, init_callproc):
* src/image.c (Vx_bitmap_file_path):
* src/lisp.h (decode_env_path):
* lread.c (Vsource_directory):
Update for new argument spec of decode_env_path.

* leim/Makefile.in (RUN_EMACS): Empty EMACSLOADPATH rather than unsetting.

* lisp/Makefile.in (emacs): Empty EMACSLOADPATH rather than unsetting.

* test/automated/Makefile.in (emacs):
Empty EMACSLOADPATH rather than unsetting.

* doc/emacs/cmdargs.texi (General Variables):
Empty elements in EMACSLOADPATH now mean the default load-path.

* doc/lispref/loading.texi (Library Search):
Empty elements in EMACSLOADPATH now mean the default load-path.

* etc/NEWS: Mention this.

Fixes: debbugs:12100

ChangeLog fix (Gnus's lpath.el is not in Emacs)

Fix bug #15951 with vertical-motion near beginning of narrowed region.

 src/bidi.c (bidi_find_paragraph_start): Limit the returned positions
 to BEGV_BYTE..ZV_BYTE range.

* progmodes/octave.el (inferior-octave-startup): Spit out error
message.

* progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template),
(ruby-encoding-magic-comment-style): Add :version.

* lisp/progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template):
Improve docstring.

Add missing ChangeLog entries

Add missing ChangeLog entry

* progmodes/octave.el (octave-kill-process): Don't ask twice

Fixes: debbugs:10564

* progmodes/octave.el (octave-help-mode): Adapt to change to
help-mode-finish to use derived-mode-p on 2013-09-17.
(inferior-octave-prompt): Also match octave-gui.

* automated/ruby-mode-tests.el (ruby-exit!-font-lock): Set expected-result.

* doc/lispref/loading.texi (Library Search): Minor clarification.

* progmodes/octave.el (octave-operator-regexp): Exclude newline.

Fixes: debbugs:15076

* progmodes/octave.el (inferior-octave-process-live-p): New helper.
(inferior-octave-startup, inferior-octave-check-process)
(inferior-octave-track-window-width-change)
(octave-completion-at-point, octave-eldoc-function): Use it.
(octave-kill-process): Provide confirmation.

Fixes: debbugs:10564

lisp/gnus/gnus-icalendar.el: Fix org-timestamp for events ending at midnight; RSVP handling

lisp/gnus/nndoc.el (nndoc-type-alist, nndoc-debbugs-db-type-p): Support debbugs .log files

Correct an utdated reference to M-g in enriched.doc.

* progmodes/octave.el (octave-mode, inferior-octave-mode): Fix
obsolete variable comment-use-global-state.

Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.

This simplifies the previous change to configure.ac and src/Makefile.in.

* progmodes/octave.el (octave-mode-map, octave-mode-menu): Add
`octave-source-file'.
(octave-source-file): New function.

Fixes: debbugs:15935

net/eww.el: Detect localhost and similar patterns.

* pcmpl-x.el (pcmpl-x-ag-options): Handle `[no]' in long options.

Add completion for command `ag'.
* pcmpl-x.el (pcomplete/ag, pcmpl-x-ag-options): New functions.
(pcmpl-x-ag-options): New variable.

Fix some dependency problems that cause unnecessary recompiles.

Problem reported by RMS in
<http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00421.html>.
* configure.ac (OLDXMENU_TARGET, OLDXMENU, LIBXMENU, OLDXMENU_DEPS):
Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New vars.
* src/Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
(really-lwlib, really-oldXMenu, stamp-oldxmenu)
(../src/$(OLDXMENU), $(OLDXMENU)): Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New macros.
(LIBXMENU): Use them.
(temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
(boostrap-clean): No need to remove stamp-oldxmenu.

Fix recently introduced bool vector overrun.

This was due to an optimization that went awry.
Reported by Glenn Morris in
<http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00622.html>.
* alloc.c (make_uninit_bool_vector): Don't allocate a dummy word
for empty vectors, undoing the 2013-11-18 change.
* data.c (bool_vector_binop_driver): Rely on this.
Fix bug that occasionally overran the destination.
* lisp.h (struct Lisp_Bool_vector): Document this.

* lisp/emacs-lisp/byte-run.el (eval-when-compile): Fix edebug spec.
(make-obsolete): Remove interactive spec.

Fixes: debbugs:14646

* test/automated/Makefile.in: Tweak previous change

* test/automated/Makefile.in (XARGS_LIMIT): New, set by configure.
(compile-main): Pass XARGS_LIMIT to xargs.

(Cargo-culted from lisp/Makefile.in.)

Use path-separator with -L, rather than just :

* lisp/startup.el (command-line-1): Use path-separator with -L.

* test/automated/Makefile.in (PATH_SEPARATOR): New, set by configure.
(EMACSOPT): Use PATH_SEPARATOR.

* doc/emacs/cmdargs.texi (Action Arguments): Use path-separator with -L.

* etc/NEWS: Related edit.

* emacs-lisp/package.el (describe-package-1): Add package archive.

* nsterm.m (init, run, stop:): Enable again. stop calls super stop
to handle dialogs.

* nsterm.m (init, run, stop:): Comment out for now, does not work with dialogs.

* test/automated/ruby-mode-tests.el:

Add a few tests for `ruby--insert-coding-comment'.

* test/automated/ruby-mode-tests.el:

Add a failing test for bug #15874.

* lisp/progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template):

Change default to "# encoding: %s" to differentiate it from the
default Ruby encoding comment template.

* doc/misc/ses.texi (Quick Tutorial): New chapter.
(The Basics, Formulas): Copyedits.
(Resizing, Printer functions): Add index entries.

Fixes: debbugs:14748

* lisp/ses.el (ses-mode): Doc fix.

Fixes: debbugs:14748

lisp/gnus/message.el (message-beginning-of-line): Use beginning-of-visual-line when visual-line-mode is turned on

Remove a FIXME.

* doc/lispref/windows.texi (Choosing Window): Mention `no-display-ok'.

* etc/NEWS: Mention new display action alist entry `no-display-ok'.
(Bug#13594)

* lisp/window.el (display-buffer-alist): Doc fix.  (Bug#13594)

* make-dist: Distribute build-aux/msys-to-w32.

* Makefile.in (msys_to_w32, msys_lisppath_to_w32): Remove.
(msys_w32prefix_subst): Rename from msys_prefix_subst.
Operate on w32prefixpattern.
(epaths-force-w32): Use build-aux/msys-to-w32.

* build-aux/msys-to-w32: New file.

* vc/vc-git.el (vc-git-dir-extra-headers): Add headers
when rebase or bisect are in progress.

Doc fixes.

* lisp/filenotify.el (file-notify-add-watch): Refine doc string.

* doc/lispref/os.texi (File Notifications): Add an index.

* doc/lispref/loading.texi (Loading): Add an cross-reference.

* obsolete/rcompile.el: Mark obsolete.

* charset.c (syms_of_charset): Don't read past end of string.

* window.el (display-buffer-alist, display-buffer): Document the
new parameter no-display-ok.

* progmodes/compile.el (compilation-start)
(compilation-goto-locus, compilation-find-file): Pass
no-display-ok and handle nil value from display-buffer.

Fixes: debbugs:13594

* src/frame.c (Fhandle_focus_in, Fhandle_focus_out): Doc fixes.

* etc/NEWS: Placeholder.

Add hooks to run on gaining/losing focus (tiny change)

* src/frame.c (Qfocus_in_hook, Qfocus_out_hook): New static lisp objects.
(Fhandle_focus_in, Fhandle_focus_out): Run focus hooks.
(syms_of_frame): Add focus-in-hook, focus-out-hook.

Fixes: debbugs:15029

Fixes: debbugs:15923
* process.c (get_process): Check that OBJ is a live buffer.

Add some indexes and a cross-reference.

* doc/lispref/os.texi (Session Management, Desktop Notifications): Add
some indexes and a cross-reference.

* data.c (bool_vector_binop_driver): Rename locals for sanity's sake.

The old names predated the API change that put destination at end.

Improve API of recently-added bool vector functions.

The old API had (bool-vector-count-matches A B)
and (bool-vector-count-matches-at A B I), which gave the
misleading impression that the two functions were variants, one
with a location I.  The new API has (bool-vector-count-population A)
and (bool-vector-count-consecutive A B I) to make the distinction
clearer.  The first function no longer has a B argument, since the
caller can easily determine the number of nils if the length and
number of ts is known.
* src/data.c (Fbool_vector_count_population): Rename from
bool_vector_count_matches, and accept just 1 argument.
(Fbool_vector_count_consecutive): Rename from
Fbool_vector_count_matches_at.
* test/automated/data-tests.el: Adjust to API changes.

Fixes: debbugs:15912

Always allocate at least one bits_word per bool vector.

See Daniel Colascione in:
http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00518.html
* alloc.c (make_uninit_bool_vector): Always allocate at least one word.
* data.c (bool_vector_binop_driver): Rely on this.  Tune.
* lisp.h (struct Lisp_Bool_vector): Document this.

Fix bug #15841 with assertion violations due to newline cache.

 src/insdel.c (invalidate_buffer_caches): New function, consolidated
 from part of prepare_to_modify_buffer.
 (insert_from_gap, prepare_to_modify_buffer):
 src/coding.c (code_convert_region, code_convert_string): Call
 invalidate_buffer_caches.
 src/lisp.h (invalidate_buffer_caches): Add prototype.

* NEWS: Mention new features for Octave mode.

* lisp/electric.el (electric-indent-mode-map): Remove.
(electric-indent-mode): Change the global-map instead.

Fixes: debbugs:15915

* lisp/textmodes/text-mode.el (paragraph-indent-minor-mode): Use add-function.

* lisp/emacs-lisp/nadvice.el (remove-function): Align with
add-function's behavior.

* lisp/progmodes/gdb-mi.el: Avoid backtracking in regexp matcher.
(gdb--string-regexp): New constant.
(gdb-tooltip-print, gdb-var-evaluate-expression-handler)
(gdbmi-bnf-stream-record, gdb-jsonify-buffer): Use it.
(gdb-source-file-regexp, gdb-prompt-name-regexp): Use it and change
submatch 1.
(gdb-get-source-file-list, gdb-get-prompt, gdb-get-source-file):
Adjust use accordingly.
(gdb-breakpoints-list-handler-custom): Pre-build the y/n string.

Minor doc fixes.

* doc/lispref/os.texi (Time Parsing):
(Processor Run Time, Input Modes, Terminal Output): Minor fixes.

* lisp/progmodes/ruby-mode.el (ruby-toggle-block): Don't stop at
interpolation curlies.

Fixes: debbugs:15914

Fix bug #15913 with disappearing mouse highlight on MS-Windows.

 src/w32term.c (x_update_window_end): Don't invalidate the entire
 mouse-highlight info, just signal frame_up_to_date_hook that mouse
 highlight needs to be redisplayed.

* etc/TODO: Addition.

Spelling fixes.

* lisp/org/ob-python.el (org-babel-python-with-earmuffs):
Rename from org-babel-python-with-earmufs.  All uses changed.
(org-babel-python-without-earmuffs):
Rename from org-babel-python-without-earmufs.  All uses changed.

* calc/calc.el (calc-context-sensitive-enter): New variable.
  (calc-enter): Use `calc-context-sensitive-enter'.

* doc/misc/calc.texi (Customizing Calc): Mention the new variable
  `calc-context-sensitive-enter'.

* configure.ac (DEBUGGER_SEES_C_MACROS): Remove.

* src/lisp.h (DEBUGGER_SEES_C_MACROS): Likewise.
It apparently doesn't work for GCC 3, and I suppose it's more
trouble than it's worth to worry about this.

Add CFEngine 3 ElDoc, completion, and compilation glue to cf-promises.

* progmodes/cfengine.el: Version bump.
(cfengine-cf-promises): New defcustom to locate cf-promises.
(cfengine3-vartypes): Add new "data" type.
(cfengine3--current-word): New function to get current name-like
word or its bounds.
(cfengine3--current-function): New function to look up a CFEngine
function's definition.
(cfengine3-format-function-docstring): New function.
(cfengine3-make-syntax-cache): New function.
(cfengine3-documentation-function): New function: ElDoc glue.
(cfengine3-completion-function): New function: completion glue.
(cfengine3-mode): Set `compile-command',
`eldoc-documentation-function', and add to
`completion-at-point-functions'.

Fix ChangeLog in last commit.

* semantic/fw.el (semantic-exit-on-input)
(semantic-throw-on-input): Restore point before
accept-process-output because timers which redisplay can run.
(Bug#15045)