(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.

* proced.el (proced-tree-flag): Fix typo in docstring.

(copy_text): To convert a non-ASCII char to unibyte,
just get the low 8-bit of the code.

(font_intern_prop): Validate str as multibyte.

*** empty log message ***

(pmail-edit-mode): Bind buffer-swwapped-with to nil.
(pmail-edit-current-message): Save all of buffer as old text.
Clear undo list.
(pmail-cease-edit): Widen first.
Operate in the view buffer; copy edited text back to mbox buffer
and re-encode what was decoded to display the message.
(pmail-abort-edit): Widen first.

(pmail-forwarded-attr-index): Doc fix.
(pmail-resent-attr-index): New variable.
(pmail-attr-array): Add r for resent.
(pmail-add-mbox-headers): Make 8 attributes.
(pmail-set-attribute): Extend attribute line if necessary.

(pmail-widen): New command.
(pmail-mode-map): o is pmail-output, C-o is pmail-output-as-seen,
(pmail-mode-map): c-w is pmail-widen.
(pmail-change-major-mode-hook): Do nothing unless buffer-swapped-with.
(pmail-show-message): Downcase character-coding.

(pmail-output-decode-coding): New variable.
(pmail-delete-unwanted-fields): Greatly simplified.
(pmail-output-as-babyl): New function.
(pmail-convert-to-babyl-format): Considerably simplified:
assume just one message and don't worry about Content-Type.
(pmail-output-as-mbox): New function.
(pmail-output): Total rewrite.
(pmail-output-as-seen): New command.
(pmail-output-read-pmail-file-name): Function deleted.
(pmail-output-to-babyl-file): Function deleted.
(pmail-output-body-to-file): Don't set an attribute.

Add bug reference.

(proced-temp-alist): Renamed from variable proced-children-alist.
(proced-process-tree, proced-toggle-tree): Fix docstring.
(proced-tree): Fix docstring.  Simplify.  Use proced-temp-alist.
(proced-temp-internal): Use proced-temp-alist.

(mkdir): New defalias.

(struct face): Move lface and hash from the middle
of bitfields.

(INTERVALS_H): Rename from INTERVAL_SRC, update all users.

(INTERVAL_SRC): Also depend on dispextern.h.
(coding.o, dispnew.o, keymap.o, msdos.o): Depend on INTERVAL_SRC
instead of intervals.h.

(Fill Commands): Replace `M-s' with `M-o M-s'.

(Minibuffer History): Add a link to `Isearch Minibuffer'.

(proced-mode-map): Bind " " to next-line instead of the
command `proced-next-line' removed on 2008-09-06.

Add `butterfly'.

(butterfly): Doc fix.  Add `animate-string' and `browse-url'.

(butterfly): New command.

(reftex-isearch-switch-to-next-file):
Use `find-file-noselect' instead of `find-file' (for Emacs 22 and 23).
(reftex-isearch-minor-mode): If `multi-isearch-next-buffer-function'
is bound set it to `reftex-isearch-switch-to-next-file'.  Otherwise,
set 4 obsolete variables for backward-compatibility with Emacs 22.

(multi-isearch-next-buffer-function): Doc fix.
(multi-isearch-search-fun): Set the second arg WRAP to nil explicitly.

(proced-grammar-alist): Allow predicate nil.  New attribute tree.
(proced-format-alist): Use attribute tree.
(proced-tree-flag, proced-tree-indent): New variables.
(proced-children-alist): Renamed from proced-process-tree.  PPID
must refer to a process in process-alist.  Ignore PPIDs that equal
PID.  Children alist inherits sorting order from process-alist.
(proced-process-tree): New variable.  New function.
(proced-process-tree-internal, proced-toggle-tree)
(proced-tree, proced-tree-insert, proced-format-tree): New
functions.
(proced-mark-process-alist): Add docstring.
(proced-filter-parents): PPID must refer to a process in
process-alist.  Ignore PPIDs that equal PID.
(proced-sort): Throw error if attribute is not sortable.
(proced-sort-interactive): Restrict completion to sortable
attributes.
(proced-format): Include tree in standard attributes if
proced-tree-flag is non-nil.  Make header clickable only if
corresponding predicate is non-nil.
(proced-update): Use proced-tree.

(Goto Address mode): Rename from Goto-address.  Refer to
goto-address-mode instead of goto-address.

(Top): Update node listing.

(Rmail Display): Goto-address renamed to Goto Address mode.

* rmail.texi (Rmail Display): Goto-address renamed to Goto Address
mode.

* misc.texi (Goto Address mode): Rename from Goto-address.  Refer to
goto-address-mode instead of goto-address.

(diff): Doc fix.

* diff.el (diff): Doc fix.

(rx): Doc fix.

* emacs-lisp/rx.el (rx): Doc fix.

(move-file-to-trash): Bind backup-directory-alist to nil before
uniquifying backup trash file name.

* files.el (move-file-to-trash): Bind backup-directory-alist to nil
before uniquifying backup trash file name.

(vc-git-dir-printer): Fix filename column.

(Top): Add @detailmenu items for "Multiple Terminals" and its subsections.

(Multiple Terminals, Low-level Terminal)
(Terminal Parameters, Frames on Other TTY devices): New sections.
(Frames): Add an xref to "Multiple Terminals".

(term-emulate-terminal): Decode substring just prior to
inserting it, i.e. revert part of the 2008-09-24 change. (Bug#1469)

Remove non-working entry for pmail.
(fill-column): Fix typo.
(change-log-mode): Add fill column.

(Top): Add @detailmenu item for "Terminal Type".

(Terminal Type): New node.
(Editing Types): Add it to the menu.

(Top): Add a @detailmenu item for "Directory Local Variables".

(Directory Local Variables): New node.

(Autoload): Document `generate-autoload-cookie' and `generated-autoload-file'.

(MH_E_DIR): New variable.
($(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-comp.elc)
($(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-funcs.elc)
($(MH_E_DIR)/mh-identity.elc $(MH_E_DIR)/mh-inc.elc)
($(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-letter.elc)
($(MH_E_DIR)/mh-limit.elc $(MH_E_DIR)/mh-mime.elc)
($(MH_E_DIR)/mh-print.elc $(MH_E_DIR)/mh-scan.elc)
($(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc)
($(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-speed.elc)
($(MH_E_DIR)/mh-thread.elc $(MH_E_DIR)/mh-tool-bar.elc)
($(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc)
($(MH_E_DIR)/mh-e.elc $(MH_E_DIR)/mh-limit.elc): New dependencies.

($(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-comp.elc)
($(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-funcs.elc)
($(MH_E_DIR)/mh-identity.elc $(MH_E_DIR)/mh-inc.elc)
($(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-letter.elc)
($(MH_E_DIR)/mh-limit.elc $(MH_E_DIR)/mh-mime.elc)
($(MH_E_DIR)/mh-print.elc $(MH_E_DIR)/mh-scan.elc)
($(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc)
($(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-speed.elc)
($(MH_E_DIR)/mh-thread.elc $(MH_E_DIR)/mh-tool-bar.elc)
($(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc)
($(MH_E_DIR)/mh-e.elc $(MH_E_DIR)/mh-limit.elc): New dependencies.

(Directory Variables): Fix wording of last change.

(dosified-file-name): Declare.

(keymap-canonicalize): Properly preserve keymap prompt.

(tar-swap-data): New function.
(tar-change-major-mode-hook): Use it instead of buffer-swap-text.
(tar-mode-revert): Likewise.
(tar-mode): Likewise.  Don't set write-region-annotate-functions.
(tar-data-swapped-p): Test buffer-swapped-with.
(tar-write-region-annotate): Remove.
(tar-header-block-tokenize): Add argument `coding' and use it
instead of tar-file-name-coding-system.
(tar-summarize-buffer): Pass tar-file-name-coding-system here.

(Directory Variables): Explain what is a "project".  Add indexing.  Improve
wording.  Add a footnote about using _dir-locals.el on MS-DOS.

Ignore _dir-locals.el and _dir-loc.el, for the sake of MS-DOS filesystems.

Produce _dir-locals.el from .dir-locals.el.

(dosified-file-name): New function.

(dir-locals-find-file) [ms-dos]: Run dir-locals-file through
dosified-file-name.  Compare files case-insensitively on systems whose
filesystems are case-insensitive.

(map_keymap_char_table_item): Make a copy of KEY if it is a
cons.

* textprop.c (Qminibuffer_prompt): New variable.
(syms_of_textprop): Initialize it.
* callint.c (Fcall_interactively): For `c', `k', and `K' prompt
in minibuffer-prompt face.  (Bug#1662)

Changes from arch/CVS synchronization

*** empty log message ***