* frame.el (make-frame-on-tty): Function deleted.

* server.el (server-create-tty-frame): Call make-frame directly.

(sh-ancestor-alist): Doc fix.

* progmodes/sh-script.el (sh-ancestor-alist): Doc fix.

Fix typos.

Gnus: Add explanations for recent changes to the code itself.

These are already documented in ChangeLog.

ERC: Do not include text properties when returning user input.

Update ChangeLogs.

Gnus: Fix edge cases with no data being returned and Courier eccentricity.

* lisp/gnus/nnimap.el (nnimap-retrieve-headers-progress): Handle edge
  case where `headers' is nil.  This can occur if the IMAP server does
  not have permissions to read messages from a folder, but can write new
  messages to the folder.
  (nnimap-request-article-part): Do not insert `data' if it is nil.

* lisp/net/imap.el (imap-parse-fetch): Courier can insert spurious blank
  characters which will confuse `read', so skip past them.

(authors-aliases): Addition.
(authors): Allow to use it for other projects.

(copyright-update-directory): Autoload.
Clarify MATCH argument.  Print filenames.

Fix typo.

* configure.bat: Untabify help message.

* NEWS: Tramp supports IPv6 addresses.

Fix copyright years.

(list_system_processes, system_process_attributes) [MSDOS]: Don't use the
default (no-op) implementation.

(ret_lim_data) [MSDOS]: New function.

(Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess)
(Qttname, Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime)
(Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs)
(Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime) [!subprocesses]: Define.
(syms_of_process) [!subprocesses]: Intern and staticpro them.
(Flist_system_processes, Fsystem_process_attributes) [!subprocesses]: Call
list_system_processes and system_process_attributes instead of returning Qnil.

(system_process_attributes, list_system_processes): New functions.

* net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
(tramp-smb-maybe-open-connection): Use `tramp-file-name-*'
methods.

