*** empty log message ***

(ftfont_list): Handling of QCname fixed.

*** empty log message ***

(otf-script-alist): Set it.

(xftfont_open): Set charset related members to -1.

(ftfont_list): Handle QCotf property.
(ftfont_open): Set charset related members to -1.

(Votf_script_alist): New variable.
(syms_of_fontset): Initialize it.
(fontset_font): Delete unsed variable.

(Votf_script_alist): Extern it.

(font_find_for_lface): Code optimized.

(font_close_object, font_merge_old_spec): Extern them.

*** empty log message ***

(font-encoding-alist): Fix for
"ethiopic-unicode".

(QCscalable, Qc, Qm, Qp, Qd): New variables.
(syms_of_font): Initialize them.
(font_pixel_size): Allow float value in dpi.
(font_prop_validate_type): Deleted.
(font_prop_validate_symbol, font_prop_validate_style): Argument
changed.  Caller changed.
(font_prop_validate_non_neg): Renamed from
font_prop_validate_size.
(font_prop_validate_extra): Deleted.
(font_prop_validate_spacing): New function.
(font_property_table): Add elements for all known properties.
(get_font_prop_index): Renamed from check_font_prop_name.  New
argument FROM.  Caller changed.
(font_prop_validate): Validate all known properties.
(font_put_extra): Argument force deleted.  Caller changed.
(font_expand_wildcards): Make it static.  Fix the way of shrinking
the possible range.
(font_parse_xlfd): Arguemnt merge deleted.  Fix handling of RESX,
RESY, SPACING, and AVGWIDTH.  Don't validate property values here.
Caller changed.
(font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
(font_parse_fcname): Arguemnt merge deleted.  Fix parsing of point
size.  Don't validate properties values here.  Caller changed.
(font_unparse_fcname): Handle dpi, spacing, and scalable
properties.
(font_open_by_name): Delete unused variable.
(Ffont_spec): Likewise.  Validate property values.
(Ffont_match_p): New function.

(QCscalable): Extern it.
(font_parse_xlfd, font_parse_fcname): Prototype adjusted.

(xfont_query_font): Adjusted for the change of
font_parse_xlfd.
(xfont_list_pattern): New function.
(xfont_list): Use xfont_list_pattern.

(ftfont_list): Handle properties dpi, spacing, and
scalable.

(xftfont_prepare_face): Cancel previous change.
(xftfont_done_face): Likewise.

*** empty log message ***

(Flist_fonts): EXFUN it.

Changes from arch/CVS synchronization

Add back smoothing_type and smoothing_enabled definitions.

*** empty log message ***

(script-representative-chars): Add an
entry for latin script.

(x_draw_glyph_string) [USE_FONT_BACKEND]: Check
s->face->font on determining underline position.

*** empty log message ***

(font_parse_xlfd): Fix generating of CHARSET_REGISTRY field.
(font_has_char): Accept font-object too.
(font_find_for_lface): Try at first with a size specified in face.

(xftfont_prepare_face): Make non-ascii face share
face->extra with ascii face.
(xftfont_done_face): Don't free face->extra of non-ascii face.

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 314-319)

   - Update from CVS
   - Merge from gnus--rel--5.10

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

   - Update from CVS

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

*** empty log message ***

(word-combining-categories): Add entries for 2-byte Han characters.

*** empty log message ***

(x_set_font) [USE_FONT_BACKEND]: Fix argument to
font_open_by_name.

Merge from gnus--rel--5.10

Patches applied:

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

   - Update from CVS

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

*** empty log message ***

(size_window): New arg FIRST_ONLY.  All callers changed.
(adjust_window_trailing_edge): Specially compute FIRST_PARALLEL
for the case of a top-level window and the following minibuffer.
Don't exit because of no `next' when there is a parent.
Use the FIRST_ONLY feature when resizing following windows.

(init_syntax_once): Give most control chars' syntax Spunct.

(Bindat Spec): Clarify previous change.

