CONTRIBUTE: Use consistent spelling for 'ChangeLog'.

Unbreak jumping to an alias's definition

* lisp/emacs-lisp/find-func.el (find-function-library): Return a pair
(ORIG-FUNCTION . LIBRARY) instead of just its second element.
(find-function-noselect): Use it.

* lisp/progmodes/elisp-mode.el (elisp--xref-identifier-file): Rename to
`elisp--xref-identifier-location', incorporate logic from
`elisp--xref-find-definitions', use the changed
`find-function-library' return value.

Small fixes in etc/grep.txt

More fixes to support multi-line search in comint

* lisp/comint.el (comint-history-isearch-message): Use field-beginning
instead of comint-line-beginning-position - that's more fixes for
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
(comint-history-isearch-message): Fix args of isearch-message-prefix.

* lisp/vc/vc-dir.el (vc-dir-display-file): New command.

(vc-dir-mode-map): Bind it to "\C-o".
(vc-dir-menu-map): Add it to menu.

Fixes: debbugs:19450

Declare many etags command obsolete; update the goto menu

* lisp/menu-bar.el (menu-bar-goto-menu): Replace all but one etags item
with xref ones.

* lisp/progmodes/etags.el (find-tag-other-window)
(find-tag-other-frame, find-tag-regexp, tags-loop-continue)
(tags-apropos): Declare obsolete.

Merge from origin/emacs-24

f646cd9 * build-aux/git-hooks/commit-msg: Allow tabs.

Merge from origin/emacs-24

The following commits were skipped:

39eaef9 lisp/international/mule.el (define-coding-system): Fix typos in the doc string. Add missing ChangeLog entry for the previous commit.
df932d8 lisp/international/mule.el (define-coding-system): Improve docstring.

* build-aux/git-hooks/commit-msg: Allow tabs.

Treat them as if they were expanded to spaces, with tab stops
every 8 columns.

Fix produce_composite_width typo

* term.c (produce_composite_glyph):
Fix typo that confused number of columns for pixel width.

lisp/international/mule.el (define-coding-system): Fix typos in the doc string.
Add missing ChangeLog entry for the previous commit.

Backported from trunk; do not merge back.

(cherry picked from commit 79e2dade762491c58aa6396e35bae0ef418bafc6)

lisp/international/mule.el (define-coding-system): Improve docstring.

Backported from trunk; do not merge back.

(cherry picked from commit 5979af512bf5d6a28acea24299b67c7939d9e703)

lisp/international/mule.el (define-coding-system): Fix typos in the doc string.
Add missing ChangeLog entry for the previous commit.

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

shr table header/footer fixes

Fixes: debbugs:19444
* lisp/net/shr.el (shr-tag-table): Fix handling of tbody/header/footer
elements in tables.

Fix eww typo in "up" handling

Fixes: debbugs:19445
* lisp/net/eww.el (eww-handle-link): Fix typo in "up" rel handling.

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

(define-coding-system): Improve docstring.

Wrap dll functions more simply

* decompress.c, gnutls.c, image.c, xml.c:
If WINDOWSNT, use '#define FOO fn_FOO' to wrap dll functions,
rather than the inverse when not WINDOWSNT.  This isolates the
fn_* business into the WINDOWSNT-specific section of the code,
which makes it easier to maintain the generic code.
* decompress.c (DEF_ZLIB_FN, LOAD_ZLIB_FN):
* gnutls.c (DEF_GNUTLS_FN, LOAD_GNUTLS_FN):
* image.c (DEF_IMGLIB_FN, LOAD_IMGLIB_FN):
* xml.c (DEF_XML2_FN, LOAD_XML2_FN):
Remove.  All uses replaced by DEF_DLL_FN.
* w32.h (DEF_DLL_FN, LOAD_DLL_FN): New macros.

Merge from origin/emacs-24

b54f572 Port memory-full checking to GnuTLS 3.3

Conflicts:
  src/ChangeLog
  src/gnutls.c

Port memory-full checking to GnuTLS 3.3

Instead of using gnutls_global_set_mem_functions, check every call
to a GnuTLS function that might return an indication of memory
exhaustion.  Suggested by Dmitry Antipov in:
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg02056.html
* src/gnutls.c (gnutls_global_set_mem_functions) [WINDOWSNT]: Remove.
(init_gnutls_functions): Do not load gnutls_global_set_mem_functions.
(fn_gnutls_global_set_mem_functions) [!WINDOWSNT]: Remove.
All uses removed.
(check_memory_full): New function.
(emacs_gnutls_handshake, emacs_gnutls_handle_error)
(gnutls_make_error, Fgnutls_boot): Use it.
(emacs_gnutls_global_init): Avoid gnutls_global_set_mem_functions.

Avoid compilation warning in saveplace.el for dired-current-directory

Use diff faces for compare-windows

* lisp/vc/compare-w.el: Require diff-mode for diff faces.
(compare-windows-removed, compare-windows-added): New faces
inheriting from diff faces.
(compare-windows): Define obsolete face alias.
(compare-windows-highlight): Replace face `compare-windows' with
new faces `compare-windows-added' and `compare-windows-removed'.
(compare-windows-get-recent-window): Signal an error when
no other window is found.

