merge from trunk

Fix bug #15337 with non-ASCII characters in file names used by ansi

 lisp/term.el (term-emulate-terminal): Decode the command string
 before passing it to term-command-hook.

merge from trunk

doc/lispref/text.texi (Not Intervals): Minor wording fix.

merge from trunk

* lisp/erc/erc-desktop-notifications.el (dbus-debug): Declare.

merge from trunk

* lisp/gnus/mml2015.el (gnus-create-image): Autoload it.

* lisp/gnus/gnus-spec.el (gnus-xmas-format): Fix weird error call.

merge from trunk

* lisp/gnus/gnus-html.el (image-size): Declare.
(declare-function): Add compat stub for ancient Emacs.

* eshell/esh-util.el (ange-cache): Move declaration earlier.

merge from trunk

* lisp/eshell/esh-ext.el (eshell-search-path): Declare.

* lisp/eshell/em-prompt.el (eshell/pwd): Autoload it.
Otherwise an error occurs if eshell-dirs module not loaded.

Silence some url compilation warnings on systems without zlib

* url-http.el (url-handle-content-transfer-encoding):
* url-vars.el (url-mime-encoding-string): Silence compiler.

* lisp/progmodes/gdb-mi.el (gud-cont, gud-step): Declare.

merge from trunk

* cedet/semantic/ia.el (semantic-ia-complete-symbol-menu):
Comment it out, since it cannot work.

Fixes: debbugs:14522

merge from trunk

* net/tramp.el (tramp-check-proper-method-and-host): Rename it from
`tramp-check-proper-host'.  Check for a valid method name.

* net/tramp-adb.el (tramp-adb-maybe-open-connection):
* net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* net/tramp-sh.el (tramp-maybe-open-connection):
* net/tramp-smb.el (tramp-smb-maybe-open-connection): Call it.

* net/tramp-cache.el (tramp-cache-print): Don't print text properties
also for hash values.

* xterm.h (x_window_to_frame, x_any_window_to_frame)
(x_menubar_window_to_frame): Remove prototypes.
* xfns.c (x_window_to_frame, x_any_window_to_frame)
(x_menubar_window_to_frame, x_top_window_to_frame):
Move from here...
* xterm.c (x_window_to_frame, x_any_window_to_frame)
(x_menubar_window_to_frame, x_top_window_to_frame):
...to here and convert all but the last to static.

merge from trunk

* test/automated/eshell.el (with-temp-eshell): Use a temp directory
for eshell-directory-name.

It seems we don't have permission to write to HOME on hydra.

merge from trunk

ChangeLog typo fix

* test/automated/eshell.el (with-temp-eshell): Avoid hangs in batch mode
due to "has a running proces; kill it?" prompts.

* eshell/em-cmpl.el: Undo accidental part of last commit.

merge from trunk

* lisp/term/ns-win.el (parameters): Don't declare as dynamic.
(before-make-frame-hook): Don't add ineffective function.

* lisp/eshell/*.el: Use lexical-binding.
* test/automated/eshell.el: Move from test/eshell.el.
(eshell-test/for-loop, eshell-test/for-name-loop): New tests.

Fixes: debbugs:15231

merge from trunk

* lisp/cedet/semantic/find.el (semantic-find-first-tag-by-name):
Replace obsolete function assoc-ignore-case with assoc-string.

merge from trunk

lisp.mk (lisp): Add w32-common-fns.elc.

merge from trunk

merge trunk

composite.el (compose-gstring-for-graphic): Handle enclosing mark.

merge from trunk

Comments.

merge from trunk

* src/charset.c (char_charset): Document an exception for char-charset.

merge from trunk

* doc/lispref/functions.texi (Obsolete Functions): Add an index for obsolete functions.

merge from trunk

* doc/emacs/text.texi (Enriched Justification): Explain values of default-justification.

merge from trunk

* xterm.h (x_display_info): New field last_user_time...
* xterm.c (toplevel): ...to replace static last_user_time.
(handle_one_xevent, x_ewmh_activate_frame): Adjust users.

merge from trunk

Remove superflous comment

* vc/vc-dispatcher.el (vc-dir-refresh): Declare.

merge from trunk

* vc/vc-svn.el (vc-svn-retrieve-tag): Mark unused argument.

* vc/vc-svn.el (vc-svn-dir-status-files, vc-svn-dir-extra-headers)
(vc-svn-ignore): Mark unused arguments.

Revert part of previous vc-bzr change

gnus-icalendar small fix

* gnus/gnus-icalendar.el (gnus-icalendar-event--build-reply-event-body):
Avoid using `find', which i) might not be defined at runtime;
ii) does not work, since its default test is eql, not equal.
(gnus-mime-action-alist): Declare.

