Mark merge point of f90-interface-browser.

Mark merge point of eldoc-eval.

Mark merge point of company.

Mark merge point of ack-el.

Use README.{rst,md,org}; Auto-generate foo-pkg.el.

Mark merge point of coffee-mode.

Update infrastructure for Git.
* .gitignore: New file.
* .bzrignore: keep it as a symlink to .gitignore.
* externals-list: New file.

* admin/update-archive.sh: Use Git.  Use make.log when running in batch.
Turn build/packages into an rsync-copy rather than a symlink.  Use relative
file names.
(copyright_notices, check_copyright): Remove.  Use new "make" rule instead.

* admin/archive-contents.el: Use lexical-binding and pcase.
(archive--revno-re): New const.
(archive-prepare-packages): New `srcdir' argument, so we can add the ChangeLogs
to a parallel tree to the Git working dir.
(archive--simple-package-p): Don't return the commentary any more.
(archive--process-simple-package): Remove `commentary' arg.  Don't write out
the *-readme.txt file.  Reduce stdout noise.
(archive--make-changelog): New arg `srcdir'.  Use Git.
(archive--process-multi-file-package): Don't copy the readme.
(batch-make-site-dir, batch-make-site-package): Remove functions.
(archive--get-prop, archive--get-section, archive--quote)
(archive--insert-repolinks): New functions.
(archive--html-make-pkg): Include NEWS and obey "URL:" header.  Generate the
*-readme.txt files here.
(archive--elpa-git-url): New constant.
(archive-add/remove/update-externals): New function.

* GNUmakefile (EMACS): Add --batch here.  Adjust users.
(site, site/%, changelogs): Remove.
(archive-tmp): Don't require changelogs.
(check_copyrights, externals): New targets.
* copyright_exceptions: New file.
* admin/package-update.sh: Remove.

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

Complete the list of externals

Don't create local branches

Add externals-list.  Fix up ignore list.

* packages/vlf/vlf.el:: Version 0.9.1.
Add development repository URL.
(vlf-encode-size): New variable.
(vlf-adjust-chunk): Allow fluctuation when searching for proper
decoding.  Save encoded size to `vlf-encode-size'.
(vlf-write): Use `vlf-encode-size' for expected encoding size.
(vlf-batch-size, vlf-start-pos, vlf-end-pos, vlf-file-size)
(vlf-encode-size): Move permanent declarations to top level.
(vlf-mode): Fix locality of `write-file-functions' hook.
(vlf): Use `set-visited-file-name'.
(abort-if-file-too-large): Make `vlf-if-file-too-large' around
advice.
(scroll-up, scroll-down): Use `derived-mode-p'.
(vlf-change-batch-size): Remove superfluous check.
(vlf-verify-size): New function.
(vlf-next-batch, vlf-move-to-batch, vlf-move-to-chunk)
(vlf-file-shift-back, vlf-shift-batch, vlf-shift-batches): Use
it.
(vlf-revert): Fix boolean condition and ignored variable naming.
(vlf-prev-batch): Style fix.

Move check_copyright to the makefile

Fix up scripts to build archive from Git

Merge with ELPA
(eldoc-display-message-no-interference-p): Turn it into an advice.elpa
(eldoc-active-minibuffers-list): Store buffers rather than buffer names.

(eldoc-display-message-no-interference-p): Turn it into an advice.
(eldoc-active-minibuffers-list): Store buffers rather than buffer names.

* eldoc-eval.el (eldoc-display-message-no-interference-p): Force
old definition.
(eldoc-mode-in-minibuffer): Catch errors, run eldoc-in-minibuffer-show-fn
from the minibuffer.

Merge remote-tracking branch 'repo.or.cz/elpa'

* eldoc-eval.el: Merge docstring and minors changes from ELPA version.

Get "make -k" to go through

Get "make -k" to go through

* packages/eldoc-eval/eldoc-eval.el (eldoc-mode-in-minibuffer): Operate on
current buffer rather than minibuffer-completion-contents.

* packages/auctex/tex.el (TeX--call-3/2): New auxiliary function.
(ConTeXt-Omega-engine, TeX-Omega-mode, TeX-source-specials-mode):
Use it to provide the obsolescence version when possible.

* packages/auctex/auctex-pkg.el: Add :url.

rainbow-mode: 0.9, allow spaces in LaTeX colors

* packages/websocket/websocket.el: Fix version number.

* packages/websocket: Cleanup copyright and code.

Add websocket git revno bc5c2a2ee2b993a18e8e23ed725829d403508753.

* adaptive-wrap.el: Fix bug#14974 by using define-key-after
instead of easy-menu-add-item.
(adaptive-wrap-unload-function): Remove.

* adaptive-wrap.el: Require easymenu (bug#14974).

* packages/vlf/vlf.el: Set "Maintainer:".

* packages/vlf/vlf.el: Version 0.9.
(vlf-end-pos): Default to 0.
(vlf): Set the major mode earlier.
(vlf-get-file-size): Make it into a function.
(vlf-re-search): Add `batch-step' argument.
(vlf-re-search-forward, vlf-re-search-backward): Use it.
(vlf-goto-line): Make it handle a negative arg.
(vlf-occur-show): New command.
(vlf-occur-mode-map): Bind it to `o'.
(vlf-occur-visit): Don't switch-to-buffer.
(vlf-occur): Protect against non-local exits.
(vlf-build-occur): Fix details.
(vlf-edit-mode-map): Bind standard map to C-v.
(vlf-discard-edit): Mark buffer as unmodified.

* packages/vlf/vlf.el: Version 0.8, Add occur-like functionality.
(vlf-occur-mode-map): New var.
(vlf-occur-mode): New major mode.
(vlf-occur-next-match, vlf-occur-prev-match, vlf-occur-visit, vlf-occur):
New commands.
(vlf-build-occur): New function.
(vlf-mode-map): Add `o' binding for vlf-occur.

