Merge from trunk.

* textmodes/reftex.el (reftex-compile-variables): Add autoload
cookie.

* textmodes/reftex-vars.el (reftex-label-regexps): Call
`reftex-compile-variables' after changes to this variable.

* lisp/jit-lock.el: Fix signals in jit-lock-force-redisplay.
Use lexical-binding.
(jit-lock-force-redisplay): Use markers, check buffer's continued
existence and beware narrowed buffers.
(jit-lock-fontify-now): Adjust call accordingly.

* lisp/minibuffer.el (minibuffer-completion-contents): Fix obsolescence info
to avoid misleading the user.

emacs-lisp-intro.texi fixes.

* doc/lispintro/emacs-lisp-intro.texi (Complications, defvar): Refine the doc about Lisp macros. (http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00618.html)

* info-look.el: Prefer latex2e.info.

Fixes: debbugs:14240

* net/tramp-compat.el (tramp-compat-call-process): Move function ...
* net/tramp.el (tramp-call-process): ... here
(tramp-set-completion-function, tramp-parse-putty):
* net/tramp-adb.el (tramp-adb-execute-adb-command):
* net/tramp-gvfs.el (tramp-gvfs-send-command):
* net/tramp-sh.el (tramp-sh-handle-set-file-times)
(tramp-set-file-uid-gid, tramp-sh-handle-write-region)
(tramp-call-local-coding-command): Use `tramp-call-process'
instead of `tramp-compat-call-process'.

* net/tramp-sh.el (tramp-perl-pack, tramp-perl-unpack): New defconst.
(tramp-local-coding-commands, tramp-remote-coding-commands): Use them.
(tramp-sh-handle-file-local-copy, tramp-sh-handle-write-region):
(tramp-find-inline-compress):Improve traces.
(tramp-maybe-send-script): Check for Perl binary.
(tramp-get-inline-coding): Do not redirect STDOUT for local decoding.

* Makefile.in (bootstrap-clean): Remove stamp-h1 too.

Without this fix, "make distclean" leaves stamp-h1 behind.

* make-dist: Do not distribute admin/unidata/Makefile.

It is generated by 'configure'.

* build-aux/update-subdirs: Don't leave subdirs.el~ behind.

It messes up 'make distclean', and contains no useful information
because it's a copy of subdirs.el.

epg.el: support pinentry mode added in GnuPG 2.1

* epg.el (epg-context-pinentry-mode): New function.
(epg-context-set-pinentry-mode): New function.
(epg--start): Pass --pinentry-mode option to gpg command.

ChangeLog fix

Fix problem with linking runemacs reported by Dani Moncayo.

* emacs-lisp-intro.texi (defcustom, defun, simplified-beginning-of-buffer, defvar, Building Robots, Review, save-excursion): `defun' and `defcustom' are now macros rather than special forms. (Bug#13853)

* doc/lispref/internals.texi (Writing Emacs Primitives): Remove unnecessary references to the sources. (Bug#13800)

searching.texi (Regexp Backslash): Doc fix for backslash constructs in regular expressions.

comint.el: (comint-dynamic-complete-functions, comint-mode-map): `comint-dynamic-complete' is obsolete since 24.1, replaced by `completion-at-point'. (Bug#13774)

startup.el (normal-no-mouse-startup-screen): Bug fix, the default key binding for C-h C-o'.  (Bug#13970)

vc.el doc fixes

* lisp/vc/vc.el (vc-print-log-setup-buttons, vc-print-log-internal):
Add doc strings.
(vc-print-log): Clarify interactive prompt.

No longer include timestamp in header of .elc files

This removes needless differences between files compiled at different
times or by different people, or from sources in different locations.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00187.html

* lisp/emacs-lisp/bytecomp.el (byte-compile-insert-header):
No longer include timestamp etc information.

* etc/NEWS: Mention this.

Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org

Fixed problems with out-of-tree build in leim/Makefile.in reported by Dani Moncayo.

lisp/faces.el (read-face-name): Bug fix, return just one face if arg multiple is nil

Use add/remove-function to manipulate process-filters.
* lisp/emacs-lisp/nadvice.el (advice--where-alist): Add :override.
(remove-function): Autoload.

* lisp/comint.el (comint-redirect-original-filter-function): Remove.
(comint-redirect-cleanup, comint-redirect-send-command-to-process):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-process-filter,vc-cvs-annotate-command):
* lisp/progmodes/octave-inf.el (inferior-octave-send-list-and-digest):
* lisp/progmodes/prolog.el (prolog-consult-compile):
* lisp/progmodes/gdb-mi.el (gdb, gdb--check-interpreter):
Use add/remove-function instead.
* lisp/progmodes/gud.el (gud-tooltip-original-filter): Remove.
(gud-tooltip-process-output, gud-tooltip-tips):
Use add/remove-function instead.
* lisp/progmodes/xscheme.el (xscheme-previous-process-state): Remove.
(scheme-interaction-mode, exit-scheme-interaction-mode):
Use add/remove-function instead.

* lisp/vc/vc-dispatcher.el: Use lexical-binding.
(vc--process-sentinel): Rename from vc-process-sentinel.
Change last arg to be the code to run.  Don't use vc-previous-sentinel
and vc-sentinel-commands any more.
(vc-exec-after): Allow code to be a function.  Use add/remove-function.
(compilation-error-regexp-alist, view-old-buffer-read-only): Declare.

Merge from trunk.

Fixed another bug in nt/Makefile.in reported by Dani Moncayo.

Better full-screen frame support on MS-Windows.

 src/w32fns.c (w32_fullscreen_rect): New function to compute the
 window rectangle for the given fullscreen mode.
 (w32_wnd_proc): When in a fullscreen mode, WM_WINDOWPOSCHANGING no
 longer tunes the window size.  This keeps the window's edges flush
 with the screen and allows the taskbar to hide itself in fullboth.
 src/w32term.c (w32fullscreen_hook): 'fullboth' now shows without
 window decorations and uses the entire screen.
 src/w32term.h  (w32_fullscreen_rect) Add prototype.
 (struct w32_output): Replace normal_width, normal_height,
 normal_top, and normal_left members with a single normal_placement
 struct.
 (FRAME_NORMAL_WIDTH, FRAME_NORMAL_HEIGHT, FRAME_NORMAL_TOP):
 Remove macros.
 (FRAME_NORMAL_PLACEMENT): New macro.

Fixes: debbugs:14180

Fix a bug in nt/Makefile.in with out-of-tree builds, reported by Dani Moncayo.

Added bug number (Bug#14112) to my last ChangeLog entries.

* automated/imenu-tests.el: New file.

* lisp/progmodes/sh-script.el (sh-imenu-generic-expression): Handle
function names with a single character.

* lisp/progmodes/gud.el (gud-perldb-marker-filter): Understand position info
for subroutines defined in an eval.

Fixes: debbugs:14182

Small fixes to 2013-04-19T02:31:09Z!fgallina@gnu.org

* lisp/ChangeLog: Fix Changelog Entry.

* progmodes/python.el (python-imenu-create-flat-index): Remove
  leftover `message' call and give credit to old
  imenu--flatten-index-alist.

Auto-commit of generated files.

Add reveal-filename function instead of 3 set-generated-*-file funcs, as suggested by Glenn Morris.

Merge from trunk.

Minor wording improvement in INSTALL.MSYS.

* lisp/bookmark.el (bookmark-completing-read): Improve handling of empty
string.

Fixes: debbugs:14176

* lisp/vc/vc-dispatcher.el (vc-do-command): Get rid of default sentinel msg.

New faster Imenu implementation.

* lisp/progmodes/python.el:
(python-imenu-prev-index-position):
(python-imenu-format-item-label-function)
(python-imenu-format-parent-item-label-function)
(python-imenu-format-parent-item-jump-label-function):
New vars.
(python-imenu-format-item-label)
(python-imenu-format-parent-item-label)
(python-imenu-format-parent-item-jump-label)
(python-imenu--put-parent, python-imenu--build-tree)
(python-imenu-create-index, python-imenu-create-flat-index)
(python-util-popn): New functions.
(python-mode): Set imenu-create-index-function to
python-imenu-create-index.

* test/automated/python-tests.el (python-imenu-prev-index-position-1):
Removed test.
(python-imenu-create-index-1, python-imenu-create-flat-index-1):
New tests.

Fixes: debbugs:14058

Used AH_TEMPLATE as suggested by Glenn Morris.

Refactored tests for windows.h as suggested by Paul Eggert.

* configure.ac: Add DragonFly BSD, mostly same as FreeBSD (tiny change)

Fixes: debbugs:14068

Separated Windows specific install and uninstall targets as suggested by Paul Eggert.

Merge from trunk.

* lisp/winner.el (winner-active-region): Use region-active-p, activate-mark
and deactivate-mark.
* lisp/simple.el (deactivate-mark): Don't inline it.

Fixes: debbugs:14225

* net/tramp-sh.el (tramp-remote-process-environment): Add "TMOUT=0".

Auto-commit of generated files.

* files.el (auto-mode-alist): Delete OpenDocument and StarOffice
file extensions from the archive-mode entry in order to prefer
doc-view-mode-maybe with archive-mode as fallback (bug#14188).

Replace AC_PROG_LN_S by a less strict configure test

* configure.ac (AC_PROG_LN_S): Remove, too restrictive.
(LN_S_FILEONLY): New output variable.
* Makefile.in (LN_S): Remove.
(LN_S_FILEONLY): New, set by configure.
(install-arch-dep): Use LN_S_FILEONLY rather than LN_S.

Add an additional key ? for describe-prefix-bindings

* lisp/subr.el (with-wrapper-hook): Declare obsolete.
* lisp/simple.el (filter-buffer-substring-function): New hook.
(filter-buffer-substring): Use it.
(filter-buffer-substring-functions): Mark obsolete.
* lisp/minibuffer.el (completion-in-region-function): New hook.
(completion-in-region): Use it.
(completion-in-region-functions): Mark obsolete.
* lisp/mail/mailabbrev.el (mail-abbrevs-setup): Use abbrev-expand-function.
* lisp/abbrev.el (abbrev-expand-function): New hook.
(expand-abbrev): Use it.
(abbrev-expand-functions): Mark obsolete.
* lisp/emacs-lisp/nadvice.el (advice--where-alist): Add :filter-args
and :filter-return.
* lisp/org/org-agenda.el (org-agenda-mode):
* lisp/org/org-indent.el (org-indent-mode): Use the `local' arg of
add-hook/remove-hook.

* lisp/progmodes/python.el (python-nav--syntactically): Fix cornercases
and do not care about match data.

* test/automated/python-tests.el (python-nav-backward-defun-2)
(python-nav-backward-defun-3, python-nav-forward-defun-2)
(python-nav-forward-defun-3): New tests.

* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Provide specialized
completion tables when completing error conditions and
`declare' arguments.
(lisp-complete-symbol, field-complete): Mark as obsolete.
(check-parens): Unmatched parens are user errors.
* lisp/minibuffer.el (minibuffer-completion-contents): Mark as obsolete.

Teach 'make' how to re-configure for MinGW.

textmodes/flyspell.el: Don't check pre-word if buffer was switched.

If command changed the buffer, the decision may be made based on the
current buffer even though it should based on the previous one.  This
may lead to false positives and more importantly to errors since
`flyspell-pre-point' is buffer local so it may have unsanitised value
(such as nil) in previous buffer.

To be honest, I'm not sure how this can happen since
`flyspell-pre-point' is set in previous buffer, but nonetheless, I've
been encountering the error for quite some time and finally decided to
fix it.  Interestingly, line making `flyspell-pre-point'
a buffer-local variable has a very revealing "Why?? --Stef" comment.

To avoid the problem, change flyspell-check-pre-word-p so that it does
not allow checking of pre-word if command changed buffer
(ie. `flyspell-pre-buffer' is not current buffer).

Fixed the LN_S and LN_EMACS issue.

ispell.el: use `comment-normalize-vars' in ispell-add-per-file-word-list (Bug #14214).

Fix typos in INSTALL instructions.

Merge from trunk.

New defun movement commands.

* lisp/progmodes/python.el (python-nav--syntactically)
(python-nav--forward-defun, python-nav-backward-defun)
(python-nav-forward-defun): New functions.

* test/automated/python-tests.el (python-nav-backward-defun-1)
(python-nav-forward-defun-1): New tests.

* progmodes/python.el (python-syntax--context-compiler-macro): New defun.
(python-syntax-context): Use named compiler-macro for backwards
compatibility with Emacs 24.x.

Fix last change

* progmodes/octave-mod.el (octave-mode-map): Fix key binding to
octave-hide-process-buffer.

* lisp/vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names.

Fixes: debbugs:14216

* lisp/progmodes/gdb-mi.el (gdbmi-bnf-incomplete-record-result):
Fix adjustment of offset when receiving incomplete responses from GDB.

Fixes: debbugs:14129

Delete previous emacs.exe before dumping to fix problem with hard links to it.

Fixed loadup.el bug in finding the last build number on Unix.

* lisp/progmodes/python.el (python-mode-skeleton-abbrev-table): Rename from
python-mode-abbrev-table.
(python-skeleton-define): Adjust accordingly.
(python-mode-abbrev-table): New table that inherits from it so that
python-skeleton-autoinsert does not affect non-skeleton abbrevs.
* lisp/abbrev.el (abbrev--symbol): New function, extracted from abbrev-symbol.
(abbrev-symbol): Use it.
(abbrev--before-point): Use it since we already handle inheritance.

Merge from trunk.

Fixed hard link to emacs.exe in non-MSYS build.

* progmodes/octave-mod.el (octave-mode-map): Remove redundant key
binding to info-lookup-symbol.

Support emacs-XX.YY.ZZ.n and DOC-XX.YY.ZZ.n on Windows.

Merge from trunk.

Added install instructions using MSYS.

* tramp.texi (Frequently Asked Questions): Precise, how to define
an own ControlPath.

lisp/gnus/ChangeLog: Fix last change

lisp/gnus/shr.el: Support <img src="data:...">

Fix typos in ChangeLogs.

Silence byte-compiler warnings.
lisp/minibuffer.el (completion--twq-all):
lisp/term/ns-win.el (ns-initialize-window-system):
lisp/term/w32-win.el (w32-initialize-window-system): Mark unused argument.

src/minibuf.c (Ftest_completion): Silence compiler warning.

* lisp/emacs-lisp/nadvice.el (add-function): Default simple vars to their
global bindings.

* lisp/doc-view.el (doc-view-start-process): Handle url-handler directories.

* lisp/progmodes/ruby-mode.el (ruby-beginning-of-defun)
(ruby-end-of-defun, ruby-move-to-block): Bind `case-fold-search'
to nil.
(ruby-end-of-defun): Remove the unused arg, change the docstring
to reflect that this function is only used as the value of
`end-of-defun-function'.
(ruby-beginning-of-defun): Remove "top-level" from the docstring,
to reflect an earlier change that beginning/end-of-defun functions
jump between methods in a class definition, as well as top-level
functions.

* lisp/minibuffer.el (minibuffer-complete): Don't just scroll
a *Completions* that's been iconified.
(minibuffer-force-complete): Make sure repetitions do cycle when going
through completion-in-region -> minibuffer-complete.

* etc/NEWS, doc/lispref/tips.texi (Coding Conventions): Mention
separation of package descriptor and name of internal symbols by
two hyphens.

Correct the placement of c-cpp-delimiters when there're #s not at col 0.

        * progmodes/cc-langs.el (c-anchored-cpp-prefix): Reformulate and
        place a submatch around the #.
        * progmodes/cc-mode.el(c-neutralize-syntax-in-and-mark-CPP): Start
        a search at BOL.  Put the c-cpp-delimiter category text propertiy
        on the #, not BOL.

* lisp/emacs-lisp/nadvice.el: Properly test names when adding advice.
(advice--member-p): New arg `name'.
(advice--add-function, advice-member-p): Use it.

Fixes: debbugs:14202

Added nt/msysconfig.sh.

Reformulate java imenu-generic-expression.
        The old expression contained ill formed regexps.

        * progmodes/cc-menus.el (cc-imenu-java-ellipsis-regexp)
        (cc-imenu-java-type-spec-regexp, cc-imenu-java-comment-regexp)
        (cc-imenu-java-method-arg-regexp): New defconsts.
        (cc-imenu-java-build-type-args-regex): New defun.
        (cc-imenu-java-generic-expression): Fixed, to remove "ambiguous"
        handling of spaces in the regexp.

Merge from trunk.

net/tramp.texi: Improve last change.

Fixed problems with default paths and with shell-file-name.

ispell.el: No longer mark as wrong-by-flyspell words just accepted by ispell (bug #14178).

textmodes/ispell.el (ispell-command-loop): Remove flyspell highlighting
of a word when ispell accepts it (bug #14178).

* net/ange-ftp.el (ange-ftp-run-real-handler-orig): New defun,
uses code from the previous `ange-ftp-run-real-handler'.
(ange-ftp-run-real-handler): Set it to `tramp-run-real-handler'
only in case that function exist.  This is needed for proper
unloading of Tramp.

* tramp.texi (Frequently Asked Questions): New item for
ControlPath settings.

* textmodes/reftex-vars.el (reftex-label-regexps): New defcustom.

* textmodes/reftex.el (reftex-compile-variables): Use it.

ChangeLog for the last commit.

More debugging code to investigate bug #14062.

 src/w32fns.c (w32_wnd_proc): Add more assertions to investigate
 bug#14062.
 src/frame.h (WINDOW_FRAME): Protect macro and its argument with
 parentheses.
 src/dispextern.h (CURRENT_MODE_LINE_HEIGHT)
 (CURRENT_HEADER_LINE_HEIGHT, WINDOW_WANTS_MODELINE_P)
 (WINDOW_WANTS_HEADER_LINE_P): Protect macro arguments with
 parentheses where appropriate.