merge from trunk

* subr.el (do-after-load-evaluation): Also give compiler warnings
when obsolete files are used (except by obsolete files).

merge from trunk

* xterm.c (x_set_scroll_bar_thumb) [USE_LUCID && !HAVE_XAW3D]: Clip
scroll bar values to prevent thumb from disappear and update comment.

* vc/vc-svn.el (vc-svn-parse-status): If there are multiple files
in the status output, assume `filename' is the first.

Fixes: debbugs:15322

merge from trunk

* lisp/vc/vc.el (vc-deduce-fileset): Doc fix.

merge from trunk

Update some function declarations

* calc/calc-help.el (Info-goto-node):
* progmodes/cperl-mode.el (Info-find-node):
* vc/ediff.el (Info-goto-node): Update declarations.

merge from trunk

Silence some vc- compilation warnings

* vc/vc-bzr.el (vc-exec-after): Remove unused declaration.
(vc-compilation-mode): Declare.
(vc-bzr-pull): Require vc-dispatcher.

* vc/vc-git.el (vc-compilation-mode): Declare.
(vc-git-pull): Require vc-dispatcher.

* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Declare.

* lisp/progmodes/octave.el (help-button-action): Declare.

Fix some minor shell.el oddness related to usage of error and message

* lisp/shell.el (shell-directory-tracker): Output error as a message
rather than just returning it as a string.
(shell-process-pushd): Remove useless use of message.

Use with-demoted-errors now that it can format any error messages

* dframe.el (dframe-timer-fn):
* files.el (dir-locals-read-from-file):
* mpc.el (mpc--status-timer-run, mpc--status-idle-timer-run, mpc-format):
* reveal.el (reveal-post-command):
* saveplace.el (load-save-place-alist-from-file):
* shell.el (shell-resync-dirs):
* w32-common-fns.el (x-get-selection-value):
* emacs-lisp/copyright.el (copyright-find-copyright):
* emacs-lisp/eldoc.el (eldoc-print-current-symbol-info):
* emulation/tpu-edt.el (tpu-copy-keyfile):
* play/bubbles.el (bubbles--mark-neighbourhood):
* progmodes/executable.el (executable-make-buffer-file-executable-if-script-p):
* term/pc-win.el (x-get-selection-value): Use with-demoted-errors.

merge from trunk

Cleanup Eshell to rely less on dynamic scoping.
* lisp/eshell/esh-opt.el (eshell-eval-using-options): Don't bind usage-msg,
last-value, and ext-command here.  Bind `args' closer to `body'.
(temp-args, last-value, usage-msg, ext-command, args): Don't defvar.
(eshell--args): Declare new dynamic var.
(eshell-do-opt): Add argument `args'.  Bind our own usage-msg,
last-value, and ext-command.  Pass `args' to `body'.
(eshell-process-args): Bind eshell--args.
(eshell-set-option): Use eshell--args.
* lisp/eshell/eshell.el (eshell): Use derived-mode-p.
* lisp/eshell/esh-var.el (eshell-parse-variable): Use backquote.
(eshell-parse-variable-ref): Remove unused vars `end' and `err'.
(eshell-glob-function): Declare.
* lisp/eshell/esh-util.el: Require cl-lib.
(eshell-read-hosts-file): Avoid add-to-list.
* lisp/eshell/esh-cmd.el (eshell-parse-lisp-argument): Remove unused var
`err'.
* lisp/eshell/em-unix.el (compilation-scroll-output, locate-history-list):
Declare.
(eshell/diff): Remove unused var `err'.
* lisp/eshell/em-rebind.el (eshell-delete-backward-char): Remove unused arg
`killflag'.
* lisp/eshell/em-pred.el (eshell-parse-modifiers): Remove unused var `err'.
* lisp/eshell/em-ls.el (eshell-ls-highlight-alist): Move defvars before
first use.
* lisp/eshell/em-glob.el (eshell-glob-matches, message-shown):
Move declaration before first use.
* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias): Use backquotes.
* autorevert.el (auto-revert-notify-handler): Use `cl-dolist' since we
rely on cl-return.

merge from trunk

* lisp/autorevert.el (auto-revert-notify-handler): Use `cl-dolist' since we
rely on cl-return.