* packages/vlf/vlf.el: Version 0.7
(vlf-goto-line): New command.
(vlf-mode-map): Bind it to `l'.
(vlf-mode): Don't affect the global value of revert-buffer-function.
(vlf, dired-vlf): Remove `from-end' argument.
(scroll-up, scroll-down): Add advice to auto-jump to the next batch
during scrolling.
(vlf-get-file-size): New macro.
(vlf-revert): Try and pay attention to the actual arguments.
(vlf-next-batch, vlf-prev-batch, vlf-move-to-batch, vlf-move-to-chunk)
(vlf-re-search, vlf-goto-match): Use position-bytes to try and match bytes
and chars.
(vlf-adjust-chunk): New function.
(vlf-file-shift-back): Disable undo.  Don't mess with
buffer-file-coding-system, use coding-system-for-write instead.
(vlf-shift-batch): Check modtime.
(vlf-file-shift-forward): Simplify.
(vlf-shift-batches): Don't use an auxiliary buffer.

* packages/vlf/vlf.el: Version 0.6
(vlf-mode): Setup revert and file write.
(vlf-format-buffer-name): Change format to indicate the chunk numbers.
(vlf-insert-file): Remove unused arg `file'.
(vlf-beginning-of-file, vlf-end-of-file, vlf-jump-to-chunk): New commands.
(vlf-mode-map): Use them.  Add a `j' binding.
(vlf-revert): New function.
(vlf-next-batch, vlf-prev-batch, vlf-move-to-batch, vlf-move-to-chunk):
Set modtime.  Better preserve point.
(vlf-file-shift-back, vlf-shift-batch, vlf-file-shift-forward)
(vlf-shift-batches): New functions.
(vlf-write): Use them when size of saved chunks has changed.
Pay attention to modtimes.