* net/tramp.el (tramp-local-host-regexp)
(tramp-prefix-domain-format)
(tramp-prefix-domain-regexp, tramp-domain-regexp)
(tramp-user-with-domain-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-ipv6-regexp)
(tramp-postfix-ipv6-format, tramp-postfix-ipv6-regexp): New
defconst.
(tramp-file-name-structure, tramp-file-name-regexp-unified)
(tramp-completion-dissect-file-name, tramp-parse-hosts-group)
(tramp-dissect-file-name, tramp-make-tramp-file-name)
(tramp-completion-make-tramp-file-name): Handle IPv6 addresses.
(tramp-handle-insert-file-contents): Fix setting of
`buffer-read-only'.
(tramp-compute-multi-hops, tramp-local-host-p): Use
`tramp-local-host-regexp'.
(tramp-file-name-real-user, tramp-file-name-domain): Use
`tramp-user-with-domain-regexp'.

* net/dbus.el (dbus-string-to-byte-array): Handle empty array.

(parse_modifiers_uncached): Wheel events are clicks (bug#687).

* tramp.texi (Filename Syntax, Filename completion): Handle IPv6
addresses.

* trampver.texi.in (top): Declare ipv6prefix and ipv6postfix.

* configure.bat: New option --with-svg.

* INSTALL: Document experimental SVG support.

(proced-grammar-alist): Refiner can be a list (function help-echo)
instead of a cons pair.
(proced-post-display-hook): New variable.
(proced-tree-depth): Renamed from proced-tree-indent.
(proced-mode): Derive mode from special-mode.
(proced-mode-map): Changed accordingly.
(proced, proced-update): Run proced-post-display-hook.
(proced-do-mark-all): Count processes for which mark has been
updated.
(proced-format): Check for ppid attribute.
(proced-process-attributes): Take time and ctime attribute from
system-process-attributes.
(proced-send-signal): Doc fix.  Collect properly the info on
marked processes.  Use fit-window-to-buffer instead of
dired-pop-to-buffer.

(Choosing Window): Say that pop-up-frame-alist
works via the default value of pop-up-frame-function.

* w32term.c (x_query_colors, x_query_color): New functions.

* image.c (x_to_xcolors, png_load): Eliminate W32 specific code.
(svg_load_image): Cast returned pointers from dynamically loaded
functions.  Eliminate W32 specific code.

(vhdl-current-line): Don't hardcode point-min==1.

Remove spurious backspace.

(Scan Line Formats): Keep first column empty also for the cursor.

(Scan Line Formats): Indicate that first column should be kept empty.

* nsfns.m (x_set_foreground_color, x_set_background_color)
(x_set_cursor_color, x_set_icon_name, x_explicitly_set_name)
(x_set_title, x_set_icon_type, x_set_cursor_type): Rename to use
x_ prefix instead of ns_.  Update references.
(syms_of_nsfns): Add a FIXME comment.

* nsterm.m (x_set_cursor_type): New prototype.
(setValuesFromPanel): Use it instead of the old ns_ prefixed name.

(system_process_attributes): Provide Qtime and Qctime
for Solaris instead of incorrectly providing Qutime and Qcutime.

* bindings.el (mode-line-eol-desc): Fix typo in help message.
  (mode-line-client): Fix typo in help message and docstring.

*** empty log message ***

(image-library-alist): Add gobject library.

(System Processes): Document the `time' and `ctime' attributes of
`system-process-attributes'.

(process_times): Compute sum of utime and stime.
(system_process_attributes): Add Qtime to the alist.

(system_process_attributes): Compute Qtime and Qctime and add them to the alist.

Declare Qtime and Qctime.

(top level) <Qtime, Qctime>: New variables.
(syms_of_process): staticpro them.
(Fsystem_process_attributes): Add their documentation to the doc string.

(window-system-default-frame-alist)
(initial-frame-alist, minibuffer-frame-alist)
(pop-up-frame-alist, pop-up-frame-function)
(special-display-frame-alist): Rewrite and reformat doc-strings.

(Qgobject): New symbol.
(syms_of_image): Initialize it.
(init_svg_functions): Load some functions from gobject library.

(make_terminal_frame): Remove redundant code and useless
block.

(conv_sockaddr_to_lisp): Add workaround for
getsockname bug on BSD.

(main): Fatal if hard links cannot be created.

* movemail.c (main): Fatal if hard links cannot be created.

(minibuffer-default-add-shell-commands): Fix doc-string typo.

(x_create_tip_frame): Set border width of the X window.

* xfns.c (x_create_tip_frame): Set border width of the X window.

* display.texi (Face Attributes): Clarify :height attribute.

Remove obsolete comment.

(Finternal_set_lisp_face_attribute): Improve error message.

* xfaces.c (Finternal_set_lisp_face_attribute): Improve error
message.

Fix setting of composition-function-table.

(tibetan-composition-function): Remove unused function, obsoleted by
2008-09-05 change to tibetan.el.

* language/cham.el: Fix setting of composition-function-table.

* language/khmer.el: Fix setting of composition-function-table.

* language/tibet-util.el (tibetan-composition-function): Remove
unused function, obsoleted by 2008-09-05 change to tibetan.el.

(minibuffer-default): Add defvar.

* simple.el (minibuffer-default): Add defvar.

Require comint.

* hippie-exp.el: Require comint.

(x_new_font): Return font object, not fontset. (Bug#119)
Don't block input, as per earlier xterm.c changes.

(The Buffer List): Clarify what moves a buffer to
the front of the buffer list.  Add entries for `last-buffer' and
`unbury-buffer'.

(last-buffer): Don't set major mode of *scratch* if
that buffer exists already.  Rewrite doc-string.

(ns_appkit_version_str): Rename from ns_appkit_version.  (ns_appkit_version_int): New function.  (x-server-version): Use ns_appkit_version_int and follow 21+ convention of returning 3 integers

(tar-mode): Set write-contents-functions instead of
write-region-annotate-functions.
(tar-mode-write-contents): New function.
(tar-write-region-annotate): Remove.

(buffer-swapped-with): New var, moved from files.el.  Add advice to
basic-save-buffer to use it.

* pmail.el (buffer-swapped-with): New var, moved from files.el.
Add advice to basic-save-buffer to use it.

(basic-save-buffer): Revert 2008-12-22 change.
(buffer-swapped-with): Var removed.

* files.el (basic-save-buffer): Revert 2008-12-22 change.
(buffer-swapped-with): Var removed.

Define HAVE_OTF_GET_VARIATION_GLYPHS if libotf has
the function OTF_get_variation_glyphs.

(CHAR_VARIATION_SELECTOR_P): New macro.
(CHAR_SURROGATE_PAIR_P): New macro.

(font_range): Don't require a font for a variation
selector.
(Ffont_variation_glyphs): New function.
(syms_of_font): Defsubr it.

(ftfont_driver): Set the member get_variation_glyphs to
ftfont_variation_glyphs.
(setup_otf_gstring): New function.
(ftfont_drive_otf): Use it.
(ftfont_shape_by_flt): Handle variation selector.
(ftfont_variation_glyphs): New function.

(struct font_driver): New member get_variation_glyphs.

(compose-gstring-for-variation-glyph): New
function.  Register it in composition-function-table.

(lglyph-set-code): New function.

(tar-data-swapped): New var.
(tar-data-swapped-p, tar-swap-data):
Use it instead of buffer-swapped-with.
(tar-write-region-annotate): Re-add (partial undo of last change).
(tar-mode): Use it again (partial undo as well).

(install): Remove old directories in ns_appresdir before
moving new directories there.

(install-arch-dep): Remove old directories in
ns_app* before moving new directories there.

(table-capture): Fix symbol quoting typo.

* textmodes/table.el (table-capture): Fix symbol quoting typo.

(Vemacs_iconified): Remove.

(follow-select-if-visible): Improve the check for the
last line of the window.
(follow-post-command-hook): Perform redisplay in more circumstances,
to avoid getting point stuck on partially visible lines.

* follow.el (follow-select-if-visible): Improve the check for the
last line of the window.
(follow-post-command-hook): Perform redisplay in more circumstances,
to avoid getting point stuck on partially visible lines.

*** empty log message ***

(follow-calculate-first-window-start-from-below): Avoid looping
forever if vertical-motion returns an unexpected value.

(store_frame_param, x_get_arg): Enable newer code on
WINDOWSNT too, as related changes have already been synced.

* follow.el (follow-calculate-first-window-start-from-below): Avoid
looping forever if vertical-motion returns an unexpected value.

(Fvertical_motion): Don't advance iterator if we have reseated to the
desired position.

(move_it_to): Handle GET_FROM_STRETCH method when checking for pos
match.

* indent.c (Fvertical_motion): Don't advance iterator if we have
reseated to the desired position.

* xdisp.c (move_it_to): Handle GET_FROM_STRETCH method when
checking for pos match.

Minor doc fix.

(follow-calc-win-end): Use with-selected-window.
(follow-windows-start-end, follow-pos-visible)
(follow-windows-aligned-p): Code cleanup.
(follow-select-if-visible): Try to avoid partially-visible lines.
(follow-select-if-visible-from-first): Call follow-redisplay and
move point to destination.
(follow-redisplay): New arg, to keep selected window unchanged.
(follow-post-command-hook): In final check for destination
visibility, use window-start and window-end instead of the less
accurate follow-pos-visible.  If the selected window is redrawn,
tell follow-redisplay to preserve it.

* follow.el (follow-calc-win-end): Use with-selected-window.
(follow-windows-start-end, follow-pos-visible)
(follow-windows-aligned-p): Code cleanup.
(follow-select-if-visible): Try to avoid partially-visible lines.
(follow-select-if-visible-from-first): Call follow-redisplay and
move point to destination.
(follow-redisplay): New arg, to keep selected window unchanged.
(follow-post-command-hook): In final check for destination
visibility, use window-start and window-end instead of the less
accurate follow-pos-visible.  If the selected window is redrawn,
tell follow-redisplay to preserve it.

(server-running-p): Remove interactive spec.  Fix
regexp.

(follow-calc-win-start): Don't use `inline'.
(follow-update-window-start, follow-select-if-visible)
(follow-calculate-first-window-start-from-below)
(follow-post-command-hook): Code cleanup.
(follow-downward, follow-calculate-first-window-start): Function
deleted and merged into follow-redisplay.
(follow-redisplay): Merge code from follow-downward and
follow-calculate-first-window-start.

* follow.el (follow-calc-win-start): Don't use `inline'.
(follow-update-window-start, follow-select-if-visible)
(follow-calculate-first-window-start-from-below)
(follow-post-command-hook): Code cleanup.
(follow-downward, follow-calculate-first-window-start): Function
deleted and merged into follow-redisplay.
(follow-redisplay): Merge code from follow-downward and
follow-calculate-first-window-start.

Add reference to Bug#1718.