Fixes: debbugs:19451

python.el: Native readline completion.

This commit adds native readline completion that fallbacks to the old
mechanism when it cannot be used for the current interpreter.

* lisp/progmodes/python.el (python-shell-completion-native-disabled-interpreters)
(python-shell-completion-native-enable)
(python-shell-completion-native-output-timeout): New defcustoms.
(python-shell-completion-native-interpreter-disabled-p)
(python-shell-completion-native-try)
(python-shell-completion-native-setup)
(python-shell-completion-native-turn-off)
(python-shell-completion-native-turn-on)
(python-shell-completion-native-turn-on-maybe)
(python-shell-completion-native-turn-on-maybe-with-msg)
(python-shell-completion-native-toggle): New functions.
(python-shell-completion-native-get-completions): New function.
(python-shell-completion-at-point): Use it.

* test/automated/python-tests.el
(python-shell-completion-native-interpreter-disabled-p-1): New
test.

(elisp--xref-identifier-file): Skip features that have no sources

* lisp/progmodes/elisp-mode.el (elisp--xref-identifier-file):
Skip features that have no sources.

* test/automated/let-alist.el: Load dependency.

Handle nil value of suggest-key-bindings

* lisp/simple.el (execute-extended-command):
When `suggest-key-bindings' is nil, don't.

python.el: Enhance shell user interaction and deprecate python-shell-get-or-create-process.

* lisp/progmodes/python.el
(python-shell-get-process-or-error): New function.
(python-shell-with-shell-buffer): Use it.
(python-shell-send-string, python-shell-send-region)
(python-shell-send-buffer, python-shell-send-defun)
(python-shell-send-file, python-shell-switch-to-shell): Use it.
Add argument MSG to display user-friendly message when no process
is running.
(python-shell-switch-to-shell): Call pop-to-buffer with NORECORD.
(python-shell-make-comint): Rename argument SHOW from POP.  Use
display-buffer instead of pop-to-buffer.
(run-python): Doc fix.  Return process.
(python-shell-get-or-create-process): Make obsolete.

* test/automated/python-tests.el (python-shell-get-or-create-process-1)
(python-shell-get-or-create-process-2)
(python-shell-get-or-create-process-3): Remove tests.

Merge from origin/emacs-24

433af0a * lisp/progmodes/python.el (python-shell-buffer-substring): Handle cornercase when region sent starts at point-min.

* lisp/progmodes/python.el (python-shell-buffer-substring): Handle
cornercase when region sent starts at point-min.

Fix parse_settings to match internal documentation

* xsettings.c (parse_settings): Return the number of settings seen.
Count the settings changes accurately.
(read_settings): Don't confuse number of settings changes with
the return code from XGetWindowProperty.

Fix compilation of lib-src executables on MS-Windows.

 lib-src/Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT})
 (make-docfile${EXEEXT}, movemail${EXEEXT})
 (update-game-score${EXEEXT}): Put $(NTLIB) before $(LOADLIBES),
 since GCC sometimes calls stpcpy when it sees strcpy, under
 optimization switches.  Reported by Dani Moncayo <dmoncayo@gmail.com>.

Sanitize ChangeLog entries for previous merges.

Merge from origin/emacs-24

a5f38fa Fix ChangeLog typo
c6400e1 Fix composition of characters from Syriac and Arabis scripts.
7e9dfde python.el: Fix message when sending region.
800260c python.el: Cleanup temp files even with eval errors.
ed65b91 Fix for previous commit
2dd5163 python.el: Handle file encoding for shell.
7aa506e Spelling fixes
4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..".
a41d07b Fix rendering of composed caharacters on the mode line.  (Bug#19435)
b70977c Small doc markup fixes
73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
1783e6c ChangeLog fix
c741b1b TUTORIAL.es: Improve style consistency
f89efea TUTORIAL.es: spelling fixes
0d48826 Avoid compiler warning.

Conflicts:
doc/lispref/ChangeLog
doc/lispref/control.texi
etc/ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog

Merge from origin/emacs-24

The following commit was skipped:

5fc8210 Backport: Memory leak fix and 19133 fix.

Merge from origin/emacs-24

bef46ba Fix bad bug number reference, shall be 19427.

Conflicts:
src/ChangeLog

Merge from origin/emacs-24

The following commit was skipped:

2566f38 Backport: Don't cache images in nsimage.m (Bug#18918).

Merge from origin/emacs-24

216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust.
20cfd24 Improve indexing on the chapter/section/subsection levels.
14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows.
012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function
75e114f Fix line numbers on Python shell.
d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
8e818d1 Keep maximized when going fullscreen.
749813e python.el: Fix electric colon behavior
936d5e5 Fix last patch.
74d3b20 Fixes: debbugs:18623

Conflicts:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/functions.texi
lisp/ChangeLog
src/ChangeLog
src/xterm.c
test/ChangeLog

Merge from origin/emacs-24

The following commit was skipped:

48a9d9f Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

Merge from origin/emacs-24

230c010 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.

Conflicts:
lisp/ChangeLog

Merge from origin/emacs-24

The following commit was skipped:

09ab6fe Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

Merge from origin/emacs-24

2616307 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
c773edc * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in wrong debug buffer. (tramp-gw-open-connection): Set process coding system 'binary. (tramp-gw-open-network-stream): Handle HTTP error 403.
8032fc1 * .gitignore: Ignore /conftest*.
fb420e7 * lisp/subr.el (sit-for): Tweak docstring.
061db13 Fix vc-git-dir-status-files WRT up-to-date vs edited
bb57c94 Consider electric-pair-mode in tex-mode.
7b94572 * test/automated/flymake/warnpred/test.pl: Tweak earlier change.
59c218f ChangeLog fix
db2a768 * test/automated/flymake/warnpred/test.pl: Tweak format
d9005dd src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.

Conflicts:
ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog

Fix ChangeLog typo

elisp-xref-find: Don't create buffers eagerly

* lisp/emacs-lisp/find-func.el (find-function-library): New function,
extracted from `find-function-noselect'.

