Fix bug#16762

* lisp/emacs-lisp/package.el (package--add-to-archive-contents):
Include already installed and built-in packages in
`package-archive-contents'.
(package-install): Don't include already installed packages in the
options on interactive invocation.

Backport &key-parsing improvement from trunk

lisp/frameset.el (frameset--initial-params): Fix typo in parameter name.

lisp/align.el (align-region): Do not fail when end-mark is nil (bug#17088).

Match special globals in Ruby better

* lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re):
Match special global variables without curlies, too.
(ruby-font-lock-keywords): Simplify the matcher for special global
variables.  Don't require a non-word character after the variable.

Fixes: debbugs:17057

Refine previous fix of x_set_window_size to handle Bug#17077.

* w32term.c (x_set_window_size): Refine fix from 2014-03-14
(Bug#17077).

* tramp.texi (Frequently Asked Questions): Add fish shell settings.

* src/fileio.c (Ffile_symlink_p): Doc fix.

Fixes: debbugs:17073

* lisp/simple.el (redisplay-highlight-region-function): Increase priority of
overlay to make sure boundaries are visible.
* src/buffer.c (struct sortvec): Add field `spriority'.
(compare_overlays): Use it.
(sort_overlays): Set it.

Fixes: debbugs:15899

lisp/frameset.el (frameset-restore): Compare display strings with equal.

lisp/frame.el (make-frame): Don't quote display name in error message.

Fix ChangeLog entry of last commit.

Fix bug #17047 with cursor motion when invisible text starts a line.

 src/xdisp.c (redisplay_window): If all previous attempts to find the
 cursor row failed, try a few alternatives before falling back to
 the top-most row of the window.  Use row_containing_pos.

* net/tramp.el (tramp-read-passwd): Suspend the timers while reading
the password.

* lisp/emacs-lisp/package.el (package-show-package-list): If the buffer
is already displayed in another window, switch to that window.

Backport memory info in bug reports (2014-03-21T21:27:25Z!dancol@dancol.org) from trunk

Backport memory fix (2014-03-22T03:04:53Z!dancol@dancol.org) from trunk

Backport memory fix (2014-03-23T05:15:48Z!dancol@dancol.org) from trunk

Fix keyword argument parsing. Please bootstrap.

Fix test failure in non-graphical mode

* test/automated/package-test.el (package-test-describe-package):
Fix test failure in non-graphical mode.

Add some missing ChangeLog entries.

Backport Yeeloong battery.el fix from trunk

Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00782.html

* lisp/battery.el (battery-linux-sysfs):
Search for each field from the beginning of the buffer.

* etc/PROBLEMS: Small copyedits.

* lispref/commands.texi (Defining Commands): Tweak previous change.

* lispref/commands.texi (Defining Commands): List interactive-only values.

Fix bug#16873

* lisp/emacs-lisp/package.el (package-desc): Use the contents of the
quoted form, not its cdr.

doc/lispref/functions.texi (Core Advising Primitives): Fix cross-reference in last change.

Revert last commit.

Fix bug #16694 with face attributes changed by themes.

 lisp/faces.el (face-spec-recalc): Doc fix.  Call
 make-face-x-resource-internal earlier, and condition that on
 no-init-from-resources being nil.

lisp/w32-common-fns.el (x-selection-owner-p): Get documentation from DOC.
Add empty docstring for the benefit of doc.c; change parameter profile
to match the X function.

* doc/lispref/functions.texi (Advising Functions): Explain a bit more how
arguments work.
(Advice combinators): New node.
(Core Advising Primitives): Use it.  Expand description of "depth".
(Advising Named Functions): Document limitation of advices on macros.

* net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'
  and `tramp-copy-env'.

* net/tramp-sh.el (tramp-methods) <sudo>: Add `tramp-login-env'.
  (tramp-maybe-open-connection): Handle `tramp-login-env'.

Fix regression introduced by patch for Bug#10500.
* xterm.c (x_draw_image_relief): Respect Vtool_bar_button_margin.
* w32term.c (x_draw_image_relief): Likewise.

Truly maximize w32 frames with odd fonts and some texi fixes.

* w32fns.c (w32_wnd_proc): For WM_WINDOWPOSCHANGING don't
constrain frame size in SW_SHOWMAXIMIZED case so we can truly
maximize a frame for odd default fonts.
* frames.texi (Size and Position): In `frame-resize-pixelwise'
description drop remark about frame maximization.
* windows.texi (Display Action Functions): Add description for
`display-buffer-no-window' and explain use of `allow-no-window'
alist entries.

