Include "font.h".
(fontset_font, fontset_ascii, face_for_char)
(make_fontset_for_ascii_face, Ffont_info)
(Finternal_char_font) [USE_FONT_BACKEND]: If enable_font_backend
is nonzero, use font-backend mechanism.
(find_font_encoding): Make it non-static.
(new_fontset_from_font, fontset_ascii_font) [USE_FONT_BACKEND]:
New functions.

(FONT_INFO_FROM_FACE): New macro.
(face_for_font, new_fontset_from_font)
(fontset_ascii_font) [USE_FONT_BACKEND]: Extern them.

(assoc_no_quit): New function.

(main) [USE_FONT_BACKEND]: Handle arg
--enable-font-backend.  Call syms_of_font.

(struct glyph_string) [USE_FONT_BACKEND]: New
members clip_x, clip_y, clip_width, and clip_height.
(struct face) [USE_FONT_BACKEND]: New members font_info and extra.

(get_composition_id) [USE_FONT_BACKEND]: If
enable_font_backend is nonzero, accept the composition method
COMPOSITION_WITH_GLYPH_STRING.

(enum composition_method) [USE_FONT_BACKEND]: New
enumeration COMPOSITION_WITH_GLYPH_STRING.

(Vscript_representative_chars): New variable.
(syms_of_character): Declare it as a Lisp variable.

(Vscript_representative_chars): Extern it.

(ALL_CFLAGS): Add @FREETYPE_CFLAGS@,
@FONTCONFIG_CFLAGS@, and @LIBOTF_CFLAGS@.
(LIB_X11_LIB): If HAVE_XFT is defined, set to @XFT_LIBS@.
(FONTSRC, FONTOBJ): New variables.
(obj): Add $(FONTOBJ).
(SOME_MACHINE_OBJECTS): Lib_X11_Lib.
(LIBES): Add @FREETYPE_LIBS@, @FONTCONFIG_LIBS@, and
@LIBOTF_LIBS@.
(font.o, ftfont.o, xfont.o, xftfont.o, ftxfont.o): New targets.
(fontset.o, xdisp.o, xfaces.o, xfns.o, xterm.o): Depends on
$(FONTSRC).

New file.

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 274-284)

   - Update from CVS
   - Update etc/MORE.STUFF.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 101)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62

(ewoc-data): Add docstring.
(ewoc-nth): Doc fix.

*** empty log message ***

(auto-coding-alist): Add .lha to files read with no-conversion.

(auto-mode-alist): Add .lha files to archive file extensions.

(archive-arc-summarize, archive-lzh-summarize): Convert csize to integer when
computing offsets within the compressed archive file.

(add-to-history): Add KEEP-ALL arg and align functionality
with read-from-minibuffer.

(handle_one_xevent): Check that f is not NULL before
calling x_kill_gs_process.

*** empty log message ***

(Minibuffer History): Update add-to-history.

(byte-compile-warnings-safe-p): New
function.
(byte-compile-warnings): Fix safe-local-variable property.

2006-05-16  Ken Manheimer  <ken.manheimer@gmail.com>

* allout.el (allout-show-bodies, allout-old-style-prefixes)
(allout-stylish-prefixes, allout-numbered-bullet)
(allout-file-xref-bullet, allout-use-hanging-indents): Use simple
predicates to qualify `safe-local-variable' property, when
available, else use equivalent lambda.
(allout-current-topic-collapsed-p): Do the right thing regarding
trailing blank lines.

(server-start): Only create a directory if needed.
(server-edit, server-unload-hook): server-start => server-mode.
(kill-emacs-hook): Cleanup upon exit.

Trivial typo.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-283

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 101)

   - Update from CVS

Add coding cookie.

(hexlify-buffer): Encode process arguments manually.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-280
Creator:  Michael Olson <mwolson@gnu.org>

Update etc/MORE.STUFF.

* etc/MORE.STUFF: Update URL for Planner Mode and add description.
  Canonicalize URLs for Emacs Muse and Emacs Wiki Mode.

(gud-tooltip-tips): Add missing argument to
call to gdb-tooltip-print.

*** empty log message ***

(dired-guess-shell-gnutar): On GNU and GNU/Linux
systems, default to "tar" since those systems probably have GNU
tar.

(Explicit Encoding): Fix typo (encoding<->decoding).

*** empty log message ***

*** empty log message ***

*** empty log message ***

(mac-utxt-to-string, mac-string-to-utxt)
(mac-TEXT-to-string, mac-string-to-TEXT): Sync with HEAD.

*** empty log message ***

(system_eol_type): Fix synching with HEAD.

(system_eol_type): Sync with HEAD.
(coding_inherit_eol_type): If PARENT is nil, inherit from
system_eol_type.
(syms_of_coding): Initialize system_eol_type.

(Fcall_process): Sync with HEAD.

(setup_process_coding_systems): Fix synching with
HEAD.
(read_process_output): Likewise.
(Fset_process_coding_system): Inherit system's eol format if
necessary.

(choose_write_coding_system): Fix synching with HEAD.

(push_key_description): Fix synching with HEAD.

*** empty log message ***

(Creating Buffers): Cleanup.

(Visiting Functions): Rewrite in find-file-noselect.

(Fnext_single_char_property_change)
(Fprevious_single_char_property_change):
Don't allow returning value beyond LIMIT in any cases.
(Fnext_char_property_change, Fprevious_char_property_change): Doc fix.

(get_local_map): Abort if POSITION outside BEGV, ZV.

(desktop-missing-file-warning): Fix docstring.
(desktop-restore-file-buffer): Correct question asked on missing file.

* xterm.c (handle_one_xevent): Check that f is not NULL before
 calling _XEditResCheckMessages.

(handle_one_xevent): Fix crash in 2006-03-24 change.

*** empty log message ***

(c-forward-subword, c-backward-subword):
Add CUA move property.

(x_set_border_width): Fix error message to say "frame", not "window".

* custom.el (custom-push-theme): Load the variable before checking
its `standard-value'.