* lisp/progmodes/elisp-mode.el (elisp--identifier-location): Fold back
into `elisp--company-location'.
(elisp--identifier-completion-table): Rename to
`elisp--identifier-completion-table', and do not include just any
symbols with a property list.
(elisp-completion-at-point): Revert the 2014-12-25 change.
(elisp--xref-identifier-file): New function.
(elisp--xref-find-definitions): Use it.

* lisp/progmodes/xref.el (xref-elisp-location): New class.
(xref-make-elisp-location): New function.
(xref-location-marker): New implementation.

Fix composition of characters from Syriac and Arabis scripts.

 lisp/language/misc-lang.el (composition-function-table): Add Syriac
 characters and also ZWJ/ZWNJ.  See
 http://lists.gnu.org/archive/html/help-gnu-emacs/2014-12/msg00248.html
 for the details.

Auto-commit of loaddefs files.

python.el: Fix message when sending region.

* lisp/progmodes/python.el (python-shell-send-region): Rename argument
send-name from nomain.  Fix message.
(python-shell-send-buffer): Rename argument send-name from arg.

python.el: Cleanup temp files even with eval errors.

* lisp/progmodes/python.el (python-shell-send-file): Make file-name
mandatory.  Fix temp file removal in the majority of cases.

Fix for previous commit

python.el: Handle file encoding for shell.

* lisp/progmodes/python.el (python-rx-constituents): Add coding-cookie.
(python-shell--save-temp-file): Write file with proper encoding.
(python-shell-buffer-substring): Add coding cookie for detected
encoding to generated content.  Fix blank lines when removing
if-name-main block.
(python-shell-send-file): Handle file encoding.
(python-info-encoding-from-cookie)
(python-info-encoding): New functions.