(mode-line-format): Save some mode line space.

(find-file-noselect): Improve the question wording.
(basic-save-buffer-2): Mask UMASK against 666.

(mouse-drag-vertical-line-rightward-window): New function.
(mouse-drag-vertical-line): Call it.

(customize-option, customize-option-other-window): Error if SYMBOL is nil.

mention C-q

*** empty log message ***

(font-weight-table): Treat regular and normal as the
same as medium.
(font-slant-table): Add (roman . 100).

(font_parse_fcname): Fix previous change.

(QCspacing, QCdpi): Extern them.
(enum font_spacing): New enum.
(FONT_PIXEL_SIZE_QUANTUM): New macro.

(POINT_TO_PIXEL): Don't divice POINT by 10.
(QCspacing, QCdpi): New variables.
(syms_of_font): Initialize them.
(font_pixel_size): New function.
(font_put_extra): New function.
(font_parse_xlfd): Fix handling of font size.  Add QCdpi property
in FONT_EXTRA.
(font_parse_fcname): Handle enumenrated values (e.g. bold).  Fix
handling font size.  Add QCname property that contains only
unknown properties.
(font_score): Change argument.  Caller changed.  Pay attention to
FONT_PIXEL_SIZE_QUANTUM.
(font_sort_entites): Fix handling of font size.
(font_list_entities): Likewise.
(font_find_for_lface): Likewise.
(font_open_for_lface): Likewise.
(font_open_by_name): Likewise.
(Ffont_spec): Add QCname property that contains only unknown
properties.

(ftfont_list): Use assq_no_quit, not Fassq.  Don't
include weight in listing pattern, instead check weight of each
listed font.  Don't include scalable in pattern.  Pay attention to
FONT_PIXEL_SIZE_QUANTUM.

(section{Clocking Time}): Add new clocking commands.
        (section{Structure Editing}): Add global archiving command.

*** empty log message ***

(Publishing links): Document the
        `:link-validation-function' property.
        (Extensions and Hacking): New chapter, includes some sections
        of
        the "Miscellaneous" chapter.

Require noutline, also on XEmacs.
        (org-end-of-subtree): Return point.
        (org-dblock-start-re, org-dblock-end-re): New constants.
        (org-create-dblock, org-prepare-dblock, org-map-dblocks)
        (org-dblock-update, org-update-dblock,
        org-beginning-of-dblock)
        (org-update-all-dblocks, org-find-dblock): New functions.
        (org-collect-clock-time-entries): New function.
        (org-html-handle-time-stamps): Never export CLOCK timeranges.
        (org-fixup-indentation): Modified to deadl correctly with
        lines
        starting with TAB.  Only one argument DIFF now.
        (org-demote, org-promote): Call `org-fixup-indentation' with
        just
        one argument, DIFF.
        (org-mode): Don't mark buffer as modified when aligning
        tables.
        (org-clock-sum): Don't makr buffer modified when adding time
        sum
        properties.
        (org-export-as-html): Added support for a link validation
        function.
        (org-archive-all-done): New function.
        (org-archive-subtree): New prefix argument.  When set, archive
        all
        done subtrees in this buffer.
        (org-remove-clock-overlays)
        (org-remove-occur-highlights): Use
        `org-inhibit-highlight-removal'.
        (org-inhibit-highlight-removal): New variable, for dyn amic
        scoping.
        (org-put-clock-overlay): Don't swallow last headline character
        when displaying overlay.
        (org-store-link): Link to `image-mode' with just the file
        name.

*** empty log message ***

(read_escape): Fix the code synched with HEAD.

*** empty log message ***

