backport: erc bugfixes

* bytecomp.el (byte-compile-report-error): Allow the argument to be a string.
Due to the vague doc, it was already being used this way.

* nsterm.m (ns_set_vertical_scroll_bar): Don't call bar setPosition: unless
needed (Bug#18757).

Fixes: debbugs:18993

Attempt to fix NS hang.  Will probably cause merge conflicts.

* nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA.
(run): Ditto.  Only use non-system event loop if OSX version is
exactly 10.9.

Fixes: debbugs:18993

Backport Tramp changes from trunk.

* tramp.texi (Inline methods): Remove restriction on "telnet".
Recommend sharing ssh connections for "plink".
(External methods): Remove "sftp".  Merge "pscp" and "psftp"
descriptions.  Recommend sharing ssh connections.  Add "nc" method.
(GVFS based methods): Add "sftp".
(Customizing Completion, External packages, Issues): Use @dots{}.
(Remote shell setup): Explain, how to change command line
arguments of remote "nc" listener.

* trampver.texi: Update release number.

Backport Tramp changes from trunk.

* automated/tramp-tests.el (tramp-remote-process-environment):
Declare.
(tramp--test-enabled): Ignore errors.
(tramp--instrument-test-case): Extend docstring.  Print debug
buffer in any case.
(tramp-test15-copy-directory): Skip for tramp-smb.el.
(tramp-test21-file-links): Use `file-truename' for directories.
(tramp-test26-process-file): Extend test according to Bug#17815.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Retrieve process output more robustly.
(tramp-test29-vc-registered): Set $BZR_HOME.
(tramp--test-check-files): Extend test with `substitute-in-file-name'.
(tramp-test30-special-characters): Skip for tramp-adb.el,
tramp-gvfs.el and tramp-smb.el.  Add further file names.

* net/tramp.el (tramp-check-cached-permissions): Include hop in
the constructed Tramp file name.

Fixes: debbugs:18943

* callproc.c (encode_current_directory): Encode dir at the end.

* lisp/emulation/cua-base.el (cua--select-keymaps): Use region-active-p.
(cua-set-mark, cua--pre-command-handler-1,cua--post-command-handler-1):
* lisp/emulation/cua-gmrk.el (cua-cancel-global-mark): Same.

Fixes: debbugs:18952

* src/callproc.c (encode_current_directory): Fix thinko in previous.

* callproc.c (encode_current_directory): Support handling of file
names prepended by "/:".

Fixes: debbugs:18891

* files.el (file-name-non-special): Wrap the call of
`insert-file-contents' by `unwind-protect', in order to set the
buffer's file name anyway.

Fixes: debbugs:18891

doc/misc/eww.texi: Fix a typo and improve wording of last commit.

Backport from trunk documentation of shr-color-visible-* variables.

 doc/misc/eww.texi (Advanced): Document increasing contrast with
 shr-color-visible-distance-min and shr-color-visible-luminance-min.

epg: Adjust to GnuPG 2.1 key listing change

* epg.el (epg--list-keys-1): Ignore fields after the 15th field
(bug#18979).  Reported by Hideki Saito.

Backported from trunk.

* src/syntax.c (back_comment): Fix off-by-one error.

Fixes: debbugs:18022

* src/xgselect.c (xg_select): Use g_main_context_acquire.

Fixes: debbugs:18861

Backport fix to bug #18749 to Emacs-24 branch.

Fix wrong bound to c-font-lock-declarators.  Fixes bug #18948.
progmodes/cc-fonts.el (c-font-lock-declarations): Pass "(point-max)" as
bound to c-font-lock-declarators, not "limit", as the buffer is sometimes
narrowed to less than "limit" (e.g., in the presence of macros).

* net/tramp-adb.el (tramp-adb-handle-file-attributes):
* net/tramp-gvfs.el (tramp-gvfs-handle-file-attributes):
* net/tramp-sh.el (tramp-sh-handle-file-attributes): Return nil in
case of errors.

* net/tramp.el (tramp-error-with-buffer): Show connection buffer
only when message appeared in minibuffer.

Fixes: debbugs:18891

* dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name
raises an error.

Fixes: debbugs:18891

* Makefile.in (install-info, uninstall): Restore pre-2012-12-13  solution
Do not merge to trunk.

Fixes: debbugs:18908

* lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.

Fixes: debbugs:18936

Fix error messages from jit-stealth-lock when load-average returns nil.

 lisp/jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
 returned by load-average.

* net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use
a local copy; setting `inhibit-file-name-handlers' proper might be
more performant.

Fixes: debbugs:18751

* lisp/mail/emacsbug.el (report-emacs-bug): Simplify interactive spec.

* lisp/mail/emacsbug.el (report-emacs-bug): No longer include recent-keys

Fixes: debbugs:18900

NEWS and comment trivia re crisp.el

src/window.c (window_scroll_pixel_based): Fix a typo in a comment.

Fix minor issues with functions that dump glyph matrices.

 src/xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix.
 (Fdump_frame_glyph_matrix): Don't segfault if invoked on a GUI
 frame; instead, print an error message.

* net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a
local copy of FILENAME, when it is remote.

Fixes: debbugs:18751

* nsfns.m (ns_set_doc_edited): Check for FRAME_NS.

Fixes: debbugs:18925

* net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise
an error when the command fails; the return code must indicate.
(tramp-adb-send-command-and-check): Fix docstring.

* doc/emacs/programs.texi (Misc for Programs): Fix typo.

ChangeLog simplification

* net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Check, that `tramp-cache-get-count-*'
and `tramp-cache-set-count-*' are bound.  Otherwise, there might
be compiler warnings.

* net/tramp-sh.el (tramp-get-remote-uid, tramp-get-remote-gid):
Return -1 respective "UNKNOWN", if uid or gid cannot be determined.

Fix bug #18856 with failure to fontify compilation buffers.

 lisp/progmodes/compile.el (compilation-mode): Turn off deferred
 fontifications locally.

* net/tramp-sh.el (tramp-send-command): Fix the case where the
remote-echo connection property is non-nil.

Fixes: debbugs:18858

Backport Tramp changes from trunk.

* net/tramp-adb.el (tramp-adb-sh-fix-ls-output): Use `bolp'.
(tramp-adb-handle-write-region): Improve messages.
(tramp-adb-maybe-open-connection): Don't set
`tramp-current-*' variables.

* net/tramp-cache.el (tramp-flush-file-function): Simplify check.
Suppress debug messages.

* net/tramp-ftp.el (top): Remove special handling for URL syntax.
(tramp-ftp-file-name-handler):

* net/tramp-gvfs.el (tramp-gvfs-methods) <sftp>: Add.
(tramp-gvfs-methods-mounttracker)
(tramp-gvfs-mountlocation-signature): Check `tramp-gvfs-enabled'
during initialization.
(tramp-gvfs-handle-delete-file): Flush file properties, not
directory properties.
(tramp-gvfs-handle-file-attributes): Use `string-to-number' when
reading "unix::mode".
(tramp-gvfs-handle-file-name-all-completions):
Use "-h" option for "gvfs-ls".
(tramp-gvfs-url-file-name): Apply `cons' where appropriate.
`user' and `localname' could be nil.
(tramp-gvfs-send-command): Simplify traces.

* net/tramp-sh.el (vc-handled-backends, vc-bzr-program)
(vc-git-program, vc-hg-program): Declare.
(tramp-methods) <sftp>: Remove.  It has never worked satisfactorily.
(tramp-methods) <nc>: Add new method.
(tramp-methods) <telnet>: Redirect stderr to "/dev/null".
(tramp-methods) <plink, plinkx, pscp, psftp>: Improve
`tramp-login-args'.
(tramp-default-user-alist): Add "nc".
(top): Remove completion function for "sftp".  Add completion
functions for "nc" and "psftp".
(tramp-sh-handle-set-visited-file-modtime):
(tramp-sh-handle-verify-visited-file-modtime): Use `point-at-eol'.
(tramp-do-copy-or-rename-file-out-of-band):
Use cached "remote-copy-args" value, if available.  (Bug#18199)
Tweak docstring.  Implement support for "nc" method.
(tramp-sh-handle-expand-file-name, tramp-local-coding-commands)
(tramp-remote-coding-commands, tramp-call-local-coding-command):
Tweak docstring.
(tramp-sh-handle-start-file-process): Expand `default-directory'.
(tramp-sh-handle-write-region): Tweak error message.
(tramp-sh-handle-vc-registered): Remove backends when the remote
binary does not exist.
(tramp-open-connection-setup-interactive-shell):
Prefer utf-8 coding.  (Bug#17859)
(tramp-find-inline-encoding): Do not raise an error.
(tramp-make-copy-program-file-name): Tweak docstring.  Handle also
the "nc" case.  Quote result also locally.
(tramp-get-remote-id): Check also for "gid".
(tramp-get-remote-python):

* net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-set-file-acl): Use `start-process'.
(tramp-smb-handle-insert-directory): Use progress reporter.
(tramp-smb-handle-rename-file): Flush also file properties of
FILENAME.

* net/tramp.el (tramp-methods): Tweak docstring.
(tramp-file-name-handler): Apply `cons' where appropriate.
(tramp-handle-file-accessible-directory-p): Check for
`file-readable-p' instead of `file-executable-p'.
(tramp-handle-shell-command): Use `display-buffer'.  (Bug#18326)
(tramp-handle-unhandled-file-name-directory): Return "/".
(tramp-check-cached-permissions):
Use `tramp-compat-file-attributes'.
(tramp-call-process): Add new argument VEC.  Adapt callees in all
tramp*.el files.

* net/trampver.el: Update release number.

Auto-commit of loaddefs files.

* lisp/simple.el (newline): Add assertions to try and help catch bug#18913.

* macfont.m (macfont_glyph_extents): Turn off syntetic bold
if force_integral_p (i.e. no antialias).
(macfont_draw): Check ns_antialias_text, also turn off syntetic
bold if no antialias.

Fixes: debbugs:18876

* lisp/emulation/cua-base.el (cua-delete-region): Use delete-active-region.
(cua--last-deleted-region-pos, cua--last-deleted-region-text): Remove.

Fixes: debbugs:18886

* emacs.c (main): Don't chdir to $HOME on Cocoa if --chdir was given.

Fixes: debbugs:18846

admin/ChangeLog: Fix a typo.

Minor fixes in the changes in preparation for git migration.

 src/Makefile.in (repo-update): Fix a typo and slightly reword
 commentary.

 admin/notes/repo (Notes): Reword the stylistic guidance for commit log
 messages so that they are in line with Emacs development practices
 and style guidance.

Yet another change for git migration backported from trunk.

 lisp/version.el (emacs-bzr-version, emacs-bzr-get-version):
 Revert 2014-10-31 change.

Backport from trunk more changes in preparation for git migration.

 admin/notes/bzr: Renamed to notes/repo, reorganixed to separate
 VCS-dependent from VCS-independent stuff.  Added guidance about
 commit-comment format under DVCSes.
 admin/notes/BRANCH: Merged into notes/repo.

 lisp/version.el: Fix some fallback values to conform to the actual
 release number.

Backport changes in preparation for git migration from trunk.

 admin: Changes in several documents.
 autogen.sh: Neutralize language specific to a repository type.

 doc/misc/efaq-w32.texi: Neutralized language specific to a repository type.

 doc/misc/gnus-coding.txt: Neutralized language specific to a repository type.

 lisp/Makefile.in: Change some production names so they're neutral
 about the repository type.

* lisp/progmodes/vhdl-mode.el: Doc grammar fixes.

* etc/emacs.desktop: Add "Keywords".

* doc/man/emacsclient.1: Tiny markup fix

Restore cua-delete-copy-to-register-0 and M-v command.
* lisp/delsel.el (delete-selection-save-to-register)
(delsel--replace-text-or-position): New vars.
(delete-active-region): Use them.
(delete-selection-repeat-replace-region): New command, moved from
cua-base.el.
* lisp/emulation/cua-base.el (cua--repeat-replace-text): Remove var.
(cua-repeat-replace-region): Move command to delsel.el.
(cua--init-keymaps): Update binding accordingly.
(cua-mode): Set delete-selection-save-to-register.

Fixes: debbugs:18886

* nsfns.m (ns_set_doc_edited): Do all logic (check frames) here
instead of in xdisp.c, function now takes void.

* nsterm.h (ns_set_doc_edited): Declare taking no args.

* xdisp.c (prepare_menu_bars): Remove HAVE_NS code.
(redisplay_internal): Call ns_set_doc_edited if HAVE_NS (Bug#18884).

* nsfns.m (x_icon): icon_top/left is int.

* nsterm.h (EmacsScroller): Replace Lisp_Object win with
struct window*.
Remove getMouseMotionPart.
(ns_output): Make icon_top/left int.

* nsterm.m (ns_mouse_position): Remove unused code.
(initFrame:window:, dealloc): Use window instead of win.
(getMouseMotionPart:window:x:y:): Remove, unused.
(sendScrollEventAtLoc:fromEvent:): Make Lisp_Object win from window.

Fixes: debbugs:18889

* src/unexmacosx.c (copy_data_segment): Port to GCC 4.6+ (backport)

Fixes: debbugs:9927

* lisp/progmodes/cc-defs.el (c--macroexpand-all): New function.
(c-lang-defconst):
* lisp/progmodes/cc-langs.el (c-make-init-lang-vars-fun): Use it.

Fixes: debbugs:18845

ChangeLog date fix

NEWS fixes

* doc/misc/efaq.texi (Gnus does not work with NNTP): Remove; ancient

Fix bug #18874 with rgrep not obeying grep-scroll-output.

 lisp/progmodes/compile.el (compilation-start): If
 compilation-scroll-output is non-nil, don't force window-start of
 the compilation buffer to be at beginning of buffer.

Fix bug #18873 with non-ASCII characters in user's HOME directory.

 src/fileio.c (Fexpand_file_name): Use make_unibyte_string, not
 build_string, when importing a home directory.

[Backport] gnus.el (gnus-mode-line-buffer-identification):
Don't add image data for a non-graphic display;
Don't shadow load-path, it blocks autoloading of find-image (bug#18813)

[Backport] lisp/gnus/nnimap.el (nnimap-wait-for-response): Ignore NOOP response requested to keep connection open

* README.W32 (Preliminaries): Don't assume that this file is at
the top level.
(Setting up Emacs): Minor rewording to be more accurate.

Backported from trunk.

Fix bug #18839 with incorrect image size returned by posn-at-point.

 src/dispnew.c (buffer_posn_from_coords): Use
 WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
 account for the header-line height.

Improve documentation of faces in the user manual.

 doc/emacs/frames.texi (Scroll Bars): Improve indexing of faces.
 doc/emacs/killing.texi (Secondary Selection): Improve indexing of faces.
 doc/emacs/search.texi (Basic Isearch, Query Replace): Improve indexing of
 faces.
 doc/emacs/display.texi (Standard Faces, Text Display)
 (Useless Whitespace): Improve indexing of faces.

Backport latest doc-view fix

* doc/emacs/misc.texi (Document View): Adapt to latest doc-view changes wrt
viewing the document's plain text contents.  [Backport]

* lisp/doc-view.el (doc-view-open-text): View the document's plain text
in the current buffer instead of a new one.
(doc-view-toggle-display): Handle the case where the current
buffer contains the plain text contents of the document.
(doc-view-initiate-display): Don't switch to fallback mode if the
user wants to view the doc's plain text.  [Backport]

Document in the user manual variables that allow pixelwise resizing.

 doc/emacs/frames.texi (Frame Commands): Document and index
 'frame-resize-pixelwise'.
 doc/emacs/windows.texi (Split Window): Document and index
 'window-resize-pixelwise'.

Fix bug #18760 with incorrect decoding of tutorial for "About Emacs" screen.

 lisp/startup.el (fancy-about-text): Read the entire tutorial, not
 just its first 256 bytes.

* lisp/emacs-lisp/bytecomp.el: Require cl-extra.
* lisp/emacs-lisp/cl-extra.el: Add missing provide.

Fixes: debbugs:18804

* Makefile.in (${srcdir}/info/dir): Make sure info directory exists (backport)

etc/DEBUG: Improve instructions for debugging infinite loops.

* lisp/emacs-lisp/bytecomp.el (byte-compile-and-folded): Optimize case where
all args are copyable.
(=, <, >, <=, >=): Re-enable the optimization.

Fixes: debbugs:18767

* configure.ac: Bump version to 24.4.51 to avoid ambiguity with the old
trunk's 24.4.50.

* xdisp.c (erase_phys_cursor): Fix confusion between window-relative and text area-relative x-coordinates.  [Backport]

* xdisp.c (draw_glyphs): Set clipping to highlight boundaries.  [Backport]

Bump Emacs version to 24.4.50.

* lisp/vc/vc-hg.el (vc-hg-log-graph): New var.
(vc-hg-print-log): Use it.
(vc-hg-root-log-format): Include branch name and bookmarks; ignore
graph output.

Fixes: debbugs:17515

* lisp/vc/diff-mode.el (diff-refine-changed): Rename from
`diff-refine-change' for consistency with `diff-changed'.
(diff-refine-change): Add obsolete face alias.
* lisp/vc/smerge-mode.el (smerge-refined-changed): Rename from
`smerge-refined-change'.
(smerge-refined-change): Add obsolete face alias.
[Backport]

Fixes: debbugs:10181

* lisp/url/url-vars.el (url-bug-address): Make into an obsolete alias.
* lisp/url/url-http.el (url-http-handle-authentication):
* lisp/url/url-news.el (url-news-fetch-message-id):
Use M-x report-emacs-bug in help messages.  [Backport]

* lisp/subr.el (call-process-shell-command, process-file-shell-command):
Make the `args' obsolete.
(start-process-shell-command, start-file-process-shell-command):
Use `declare'.

Fixes: debbugs:18409

* lisp/skeleton.el (skeleton-autowrap): Mark as obsolete.  [Backport]

* lisp/dired.el (dired-read-regexp): Make obsolete.  [Backport]
(dired-mark-files-regexp, dired-mark-files-containing-regexp)
(dired-flag-files-regexp):
* lisp/dired-aux.el (dired-mark-read-regexp):
* lisp/dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.

* lisp/progmodes/python.el (inferior-python-mode): Use add-hook.

* list/emulation/viper: Add some FIXME comments.

* doc/misc/eieio.texi (Accessing Slots, CLOS compatibility): Adjust wording
since `setf' is in core rather than in CL nowadays.

* lisp/Makefile.in (AUTOGEN_VCS): Remove emulation/tpu-edt.el.  [Backport]

* erc/erc-track.el: Docstring fixes.

Make most emulation packages obsolete.  [Backport]

* emulation/crisp.el, emulation/tpu-edt.el, emulation/tpu-extras.el:
* emulation/tpu-mapper.el, emulation/vi.el, emulation/vip.el:
* emulation/ws-mode.el: Move to obsolete/.
* doc/emacs/ack.texi (Acknowledgments): Remove some obsolete items.
* doc/emacs/misc.texi (Emulation): Remove section.
* doc/lispintro/emacs-lisp-intro.texi (Autoload): Update loaddefs.el details.
* doc/misc/efaq.texi (Finding a package with particular functionality):
Update example.
* doc/misc/vip.texi: Mention this is obsolete.

* src/minibuf.c (history-length): Increase default from 30 to 100.
* lisp/cus-start.el (history-length): Bump :version.  [Backport]

* lisp/obsolete/cc-compat.el: Make obsolete.

Fixes: debbugs:18561

* lisp/epg-config.el (epg-gpg-program): Don't use the absolute names by default.

* src/xdisp.c (redisplay_window): Re-run pre-redisplay-function after we
move point.

Restore temporarily reverted bytecomp change

* lisp/emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg case.

Fixes: debbugs:18767

Add 24.4 release ChangeLog entries

Temporarily revert previous bytecomp change

* lisp/emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
case.

Fixes: debbugs:18767

Regenerate ldefs-boot

Fix display on X of 1-pixel R2L characters.

 src/xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on
 1-pixel R2L characters.
 Reported by Dmitry Antipov <dmantipov@yandex.ru>, see
 http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00518.html.