* test/automated/python-tests.el (python-shell-buffer-substring-1)
(python-shell-buffer-substring-2, python-shell-buffer-substring-3)
(python-shell-buffer-substring-4, python-shell-buffer-substring-5)
(python-shell-buffer-substring-6, python-shell-buffer-substring-7)
(python-shell-buffer-substring-8)
(python-info-encoding-from-cookie-1)
(python-info-encoding-from-cookie-2)
(python-info-encoding-from-cookie-3)
(python-info-encoding-from-cookie-4)
(python-info-encoding-from-cookie-5)
(python-info-encoding-from-cookie-6)
(python-info-encoding-from-cookie-7, python-info-encoding-1)
(python-info-encoding-2): New tests.

Avoid duplicate calls of window-height in with-displayed-buffer-window

* lisp/minibuffer.el (minibuffer-completion-help):
Use shrink-window-if-larger-than-buffer in window-height
when temp-buffer-resize-mode is nil.

* lisp/window.el (with-displayed-buffer-window): Remove window-height
from the action alist in the temp-buffer-window-show call
when window-height is handled explicitly afterwards.

Fixes: debbugs:19355

Support subdirectories when saving places in dired.

* lisp/saveplace.el (toggle-save-place, save-place-to-alist)
(save-places-to-alist, save-place-dired-hook):
Use dired-current-directory instead of dired-directory.
(save-place-dired-hook): Add check for alist to make the new
format future-proof to allow other possible formats.

Fixes: debbugs:19436

Fix ChangeLog

Use bool for boolean in xselect.c, xsettings.c

* xselect.c (x_get_local_selection, struct selection_data)
(x_selection_request_lisp_error, struct prop_location)
(x_handle_selection_request, x_convert_selection)
(waiting_for_other_props_on_window, expect_property_change)
(wait_for_property_change, x_handle_property_notify)
(x_get_foreign_selection, x_get_window_property)
(receive_incremental_selection)
(x_get_window_property_as_lisp_data)
(lisp_data_to_selection_data, Fx_get_selection_internal)
(x_send_client_event):
* xselect.c, xterm.h (x_handle_dnd_message):
* xsettings.c (dpyinfo_valid, parse_settings, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_gsettings, init_xsettings)
(syms_of_xsettings):
Use bool for boolean.
* xselect.c (x_get_window_property): Omit last arg, which was an
unused boolean.
* xsettings.c (apply_xft_settings): Remove 2nd arg, which was
always true.  All callers changed.

python.el: Generate clearer shell buffer names.

* lisp/progmodes/python.el (python-shell-get-process-name)
(python-shell-internal-get-process-name): Use `buffer-name`.
(python-shell-internal-get-or-create-process): Simplify.

* test/automated/python-tests.el (python-shell-get-process-name-1)
(python-shell-internal-get-process-name-1): Cleanup.
(python-shell-get-process-name-2)
(python-shell-internal-get-process-name-2): New tests.
(python-shell-calculate-command-1)
(python-shell-calculate-process-environment-3)
(python-shell-calculate-exec-path-2, python-shell-make-comint-1)
(python-shell-make-comint-2, python-shell-make-comint-4)
(python-shell-get-process-1, python-util-clone-local-variables-1):
Replace obsolete function and variable references with current.

Revert "Prevent Python process shell buffer to pop twice."

This reverts commit 4256626a7ac486446f4dea9c12df3057053825a7.

Add basic xref apropos implementation to elisp-mode

* lisp/progmodes/elisp-mode.el (elisp--xref-find-definitions):
Filter out nil results.
(elisp--xref-find-apropos): New function.
(elisp-xref-find): Use it.