merge from trunk

* lisp/term/ns-win.el (global-map): Remove binding for ispell-next,
deleted 1999-05-29.

Fixes: debbugs:15357

merge from trunk

Character properties fix in lispref.

* doc/lispref/nonascii.texi (Character Properties): Character properties fix
for decimal-digit-value and digit-value.

merge from trunk

Comment

* lisp/play/landmark.el: Yet more typo fixes.

* lisp/echistory.el (electric-command-history): Remove call to deleted func.

* lisp/play/landmark.el (landmark-mode): Fix typos.

* lisp/vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.
Check cvs-sort-ignore-file is bound.

merge from trunk

* src/emacs.c (usage_message): Possessive apostrophe tweak.

Likewise in some comments.

* lisp/savehist.el: No need for cl when compiling on Emacs.

merge from trunk

* nsterm.m (syms_of_nsterm): Use Qns.
* w32fns.c (Fx_open_connection): Remove old '#if 0' code.
* w32term.c (w32_create_terminal, syms_of_w32term): Use Qw32.
* xfns.c (x_display_info_for_name, Fx_open_connection):
Remove old '#if 0' code.
(syms_of_xfns): Use Qx.

* lisp/eshell/esh-mode.el (eshell-mode-syntax-table): Fix up initialization.
(eshell-self-insert-command, eshell-send-invisible): Remove
unused argument.
(eshell-handle-control-codes): Remove unused var `orig'.
Avoid delete-backward-char.

Fixes: debbugs:15338

merge from trunk

Minor fixes for ido.texi.

* doc/misc/ido.texi (Interactive Substring Matching): Use @key{RET}
instead of @kbd{RET}.
(Prefix Matching): Add an index.

* termhooks.h (fullscreen_hook): Remove the leftover.
(struct terminal): Fix typo in comment.

merge from trunk

Cleaning up a few X scroll bar bits.
* termhooks.h (enum scroll_bar_part): Add scroll_bar_nowhere member.
* xterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS && USE_LUCID]:
New member last_seen_part, going to replace...
* xterm.c [USE_TOOLKIT_SCROLL_BARS]: ...global last_scroll_bar_part.
(xt_action_hook) [USE_LUCID]: Adjust user.
(xm_scroll_callback, xg_scroll_callback): Do not bloat with
Lucid-specific scroll bar support.
(xaw_jump_callback, xaw_scroll_callback): Prefer enum scroll_par_part
to int and adjust to use last_seen_part member.
(x_set_toolkit_scroll_bar_thumb) [USE_LUCID]: Adjust user.
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS && USE_LUCID]:
Initialize last_seen_part.

merge from trunk

* lisp/files.el (set-auto-mode): Simplify a bit further.

* src/insdel.c (insert_from_buffer_1): Don't mark buffer as modified when
insert-buffer-substring an empty string.

merge from trunk