(font_parse_fcname): Fix parsing of point-size.
(font_unparse_fcname): Produce symbolic names for style
properties.
(font_list_entities): Handle float size correctly.
(font_open_by_name): Prefer `normal' property values if the name
doesn't specify them.

(Finternal_char_font): Use font_get_name, not
Ffont_xlfd_name.

(ftfont_pattern_entity): Use the numeric value 100 for
FC_WEIGHT_REGULAR.  Exclude FC_SIZE and FC_PIXEL_SIZE from listing
pattern.  Don't force scalable.

(xftfont_open): For generating a name, start from
96-byte buffer.

2006-06-18  Michael Kifer  <kifer@cs.stonybrook.edu>
some typo fixes

2006-06-18  Michael Kifer  <kifer@cs.stonybrook.edu>

* viper-cmd.el (viper-special-read-and-insert-char): use
read-key-sequence.
(viper-after-change-undo-hook): enhancements.
(viper-after-change-undo-hook): new hook.
(viper-undo): use viper-after-change-undo-hook.
(viper-add-newline-at-eob-if-necessary): widen before making changes.
(viper-next-line-at-bol): If point is on a widget or a button, simulate
clicking on that widget/button.

* viper.el (viper-mode): allow for a separate cursor color in Emacs
state.

* ediff-diff (ediff-test-patch-utility): catch errors.
(ediff-actual-diff-options, ediff-actual-diff3-options): new variables.
(ediff-set-actual-diff-options): new function.
(ediff-reset-diff-options, ediff-toggle-ignore-case):
use ediff-set-actual-diff-options.
(ediff-extract-diffs): catch errors.
(ediff-whitespace): add nonbreakable space.
(ediff-same-file-contents): catch errors.

* ediff-mult.el (ediff-collect-custom-diffs): save
coding-system-for-read.

* ediff-vers.el (ediff-keep-tmp-versions): new var.
(ediff-vc-internal, ediff-vc-merge-internal): use
ediff-delete-version-file.
(ediff-delete-version-file): new function.

* ediff-wind.el (ediff-control-frame-parameters): set frame fringes.

* ediff.el (ediff-directories, ediff-directory-revisions,
ediff-merge-directories, ediff-merge-directories-with-ancestor,
ediff-directories-internal, ediff-merge-directory-revisions,
ediff-merge-directory-revisions-with-ancestor,
ediff-directories3): use read-directory-name.

changed my email-id

2006-06-18  Ralf Angeli  <angeli@caeruleus.net>

* textmodes/tex-mode.el (tex-font-lock-match-suscript): Remove
superfluous part of regexp for brace matching which is handled by
`scan-lists' call.

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 300-313)

   - Update from CVS
   - Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 105-106)

   - Update from CVS

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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 105-106)

   - Update from CVS

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

(update_frame): Check for input pending on entry.
(update_window, update_frame_1): Break loop if input is detected.

*** empty log message ***

*** empty log message ***

(Coding Conventions): Better explain conventions for definition constructs.

(Special Properties): String value of `read-only' serves as the error message.

(Character Type): Clarify prev. change.
(Non-ASCII in Strings): Mention \u and \U.

(Using Interactive): Explain problem of markers, etc., in command-history.

(list-options): Put "obsolete" msg in buffer.

(basic-save-buffer-2): For a new precious file,
use the default modes in the return value.

(facemenu-color-alist): Doc fix.

(custom-guess-name-alist): Recognize `-flag'.

* frame.h (x_new_fontset2): Fix prototype.

*** empty log message ***

(struct font_driver): Member parse_name deleted.
(font_match_p, font_get_spec, font_parse_fcname)
(font_unparse_fcname): Extern them.
(font_get_name): Prototype adjusted.