* lisp/progmodes/xref.el (xref--show-xrefs): Use `user-error'.

make dired-maybe-insert-subdir always skip trivial files

MS-Windows followup to stpcpy changes.

 src/w32proc.c (sys_spawnve, get_lcid_callback): Use strcpy instead
 of strcat.
 src/w32menu.c (add_menu_item): Use stpcpy instead of strcat.
 src/w32.c (sys_readdir, stat_worker, symlink): Use strcpy instead of
 strcat.

 nt/gnulib.mk (stpcpy, string): Sync with the latest change in
 lib/gnulib.mk.

Use bool for boolean in xsmfns.c

* xsmfns.c, xterm.h (x_session_have_connection):
* xsmfns.c (doing_interact, smc_interact_CB, Fhandle_save_session):
Use bool for boolean.
(x_session_initialize, Fhandle_save_session):
Prefer NILP (x) to EQ (x, Qnil).

Spelling fixes

Spelling fixes

Prefer stpcpy to strcat

* admin/merge-gnulib (GNULIB_MODULES): Add stpcpy.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stpcpy.c, m4/stpcpy.m4: New files, from gnulib.
* lib-src/ebrowse.c (sym_scope_1, operator_name, open_file):
* lib-src/emacsclient.c (get_server_config, set_local_socket)
(start_daemon_and_retry_set_socket):
* lib-src/etags.c (main, C_entries, relative_filename):
* lib-src/pop.c (sendline):
* lib-src/update-game-score.c (main):
* lwlib/xlwmenu.c (resource_widget_value):
* src/callproc.c (child_setup):
* src/dbusbind.c (xd_signature_cat):
* src/doc.c (get_doc_string, Fsnarf_documentation):
* src/editfns.c (Fuser_full_name):
* src/frame.c (xrdb_get_resource):
* src/gtkutil.c (xg_get_file_with_chooser):
* src/tparam.c (tparam1):
* src/xfns.c (xic_create_fontsetname):
* src/xrdb.c (gethomedir, get_user_db, get_environ_db):
* src/xsmfns.c (smc_save_yourself_CB):
Rewrite to avoid the need for strcat, typically by using stpcpy
and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
* src/doc.c (sibling_etc):
* src/xrdb.c (xdefaults):
Now a top-level static constant.

* automated/tramp-tests.el (tramp-test17-insert-directory): Do not
expect a given order of "." and "..".

Regenerate ldefs-boot.el

Consolidate cross-referencing commands

Move autoloaded bindings for `M-.', `M-,', `C-x 4 .' and
`C-x 5 .' from etags.el to xref.el.

* progmodes/xref.el: New file.

* progmodes/elisp-mode.el (elisp--identifier-types): New variable.
(elisp--identifier-location): New function, extracted from
`elisp--company-location'.
(elisp--company-location): Use it.
(elisp--identifier-completion-table): New variable.
(elisp-completion-at-point): Use it.
(emacs-lisp-mode): Set the local values of `xref-find-function'
and `xref-identifier-completion-table-function'.
(elisp-xref-find, elisp--xref-find-definitions)
(elisp--xref-identifier-completion-table): New functions.

* progmodes/etags.el (find-tag-marker-ring): Mark obsolete in
favor of `xref--marker-ring'.
(tags-lazy-completion-table): Autoload.
(tags-reset-tags-tables): Use `xref-clear-marker-stack'.
(find-tag-noselect): Use `xref-push-marker-stack'.
(pop-tag-mark): Make an alias for `xref-pop-marker-stack'.
(etags--xref-limit): New constant.
(etags-xref-find, etags--xref-find-definitions): New functions.

* etc/NEWS: Mention new buffer display behavior for `shell'.

This follows up to Sam Steingold's change of 2014-12-23
in ../lisp/shell.el, in git commit e55a467ec0f758c311d3.