* packages/vlf/vlf.el: Version 0.5
Add editing mode.  Search refinements.
(vlf-mode-map): Change keys for batch size and EOF/BOF jumps.
(vlf-mode): Move buffer-disable-undo here.
(vlf-move-to-chunk): New function.
(vlf-change-batch-size): Use it to immediately update content.
(vlf-if-file-too-large): Adjust call (missed in last change).
(vlf-re-search, vlf-goto-match): New functions.
(vlf-re-search-forward, vlf-re-search-backward): Use them.
(vlf-end-search): Remove function.
(vlf-edit-mode-map): New var.
(vlf-edit-mode): New major mode.
(vlf-write, vlf-discard-edit): New commands.

* packages/vlf/vlf.el: Version 0.4.
(vlf-mode-map): Add bindings to search and jump to BOF/EOF.
(vlf-format-buffer-name): Change position into a percentage.
(vlf-next-batch, vlf-prev-batch): Keep stable cursor position when moving
through chunks.
(vlf-move-to-chunk, vlf-insert-file): New functions.
(vlf): Use them.  Disable undo information.  Change arg order.
(dired-vlf): Adjust call.
(vlf-re-search-forward, vlf-re-search-backward, vlf-end-search): New functions.

* packages/vlf/vlf.el: Use lexical-binding.  Bump version to 0.3.
Add ability to view newly added content if the file has grown meanwhile.
Provide a V binding in dired.
(vlf-mode-map): Change C-+ to M-+.  Add M-- binding.
(vlf-next-batch, vlf-prev-batch): Add ability to jump/insert given number of
batches at once.
(vlf): Add autoload cookie.  Add option to start viewing from the end of file.
(dired-vlf): New function.
(vlf-if-file-too-large): New function.
(abort-if-file-too-large): Use it to provide vlf as an option when opening
large files.

* oauth2.el: Only require CL at compile time and avoid flet.
(success): Don't defvar.
(oauth--url-advice, oauth--tokens-need-renew): New dynbind variables.
(url-http-handle-authentication): Add advice.
(oauth2-url-retrieve-synchronously): Use the advice instead of flet.

* adaptive-wrap.el (menu-bar-options-menu): Add checkbox for Adaptive Wrap
to the Line Wrapping submenu.
(adaptive-wrap-unload-function): New function.

Fixed image-mode issue.  Changed version to 0.5.

Bump version number to release the new tex-jp.el

oauth2: release 0.9, require url-http

This is needed so that the `flet' calls doesn't restore the overriden
function to an unbound one.

Signed-off-by: Julien Danjou <julien@danjou.info>

* GNUmakefile (%.elc): Don't depend on $(autoloads) since that causes
constant recompilation of everything.
(elcs): New target.
(all-in-place): Run elcs in a submake, after updating autoloads.

* GNUmakefile: Rename from Makefile.  Add targets for in-place use.
(all, all-in-place): New targets.
* admin/archive-contents.el (archive--simple-package-p): Ignore autosave files.
(archive--refresh-pkg-file): New function.
(archive--write-pkg-file): Print with ' and ` shorthands.
* packages/company/company-pysmell.el: Don't require pysmell during compile.
* packages/muse/htmlize-hack.el: Don't require htmlize during compile.
* packages/shen-mode/shen-mode.el (shen-functions): Define during compile.
* smart-operator/smart-operator.el (smart-operator-insert-1): Use pcase.

jumpc version 3, handle deleted files

js2-mode: Merge from upstream

Git commit 714dca50644c75884d9d90f10328c7a12e02cdcc

Put coding cookie in elisp header line.

* packages/auctex/tex-jp.el: Add coding cookie.

js2-mode: Merge from upstream

Git commit 1c53de75e0acd19d61ad45a91b32c183948e5128

* ggtags.el: Release 0.6.6

1. New commands: ggtags-list-tags, ggtags-query-replace and
   ggtags-delete-tag-files
2. Allow finding symbol tags (OPTION: -s)
3. Other fixes and small improvements