(XLFD_SMALLNUM_MASK): Delete this macro.
(XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it.
(font_expand_wildcards): Fix handling ENCODING field.  Avoid
unnecessary checks for weight, slant, and swidth.
(font_parse_fcname): New function.
(font_unparse_fcname): New function.
(font_parse_name): New function.
(font_match_p): New function.
(font_get_name): Return value changed to Lisp string.
(font_get_spec): New function.
(Qunspecified, Qignore_defface): Don't extern them.
(font_find_for_lface): Assume that LFACE is fully specified.
(font_load_for_face): If lface[LFACE_FONT_INDEX] is an font
object, use it for FACE.
(font_open_by_name): Call Ffont_spec with QCname prop.  Don't call
driver->parse_name.
(Ffont_spec): Call font_parse_name, not font_parse_xlfd.

(new_fontset_from_font) [USE_FONT_BACKEND]: Prototype
adjusted.

(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
deleted.  Don't call Fnew_fontset.  Instead, directly call
make_fontset.

(x_set_font) [USE_FONT_BACKEND]: Adusted for the change
of x_new_fontset2.

(Qmonospace, Qsans_serif, Qserif, Qmono, Qsans)
(Qsans__serif): New variables.
(ftfont_generic_family_list): New variable.
(syms_of_ftfont): Initialize the above variables.
(ftfont_pattern_entity): Argument NAME deleted.
(ftfont_list_generic_family): New function.
(ftfont_parse_name): Delete this function.
(ftfont_list): Try generic family only when FcFontList found no
font.
(ftfont_list_family): Fix args to FcObjectSetBuild.

(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
object in attrs[LFACE_FONT_INDEX].
(set_lface_from_font_name): Cancel all changes for font-backend.
(set_lface_from_font_and_fontset) [USE_FONT_BACKEND]: New
function.
(Finternal_set_lisp_face_attribute): Accept a font object in
QCfont attribute.
(set_font_frame_param): Likewise.
(realize_default_face): Call set_lface_from_font_and_fontset.

(x_default_font_parameter): Try also "fixed", and signal
error here if no suitable font was found.

(xfont_parse_name): Delete this function.

(xftfont_open): Change coding style of error
handling.  Generate fontconfig's fontname pattern.

2006-06-16  Francis Litterio  <flitterio@gmail.com>

* xterm.c (x_check_expected_move, handle_one_xevent)
(x_set_offset, x_check_fullscreen): Extensive changes to make
frame positioning deterministic under X.

* xterm.h (x_output): Added members left_before_move and
top_before_move.  Removed members expected_left and expected_top.

(struct x_output): New member fontp.
(FRAME_FONT_OBJECT): New macro.

(x_new_fontset2): Change arguments.  Both args FONTSET
and FONT_OBJECT must be existing ones.

(next_overlay_string): Fix assert.
(push_it, pop_it): Handle composition and stretch specific values.
Only handle it->slice in image (for now).
(back_to_previous_visible_line_start): Continue search if newline is
part of a compisition.  Simplify.
(reseat_1): Set it->object to buffer.
(set_iterator_to_next): Set it->object to string or buffer, when
setting it->method to GET_FROM_STRING or GET_FROM_BUFFER.
(next_element_from_composition): Set it->object to buffer if not
from string.
(set_cursor_from_row): Only save start of string if not already
done to handle multiple strings in a row.

(struct it): Add union to iterator stack to save
image, composition, and stretch specific paramters.

*** empty log message ***

(pitx): Show composition parameters.
(pgx, pg): New commands to print a glyph structure.
(pgi, pgn): New commands to print specific/next glyph.
(pgrowx, pgrow): New commands to print all glyphs in a row.

*** empty log message ***

(Mac Input): Minor update.

*** empty log message ***

(do_app_resume, do_app_suspend): Remove functions.
(mac_tsm_resume, mac_tsm_suspend) [USE_MAC_TSM]: New functions.
(mac_handle_window_event, XTread_socket) [USE_MAC_TSM]: Use them.
(Vmac_ts_script_language_on_focus) [USE_MAC_TSM]: New variable.
(syms_of_macterm) [USE_MAC_TSM]: Defvar it.
(saved_ts_language, saved_ts_component) [USE_MAC_TSM]: New variables.
(mac_initialize_display_info) [MAC_OSX]: Use Quartz Display
Services functions to get size of main display in pixels.

(Fx_display_mm_height, Fx_display_mm_width)
[MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: Use CGDisplayScreenSize.