* lisp/electric.el (electric-indent-post-self-insert-function): Add doc.

* lispref/commands.texi (Defining Commands): Copyedit re `interactive-only'.

Tiny doc/misc edits

* doc/misc/ede.texi (ede-linux):
* doc/misc/vip.texi (New Bindings): Tiny copyedits.

Add some standard finder Keywords: to lisp/nxml/*.el.

Fix bug#16826

* lisp/emacs-lisp/package.el (package-compute-transaction):
Use `version-list-<=' to compare the requirement version against
the package version already to be installed.  Update the error
message.

Fix bug#17050

* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Add indentation rule for ` @ '.

lisp/*.el: Fix typos.

* lisp/align.el (align-regexp): Remove superfluous backslash.

* lisp/ffap.el (ffap-ftp-default-user, ffap-url-regexp)
  (ffap-pass-wildcards-to-dired, dired-at-point-require-prefix)
  (ffap-rfc-path, ffap-ftp-sans-slash-regexp, ffap-menu-regexp):
  Fix docstring typos.
  (ffap-next): Use C-u in docstring.
  (ffap-machine-p, ffap-list-env, ffap-alist, ffap-alist)
  (ffap-string-at-point-mode-alist, ffap-menu, ffap-menu-ask):
  Remove superfluous backslashes.
  (ffap-string-at-point): Reflow docstring.

* lisp/server.el (server-host): Reflow docstring.
  (server-unload-function): Fix docstring typo.
  (server-eval-at): Remove superfluous backslash.

* lisp/skeleton.el (skeleton-insert): Remove superfluous backslash.
  (skeleton-insert): Doc fix.
  (skeleton-insert): Reflow docstring.

* lisp/term/tty-colors.el (tty-color-alist, tty-modify-color-alist)
  (tty-color-approximate, tty-color-by-index, tty-color-values)
  (tty-color-desc): Remove superfluous backslashes.

Backport doc.c fix from trunk.

* doc.c (store_function_docstring): Fix pointer signedness mismatch.

Backport doc fix from trunk.

* internals.texi (C Integer Types): Prefer 'false' and 'true'
to '0' and '1' for booleans.

* electric.el (global-map): Really bind C-j.

Fixes: debbugs:16770

* lisp/electric.el (electric-newline-and-maybe-indent): New command.
Bind it globally to C-j.
(electric-indent-mode): Don't mess with the global map any more.
Don't drop the post-self-insert-hook is some buffer is still using it.
* lisp/bindings.el (global-map): Remove C-j binding.

Fixes: debbugs:16770

* lisp/emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
the docstring of functions advised before dumping.
* src/doc.c (store_function_docstring): Warn when we don't know where to
put a docstring.
(Fsubstitute_command_keys): Don't advertise the fact that
text-properties are dropped, since we think it's a bug that we'll fix
in 24.5.

Fixes: debbugs:16993

* src/frame.h (SET_FRAME_VISIBLE): Keep frame_garbaged up to date.
* src/xterm.c (handle_one_xevent) <MapNotify>: Don't garbage the frame.
* src/frame.c (frame_garbaged): Make "docstring" more precise.

* src/charset.c (init_charset): When we cannot find the charsets directory,
mention if EMACSDATA is set.

Mark tiny change

* numbers.texi: Improve and clarify a bit, and fix some minor bugs.

Remove now-obsolete hypothetical note about negative division,
as the C standard has changed.

* fns.c (Frandom): Fix rare bug where the result isn't random.

Fix porting inconsistency about rounding to even.

* doc/lispref/numbers.texi (Numeric Conversions, Rounding Operations):
Document that 'round' and 'fround' round to even.
* src/floatfns.c (emacs_rint) [!HAVE_RINT]: Round to even.
This way, the unusual !HAVE_RINT case acts like the usual
HAVE_RINT case, and we can fix the documentation accordingly.

* lisp/ps-print.el (ps-generate-postscript-with-faces):
Explicitly deactivate the mark.
* lisp/simple.el (deactivate-mark): Update region highlight.

Fixes: debbugs:16866

Fix minor memory-related problems on MS-Windows revealed by Dr. Memory.

 src/w32fns.c (reset_modifiers): Zero out keystate[] before using it.
 (w32_wnd_proc): Initialize the dwHoverTime member of
 TRACKMOUSEEVENT structure.

lisp/emacs-lisp/package.el (describe-package-1): Decode commentary (bug#16733).

lisp/iimage.el: Remove obsolete URL from Commentary (bug#17038).

Recommend not modifying :set's value arg in defcustom (bug#16755).

* doc/lispref/customize.texi (Variable Definitions):
* lisp/custom.el (defcustom): Recommend avoiding
  destructive modification of the value argument of :set.

Add NEWS markup for CEDET.

* doc/lispref/modes.texi (Auto-Indentation): Mention electric-indent variables.
* doc/misc/cc-mode.texi (Indentation Commands): Remove C-j, since it's not
defined by CC-mode but globally.
(FAQ): Tweak text about RET and auto-indentation.
* doc/misc/vip.texi (Other Vi Commands): Adjust doc of C-j.

Document new EDE features.

* ede.texi (ede-cpp-root): Document the :compile-command slot.
(ede-linux): Document new variables
`project-linux-build-directory-default' and
`project-linux-architecture-default'.

* lisp/simple.el (newline-and-indent): Do autofill.

Fixes: debbugs:17031

Delete hunk mistakenly included in previous change.

Ensure dired-display-file displays it in other window.

* dired.el (dired-display-file): Force use of other window.

doc/lispref/functions.texi (Advising Named Functions): Fix reference.

ede.texi: Remove documentation for features only in CEDET upstream.

* ede.texi (Project Local Variables): Remove reference to
`ede-java-root' and the example using it.
(Android projects, ede-java-root): Remove nodes since they are
only in CEDET upstream (Bug#17030).  All nodes updated.

Further tweaks for comment-start-skip behavior

* lisp/newcomment.el (comment-normalize-vars): Only add escaping check
to `comment-start-skip' if not `comment-use-syntax'.
(comment-beginning): Use `narrow-to-region' instead of moving back
one character.
(http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00488.html)
(comment-start-skip): Update the docstring.

Fixes: debbugs:16971

Improve documentation for integer and floating-point basics.

* numbers.texi (Numbers, Integer Basics, Float Basics):
Document the basics a bit more precisely.  Say more clearly
that Emacs floating-point numbers are IEEE doubles on all
current platforms.  Give more details about frexp.
Say more clearly that '1.' is an integer.
(Predicates on Numbers): Fix wholenump typo.
* objects.texi (Integer Type): Adjust to match numbers.texi.

doc/lispref/ChangeLog: Trivial fixes.

* doc/lispref/functions.texi (Advising Functions): Try and improve the text.
Add example use of advice-add.
(Core Advising Primitives): Rename.  Explain handling of interactive
specs, including advice-eval-interactive-spec.
(Advising Named Functions): Try and better explain the difference with
add-function.
(Porting old advices): New node.

Fixes: debbugs:16959

Style fixes for floating-point doc.

* commands.texi, customize.texi, display.texi, elisp.texi, files.texi:
* frames.texi, hash.texi, internals.texi, keymaps.texi, lists.texi:
* minibuf.texi, nonascii.texi, numbers.texi, objects.texi, os.texi:
* processes.texi, streams.texi, strings.texi, text.texi:
* variables.texi, windows.texi:
Hyphenate "floating-point" iff it precedes a noun.
Reword to avoid nouns and hyphenation when that's easy.
Prefer "integer" to "integer number" and "is floating point"
to "is a floating point number".
Prefer "@minus{}" to "-" when it's a minus.

lisp/ChangeLog: Move up misplaced entry.

lisp/org/ChangeLog: Fix typo.

Remove old debug print

gnutls.c (Fgnutls_boot): Fix case of :verify-error = t.

* lisp/emacs-lisp/nadvice.el (advice--interactive-form): New function.
(advice--make-interactive-form): Use it to avoid (auto)loading function.
(advice--make-1, advice-add, advice-remove):
Remove braindead :advice-pending hack.

* lisp/calendar/calendar.el (calendar-generate-month): Apply weekend face
to the right days; fixes 2013-08-06 change.

Fixes: debbugs:17028

* net/tramp.el (tramp-action-out-of-band): Read pending output.
(tramp-call-process): Trace also DESTINATION.

* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
Quote file names when they are local.  Remove superfluous trace.

Restore compatibility with legacy comment-start-skip values

* lisp/newcomment.el (comment-beginning): If `comment-start-skip'
doesn't match, move back one char and try again.

Fixes: debbugs:16971

Fix debbugs#16971

* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Set
`comment-use-syntax' to t to avoid the unnecessary runtime check.
Set `comment-start-skip' to a simpler value that doesn't try to
check if the semicolon is escaped (this is handled by
`syntax-ppss' now).

* lisp/progmodes/scheme.el (scheme-mode-variables): Same.

Merge from mh-e; up to 2012-01-03T19:41:14Z!larsi@gnus.org.

src/ChangeLog: Fix a typo in last commit.

Fix bug #16830 with slow search for newlines in forward-line.

 src/search.c (find_newline): Speed up the function when using the
 newline cache, by halving the number of calls to
 region_cache_forward and region_cache_backward.

Fix behavior of with-temp-buffer-window (Bug#16816, Bug#17007).

* window.el (with-temp-buffer-window): Don't make BUFFER-OR-NAME
current (Bug#16816, Bug#17007).
(with-current-buffer-window): New macro doing the same as
`with-temp-buffer-window' but with BUFFER-OR-NAME current.
* help.el (help-print-return-message): Warn in doc-string to not
use this in `with-help-window'.
(describe-bindings-internal): Call `describe-buffer-bindings'
from within help buffer.  See Juanma's scenario in (Bug#16816).
(with-help-window): Update doc-string.
* dired.el (dired-mark-pop-up):
* files.el (save-buffers-kill-emacs):
* register.el (register-preview): Use `with-current-buffer-window'
instead of `with-temp-buffer-window'.
* display.texi (Temporary Displays): Rewrite descriptions of
`with-output-to-temp-buffer' and `with-temp-buffer-window'.
* help.texi (Help Functions): Rewrite description of
`with-help-window'.

lisp/textmodes/css-mode.el: Fix typo in comment.

lisp/textmodes/rst.el: Implement missing but documented functionality.

(rst-arabic-to-roman, rst-roman-to-arabic):
Implement inserting into current buffer, documented in their docstrings.
(rst-define-key, rst-compare-adornments, rst-insert-list-new-item)
(rst-section-tree-point, rst-forward-section, rst-indent)
(rst-compute-tabs, rst-font-lock-find-unindented-line-end)
(rst-font-lock-find-unindented-line-limit, rst-adornment-level)
(rst-font-lock-handle-adornment-pre-match-form)
(rst-repeat-last-character): Reflow docstrings.
(rst-preferred-adornments, rst-update-section, rst-find-title-line)
(rst-adjust-adornment-work, rst-initial-items, rst-insert-list)
(rst-toc-insert-style, rst-toc-insert-node, rst-goto-section)
(rst-compile, rst-imenu-convert-cell, rst-imenu-create-index):
Fix docstring typos.
(rst-all-sections, rst-section-hierarchy, rst-adjust): Doc fixes.
(rst-uncomment-region, rst-font-lock-find-unindented-line-match)
(rst-font-lock-handle-adornment-matcher): Mark unused arguments.

Update the missed spot

* doc/emacs/programs.texi (Matching): Update the missed spot.

Fixes: debbugs:17008

* programs.texi (Matching): Use slightly more detailed description.

lisp/term/ns-win.el (x-command-line-resources): Rename from ns-... version.

(ns-initialize-window-system): Use it.  It is set in term/common-win.el
from the -xrm command line argument, but in the Nextstep port its value
is irrelevant because nsfns.m:Fx_open_connection ignores it for now.

lisp/progmodes/python.el: Fix docstring typos.

(defconst, python-syntax-count-quotes)
(python-indent-region, python-indent-shift-right)
(python-indent-dedent-line-backspace, python-nav-backward-sexp)
(python-nav-backward-sexp-safe, python-nav-backward-up-list)
(python-shell-prompt-block-regexp, python-shell-prompt-output-regexp)
(python-shell-prompt-pdb-regexp, python-shell-enable-font-lock)
(inferior-python-mode, python-shell-make-comint, run-python-internal)
(python-shell-buffer-substring, python-shell-send-buffer)
(python-pdbtrack-activate, python-pdbtrack-stacktrace-info-regexp)
(python-completion-complete-at-point, python-fill-docstring-style)
(python-eldoc-function, python-imenu-format-item-label)
(python-imenu-format-parent-item-label)
(python-imenu-format-parent-item-jump-label)
(python-imenu--build-tree, python-imenu-create-index)
(python-imenu-create-flat-index): Fix docstring typos.
(python-indent-context, python-shell-prompt-regexp, run-python):
Remove superfluous backslashes.
(python-indent-line, python-nav-beginning-of-defun)
(python-shell-get-buffer, python-shell-get-process)
(python-info-current-defun, python-info-current-line-comment-p)
(python-info-current-line-empty-p, python-util-popn): Doc fixes.
(python-indent-post-self-insert-function, python-shell-send-file)
(python-shell-completion-get-completions)
(python-shell-completion-complete-or-indent)
(python-eldoc--get-doc-at-point): Reflow docstrings.

src/buffer.c (Fset_buffer): Document return value (bug#17015).

Update `blink-matching-paren' in the manual

* doc/emacs/programs.texi (Matching): Update WRT to the new
`blink-matchin-paren' behavior.

* doc/lispref/display.texi (Blinking): Update WRT to the new
`blink-matchin-paren' behavior.

* package.el (package-menu-mode-map): Replace use of obsolete function alias.
Tweak menu item text.

* lisp/info.el (Info-finder-find-node): Ignore the `emacs' metapackage.

Fixes: debbugs:10813

* lisp/finder.el (finder-list-matches): Include unversioned packages
in the result of a keyword search.

* lisp/finder.el (finder--builtins-descriptions): New constant.
(finder-compile-keywords): Use finder--builtins-descriptions.

This avoids us getting silly descriptions in finder-inf.el like
   (emacs . [nil nil "abbrev mode commands for Emacs"])

* NEWS: Fix the last change.

Author:

Support the old `blink-matching-paren' behavior

* lisp/simple.el (blink-matching-paren): Describe the new value,
`jump', enabling the old behavior.
(blink-matching-open): Use that value.

Fixes: debbugs:17008

* lisp/finder.el: Tweak previous change.

Stop files with same basename messing up finder's package--builtins

* lisp/Makefile.in (setwins_finder): New, excluding leim.
(finder-data): Use setwins_finder.

* lisp/finder.el (finder-no-scan-regexp): Add leim-list.
(finder-compile-keywords): Don't skip files with same basename.

Fixes: debbugs:14010

* etc/tutorials/TUTORIAL.de: Adapt to recent changes in TUTORIAL.
Thanks to Jorgen Schäfer for help with the translation.

Document pixelwise frame resizing and fix related bug on Windows.

* w32term.c (x_set_window_size): When frame-resize-pixelwise is
nil, always resize character wise to avoid potential loss of the
mode line (Bug#16923 related).
* display.texi (Temporary Displays): Say that
with-temp-buffer-window makes its buffer current.
* frames.texi (Size and Position): Describe new option
`frame-resize-pixelwise'.  Rewrite descriptions of
`set-frame-size', `set-frame-height' and `set-frame-width'.

Move some help functions from help-fns.el to help.el, which is preloaded.

They are now needed by eg the function `documentation' in some circumstances.

* lisp/help-fns.el (help-split-fundoc, help-add-fundoc-usage)
(help-function-arglist, help-make-usage): Move from here...

* lisp/help.el (help-split-fundoc, help-add-fundoc-usage)
(help-function-arglist, help-make-usage): ... to here.

* lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Do not load help-fns.

Fixes: debbugs:17001