(desktop-save): Use with-temp-buffer.

*** empty log message ***

(Current Buffer): Document that with-temp-buffer disables undo.

(Terminal-Specific): More accurate description of how Emacs searches for the
terminal-specific libraries.

(SOME_MACHINE_LISP): Add fringe.elc.

(lisp1): Add fringe.elc.

(Displaying the Diary, Format of Diary File):
Refer to diary-view-entries, diary-list-entries,
diary-show-all-entries rather than obsolete aliases.

*** empty log message ***

(include-other-diary-files, diary-mail-entries): Refer to
diary-view-entries, diary-list-entries, diary-show-all-entries rather
than obsolete aliases.

(calendar-mode-map, calendar-mouse-3-map): Refer to
diary-view-entries, diary-list-entries, diary-show-all-entries rather
than obsolete aliases.

(appt-check, appt-make-list): Refer to
diary-view-entries, diary-list-entries, diary-show-all-entries
rather than obsolete aliases.

(calendar-mode-map): Refer to diary-show-all-entries rather than alias
show-all-diary-entries.

*** empty log message ***

[iftex]: Replace @xref's to emacs-xtra with @inforef's.

(Standard Hooks) [iftex]: Convert @xref's to emacs-xtra to @inforef's.

*** empty log message ***

(Buffer Names): Add index entries for buffers whose names begin with a space.
(Creating Buffers): Document that undo is turned off in buffers whose names
begin with a space.

(Undo): Document that undo is turned off in buffers whose names begin with
a space.

(Visiting Functions, Reading from Files, Saving Buffers): Mention code and EOL
conversions by file I/O primitives and subroutines.

* simple.el (line-move-finish): Fix last fix.

(Visiting): Fix wording.

Fix last change.

* simple.el (line-move-finish): Don't call point motion hooks
while processing intangibility.

* intervals.c (set_point_both): Fix mixup before before and after
in variable names.

* editfns.c (Fline_beginning_position): Inhibit point-motion hooks
while setting point temporarily.

(terminal-init-xterm): Fix typo.

ERC is now part of Emacs.
Add Emacs Muse.

2006-05-12  Ken Manheimer  <ken.manheimer@gmail.com>

* allout.el: (allout-view-change-hook): Marked as being deprecated,
to be replaced by `allout-exposure-change-hook'.
(allout-exposure-change-hook): New, replacing
`allout-view-change-hook'.
(allout-flag-region): Run new hook `allout-exposure-change-hook',
in addition to `allout-view-change-hook'.
        (allout-show-bodies, allout-old-style-prefixes)
(allout-stylish-prefixes, allout-use-hanging-indents): Quote the
lambda forms to prevent their showing up in variable help
presentations as inscrutable byte-compiled code.
(allout-numbered-bullet, allout-file-xref-bullet, allout-layout):
Use string-or-null-p to qualify safe-local-variable values.
(allout-reindent-bodies): Use memq to qualify matches against
valid safe-local-variable values.  Also, quote the lambda as above.
(allout-use-mode-specific-leader): Add missing candidate-value
symbols, use memq, and quote the lambda.
(allout-overlay-interior-modification-handler): Remove unused
variables `msg' and 'opened'.
(allout-hidden-p): Constrain invisibility consideration to allout's
invisibility spec, disregarding invisibility for other reasons.

2006-05-12  Ken Manheimer  <ken.manheimer@gmail.com>

* NEWS (allout): Update.

(ewoc--node-enter-before, ewoc--create-node): Delete funcs.
(ewoc--insert-new-node): New func.
Update callers of deleted funcs to use it, instead.

*** empty log message ***

(Coding Systems, Text Coding): More indexing.  Mention that C-x RET f can set
eol conversion.

(Lisp and Coding Systems): Document coding-system-eol-type.  Add index entries
for eol conversion.

Fix spelling errors.

*** empty log message ***

Spell-checking the manuals is now done; remove the entry.

(url-http-file-exists-p): Test if status is integer.

(version-control): Correct safe values.

(Defining Faces): Mention `mac', and add an xref to where window-system is
described.

Fix spelling errors.

(ewoc-refresh): Compute PP once before looping.

(diary-show-all-entries): Do not refer to
obsolete alias `show-all-diary-entries'.
(make-diary-entry): Not interactive.
(cal-tex-cursor-month, cal-tex-cursor-month-landscape)
(cal-tex-cursor-day, cal-tex-cursor-week, cal-tex-cursor-week2)
(cal-tex-cursor-week-iso, cal-tex-cursor-week-monday)
(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
(cal-tex-cursor-filofax-daily, cal-tex-cursor-year)
(cal-tex-cursor-year-landscape, cal-tex-cursor-filofax-year):
Interactive.

*** empty log message ***

Johan Bockg�  <bojohan at dd.chalmers.se>:
(calendar-french-date-string)
(calendar-mayan-date-string, calendar-chinese-date-string)
(calendar-astro-date-string, calendar-iso-date-string)
(calendar-islamic-date-string, calendar-bahai-date-string)
(calendar-hebrew-date-string, calendar-coptic-date-string)
(calendar-ethiopic-date-string, calendar-persian-date-string):
These functions are not interactive.

*** empty log message ***