Fix rendering of composed caharacters on the mode line.  (Bug#19435)

 src/xdisp.c (set_iterator_to_next) <GET_FROM_STRING>: Limit search in
 composition_compute_stop_pos to the number of characters in the
 string.
 <GET_FROM_BUFFER, GET_FROM_STRING>: Simplify code.
 src/composite.c (composition_compute_stop_pos): If no composition
 was found in a string before ENDPOS, and ENDPOS is the string end,
 no need to back up to a safe point.
 src/dispextern.h (struct it) <end_charpos>: Improve commentary.

Make `resize-mini-windows' customizable and update documentation for it.

* cus-start.el (resize-mini-windows): Make it customizable.
* minibuf.texi (Minibuffer Windows): Add descriptions of
`resize-mini-windows' and `max-mini-window-height'.

Resync @menu order with @node order.

* doc/lispref/windows.texi (Windows): Sync @menu order with @node order.

* doc/lispref/sequences.texi (Sequence Functions): Copyedits.

Markup fixes for doc/lispref

* doc/lispref/control.texi (Pattern matching case statement):
* doc/lispref/positions.texi (List Motion):
* doc/lispref/streams.texi (Output Functions):
* doc/lispref/strings.texi (Text Comparison):
* doc/lispref/text.texi (Document Object Model):
Markup fixes.

Small doc markup fixes

* doc/lispref/control.texi (Pattern matching case statement):
* doc/lispref/os.texi (Desktop Notifications): Markup fixes.

* doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.

authors.el updates

* admin/authors.el (authors-obsolete-files-regexps)
(authors-ignored-files, authors-valid-file-names)
(authors-renamed-files-alist, authors-renamed-files-regexps):
Additions.

ChangeLog fixes

ChangeLog fixes

ChangeLog fixes

ChangeLog fix

TUTORIAL.es: Improve style consistency

* tutorials/TUTORIAL.es: Improve style consistency.

TUTORIAL.es: spelling fixes

* tutorials/TUTORIAL.es: Spelling fixes.

Handle glitch in delayed autoselection of windows.

* window.el (mouse-autoselect-window-position-1): New variable.
(mouse-autoselect-window-cancel)
(mouse-autoselect-window-select, handle-select-window): With
delayed autoselection select window only if mouse moves after
selecting its frame.

resolve ChangeLog merge conflict

Avoid compiler warning.

* nsimage.m (setPixmapData): Rename local variable bmRep to avoid
compiler warning.

Backport: Memory leak fix and 19133 fix.

Fixes: debbugs:19133
* nsimage.m (allocInitFromFile:): Initialize bmRep.
(dealloc): Release bmRep.
(setPixmapData): Make bmRep local so class member is not
set.

Fix bad bug number reference, shall be 19427.

Backport: Don't cache images in nsimage.m (Bug#18918).

Fixes: Bug#18918
* nsterm.h (EmacsImage): Remove imageListNext, refCount, reference,
imageListSetNext, imageListNext.

* nsimage.m (ImageList, imageListNext, imageListSetNext:)
(reference): Remove.
(allocInitFromFile:): Remove searching ImageList and calling
reference (Bug#18918).
(dealloc): Remove handling if ImageList.

* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
Use `tramp-rsh-end-of-line', it ought to be more robust.

eshell/esh-ext.el: Expand relative remote file names.

Fixes: debbugs:18782
* eshell/esh-ext.el (eshell-find-interpreter): Expand relative
remote file names.

* CONTRIBUTE: add Savannah url, cleanup announcing freeze.

Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi

Fixes bug#19299

* CONTRIBUTE: Move user-level information to doc/emacs/trouble.texi
  (commit messages): new, gathered from comments on emacs-devel
  (Changelog notes): add reference to GNU coding standards section 5.2;
  doc 'present tense', bug fix format
  (branches): freeze announcements are made on info-gnu-emacs mailing
  list
  (git vs rename): new

* doc/emacs/trouble.texi: Move user-level information from CONTRIBUTE here

* lisp/startup.el (fancy-about-text): change buttons for etc/CONTRIBUTE
  to (info "(emacs)Contributing")

Improve indexing on the chapter/section/subsection levels.

 doc/lispref/windows.texi (Recombining Windows): Index subject of sections.
 doc/lispref/variables.texi (Variables with Restricted Values)
 (Generalized Variables): Index subject of sections.
 doc/lispref/text.texi (Buffer Contents, Examining Properties)
 (Changing Properties, Property Search, Substitution): Index
 subject of sections.
 doc/lispref/syntax.texi (Motion and Syntax, Parsing Expressions)
 (Motion via Parsing, Position Parse, Control Parsing): Index
 subject of sections.
 doc/lispref/strings.texi (Predicates for Strings, Creating Strings)
 (Modifying Strings, Text Comparison): Index subject of sections.
 doc/lispref/searching.texi (Syntax of Regexps, Regexp Special)
 (Regexp Functions, Regexp Functions): Index subject of sections.
 doc/lispref/processes.texi (Subprocess Creation, Process Information): Index
 subject of sections.
 doc/lispref/positions.texi (Screen Lines): Index subject of sections.
 doc/lispref/nonascii.texi (Scanning Charsets, Specifying Coding Systems):
 Index subject of sections.
 doc/lispref/minibuf.texi (Text from Minibuffer, Object from Minibuffer)
 (Multiple Queries, Minibuffer Contents): Index subject of
 sections.
 doc/lispref/markers.texi (Predicates on Markers, Creating Markers)
 (Information from Markers, Moving Markers): Index subject of
 sections.
 doc/lispref/macros.texi (Defining Macros, Problems with Macros): Index
 subject of sections.
 doc/lispref/loading.texi (Loading Non-ASCII, Where Defined): Index subject
 of sections.
 doc/lispref/lists.texi (List-related Predicates, List Variables, Setcar)
 (Setcdr, Plist Access): Index subject of sections.
 doc/lispref/keymaps.texi (Controlling Active Maps, Scanning Keymaps)
 (Modifying Menus): Index subject of sections.
 doc/lispref/help.texi (Accessing Documentation, Help Functions): Index
 subject of sections.
 doc/lispref/hash.texi (Hash Access): Index subject of sections.
 doc/lispref/functions.texi (Core Advising Primitives)
 (Advising Named Functions, Porting old advices): Index subject of
 sections.
 doc/lispref/frames.texi (Creating Frames, Initial Parameters)
 (Position Parameters, Buffer Parameters, Minibuffers and Frames)
 (Pop-Up Menus, Drag and Drop): Index subject of sections.
 doc/lispref/files.texi (Visiting Functions, Kinds of Files)
 (Unique File Names): Index subject of sections.
 doc/lispref/display.texi (Refresh Screen, Echo Area Customization)
 (Warning Variables, Warning Options, Delayed Warnings)
 (Temporary Displays, Managing Overlays, Overlay Properties)
 (Finding Overlays, Size of Displayed Text, Defining Faces)
 (Attribute Functions, Displaying Faces, Face Remapping)
 (Basic Faces, Font Lookup, Fontsets, Replacing Specs)
 (Defining Images, Showing Images): Index subject of sections.
 doc/lispref/debugging.texi (Debugging, Explicit Debug)
 (Invoking the Debugger, Excess Open, Excess Close): Index subject
 of sections.
 doc/lispref/customize.texi (Defining New Types, Applying Customizations)
 (Custom Themes): Index subject of sections.
 doc/lispref/control.texi (Sequencing, Combining Conditions)
 (Processing of Errors, Cleanups): Index subject of sections.
 doc/lispref/compile.texi (Eval During Compile): Index subject of sections.
 doc/lispref/commands.texi (Using Interactive, Distinguish Interactive)
 (Command Loop Info, Classifying Events, Event Mod)
 (Invoking the Input Method): Index subject of sections.
 doc/lispref/buffers.texi (Buffer List, Buffer Gap): Index subject of sections.
 doc/lispref/backups.texi (Making Backups, Numbered Backups, Backup Names)
 (Reverting): Index subject of sections.
 doc/lispref/abbrevs.texi (Abbrev Tables, Defining Abbrevs, Abbrev Files)
 (Abbrev Expansion, Standard Abbrev Tables, Abbrev Properties)
 (Abbrev Table Properties): Index subject of sections.
 doc/lispref/os.texi (Time of Day, Time Conversion, Time Parsing)
 (Time Calculations, Idle Timers): Index subject of sections.

fix bad merge

Use a new user option instead of hard-coding shell display.

* lisp/shell.el (shell-display-buffer-actions): New user option.
(shell): Pass it to `pop-to-buffer' instead of hard-coding
`pop-to-buffer-same-window'.

(js-syntax-propertize-regexp): Recognize "slash in a character class"

Fixes: debbugs:19397
* lisp/progmodes/js.el (js--syntax-propertize-regexp-syntax-table): New var.
(js-syntax-propertize-regexp): Use it to recognize "slash in
a character class".

* lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.

Fixes: debbugs:19397

* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n"
as end-of-line delimeter for passwords, when running on MS Windows.

* net/tramp.el (tramp-read-passwd): Ignore errors from `auth-source-*'.

Fixes: debbugs:19396
* nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a
C one.

* lisp/progmodes/sh-script.el: Don't set global indent-line-function

Fixes: debbugs:19433
(sh-set-shell): Don't change the global value of indent-line-function.