* ggtags.el: A few minor fixes

  1. Quote path in ggtags-find-tag
  2. Do not close the window if exit abnormally
  3. Tweak ggtags-global-mode-font-lock-keywords

* ggtags.el: Release 0.6.5

Support all output formats of 'global': path, ctags, ctags-x, grep,
cscope. Improve ggtags-highlight-tag-at-point.

* ggtags.el: Release 0.6.4 with various bug fixes

1. Do not override split-window-preferred-function
2. Avoid closing ECB compilation window
3. Resolve symlinks before passing to 'global'

company: Release 0.6.10

* Plays nicer with `org-indent-mode`.
* Works in horizontally scrolled windows.

Git commit 764d2aa4ba50081adf69408e62d4863905b68b7f

Release 0.6.10

company-doc-buffer: Use the arg; rename the buffer

company-backends: Tweak the documentation

Set emacs-lisp-docstring-fill-column to 75,

wrap some overly long lines.

company-modify-line: Barf the concat

company-modify-line: Handle an empty first line with line-prefix

* Fixes #24 follow-up.
* Cleaner code, less display magic.

* cl-lib.el (cl-labels): Demote error to message and improve it.

company-modify-line, company--column: Simplify

company-ropemacs: Move dependencies list into the docstring

company-echo-show-when-not-busy: Remove, was unused

Turn a bunch of defsubsts into defuns

Fix #24, part second

Regression from a696ca3a.

Respect line-prefix at bol (#24)

company--column: Account for character composition

Check in NEWS and tests for the previous commit

Calculate row and column using `vertical-motion'

* company--replacement-string: Account for horizontal scrolling.
* Fixes #22.

Thanks to Eli Zaretskii for suggestions:
http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00145.html

Turn on email notifications [ci skip]

js2-mode: Fix a typo

Git commit c50f3d1d9db63bcbea3f02036ee17ab0d7511be0

js2-mode: Merge from upstream

* js2-imenu-extras: New file.

Git commit 3c69aea0c267e7bbadd5e35eb6cab54764c9d91c

company: Release 0.6.9

* `company-capf` respects `:exit-function` completion property.
* `company-backends`: `prefix` command can return `t` in the cdr.
* `company-clang-begin-after-member-access`: New option.
* Mouse click outside the tooltip aborts completion.
* `company-clang` uses standard input to pass the contents of current buffer to
  Clang 2.9+, otherwise saves the buffer and passes the path to the file.
* `company-clang-auto-save` option has been removed.
* Better interaction with `outline-minor-mode`.
* `company-dabbrev-code` supports all `prog-mode` derivatives.

Git commit 4c735454d91f9674da0ecea950504888b1e10ff7

Release 0.6.9

Make 'make test' work when the test file is compiled

Add Stefan's email

company-capf: Change `require-match' comment

Move company-capf to a separate file

Fix some more compilation warnings

Add compile target

* company.el (company-capf): Add support for `sorted' and `post-completion'.
  (company--capf-data): New function.
  (company-backend): Declare before first use.
  (company-require-match-p): Only call company-require-match when needed.
  (company--continue-failed): Don't use backward-delete-char non-interactively.
  (company-search-assert-enabled): Demote it, since it comes too late to
  be inlined.
  (company--replacement-string, company--create-lines)
  (company-pseudo-tooltip-edit, company-doc-buffer): Silence the byte-compiler.

emacs22 fails to install

ERT window should occupy the whole frame

Decrease company-tooltip-limit in test

Less likely to fail in smaller terminal window.

Add build status badge

Use emacs -L argument

Use stable URL for ERT

Add a backslash

Try the new travis.yml

company--inside-tooltip-p: Be more precise

when company-candidates-length < overlay's company-height property

Fix #21

Add test targets

Update company-clang.el

stardard -> standard

company-clang-begin-after-member-access: include C++'s scope operator

Close #19

company-select-mouse: work correctly when tooltip is expanded up

Fix #20

company-select-mouse: Pick correct item when company-tooltip-offset > 0