(w32font_draw): Fill background manually.

(ftxfont_end_for_frame): Fix array indexing error.

*** empty log message ***

(Qfontp): Remove unused symbol.
(QCantialias): New symbol.
(syms_of_font): Define it.
(font_property_table): Set a validator for QCantialias.

(CLEARTYPE_QUALITY, CLEARTYPE_NATURAL_QUALITY): Define
if not already.
(QCfamily): Share with xfaces.c.
(Qstandard, Qsubpixel, Qnatural): New symbols.
(syms_of_w32font): Define them. Don't define QCfamily here.
(w32_antialias_type, lispy_antialias_type): New functions.
(w32_enumfont_pattern_entity): New arg requested_font.
Set antialias parameter if non-default was requested.
(fill_in_logfont): Fill in lfQuality if :antialias specified.

ps-lpr-switches docstring fix.

*** empty log message ***

(read1): Undo the previous change.

*** empty log message ***

(Fdelete_frame): Call font_update_drivers only when
USE_FONT_BACKEND is defined..

*** empty log message ***

(utf-7-imap-post-read-conversion)
(utf-7-imap-pre-write-conversion): New functions.

(utf-7-imap): New coding system.

*** empty log message ***

(struct font_bitmap): New member bits_per_pixel.
(struct font_driver): New members start_for_frame and end_for_frame.
(struct font_data_list): New struct.
(font_put_frame_data, font_get_frame_data): Extern them.

(struct frame): New member font_data_list.

(font_update_drivers): Call driver->start_for_frame and
driver->end_for_frame at proper timings.
(font_put_frame_data, font_get_frame_data): New functions.
(Ffont_spec): Add usage in the docstring.

(make_frame): Initialize f->font_data_list to NULL.
(Fdelete_frame): Call font_update_drivers.

(struct xftface_info): Delete the member xft_draw.
(xftfont_prepare_face): Adjusted for the above change.
(xftfont_done_face): Likewise.
(xftfont_get_xft_draw): New function.
(xftfont_draw): Get XftDraw by xftfont_get_xft_draw.
(xftfont_end_for_frame): New function.
(syms_of_xftfont): Set xftfont_driver.end_for_frame.

(ftxfont_get_gcs): Renamed from ftxfont_create_gcs.
Argument changed.  Cache GCs in the per-frame data.
(struct ftxfont_frame_data): New struct.
(ftxfont_draw_bitmap): New arg gc_fore and flush.
(ftxfont_prepare_face, ftxfont_done_face): Delete them.
(ftxfont_draw): Get GCs by ftxfont_get_gcs.  Reflect s->clip in
GCs.
(ftxfont_end_for_frame): New function.
(syms_of_ftxfont): Set ftxfont_driver.end_for_frame.

(ftfont_get_bitmap): Set bitmap->bits_per_pixel.

*** empty log message ***

(x-selection-value): If x-select-request-type is
nil, try also STRING at last.
(x-select-request-type): Doc adjusted the change of
x-selection-value.

*** empty log message ***

(selection-coding-system)
(next-selection-coding-system): Declaration moded from xselect.c.
(x-get-selection): Decode by selection-coding-system if it is
non-nil.  If it is nil, decode by a proper coding system.  Handle
C_STRING.
(ccl-check-utf-8, string-utf-8-p): Delete them.
(xselect-convert-to-string): Fix determining data-type in the case
that TEXT is requested.  Don't use selection-coding-system if it's
not proper for the data-type.

(Vselection_coding_system)
(Vnext_selection_coding_system): Delete them.
(syms_of_xselect): Don't declare selection-coding-system and
next-selection-coding-system.  They are declared in select.el.

(x-selection-value): If x-select-request-type is
nil, simply try UTF8_STRING and COMPOUND-TEXT in this order.

*** empty log message ***

Include imm.h.
(get_composition_string_fn, get_ime_context_fn): New optional system functions.
(globals_of_w32fns): Load them from imm32.dll.
(ignore_ime_char): New flag.
(w32_wnd_proc): Handle WM_UNICHAR, WM_IME_CHAR and WM_IME_ENDCOMPOSITION.

(w32_read_socket) [WM_UNICHAR]: Handle as MULTIBYTE_CHAR_KEYSTROKE_EVENT.

(WM_UNICHAR, UNICODE_NOCHAR): Define if not already.

*** empty log message ***

(w32-initialize-window-system): Use t, not nil to signify default fontset.

*** empty log message ***

(READCHAR): Call readchar with the 2nd arg NULL.
(READCHAR_REPORT_MULTIBYTE): New macro.
(readchar): New 2nd arg MULTIBYTE.
(read1): Use READCHAR_REPORT_MULTIBYTE for the first read.  Make
symbol's name multibyte according to the multibyteness of the
source.

Update.

Regenerate ldefs-boot.el.

*** empty log message ***

*** empty log message ***

(face_for_overlay_string): Call lookup_face with
correct arguments (fix of synching with the trunk).

Error if ps-lpr-switches is not a list.

Merge from emacs--devo--0

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

Merge from emacs--rel--22

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

(custom-note-var-changed): Remove the `interactive'
spec from this new non-interactive function.

(isearch-mode-end-hook, isearch-mode-end-hook-quit):
Fix docstring.  Reported by Leo Liu <sdl.web@gmail.com>.

(BASE_PURESIZE): Increase to 1130000.

(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Adapt to new search UI.
(doc-view-search-backward): New function.
(doc-view-search): Query new regexp if prefix arg is given, else
jump to next/previous match.
(doc-view-mode): Handle compressed files.
(jka-compr): Required for compressed files.

Add query-replace-show-replacement and match-substitute-replacement.

(Query Replace): Mention `query-replace-show-replacement'.

(Replacing Match): Describe new `match-substitute-replacement'.

(query-replace-show-replacement): New defcustom.
(perform-replace): Use `match-substitute-replacement' if
`query-replace-show-replacement' is non-nil.

(match-substitute-replacement): New function.

(emacs-copyright): Add emacs-copyright.

(help-map, help-for-help-internal): Add `C-h C-a'.

Add `button'.  Move up `startup'.

Backport startup screen related changes from the trunk.

* files.el (auto-mode-alist): Select org-mode for files with the
extension ".org".

*** empty log message ***

*** empty log message ***

(describe-function, describe-variable)
(describe-syntax, describe-categories):
Use with-help-window instead of with-output-to-temp-buffer.

(list-colors-display): Use with-help-window instead of with-output-to-temp-buffer.

(list-faces-display, describe-face):
Use with-help-window instead of with-output-to-temp-buffer.

(describe-display-table): Use with-help-window instead of with-output-to-temp-buffer.

(describe-char): Use with-help-window instead of with-output-to-temp-buffer.

(apropos-describe-plist):
Use with-help-window instead of with-output-to-temp-buffer.

(help-mode): Set view-exit-action to bury the
buffer instead of fiddling with windows.  Simplify code.
(help-mode-finish): When help-window eqs t set it to the selected
window and have with-help-window set up view-return-to-alist.
(help-buffer): Add autoload cookie.

(help-window, help-window-point-marker): New variables.
(help-window-select): New option.
(with-help-window): New macro for displaying help windows.
(help-window-display-message, help-window-setup-finish)
(help-window-setup): New functions used for setting up help windows.
(print-help-return-message): Reset help-window to nil.
(view-lossage): Use with-help-window instead of
with-output-to-temp-buffer and move help-window-point-marker after
inserted text.
(describe-bindings, describe-key, describe-mode): Use
with-help-window instead of with-output-to-temp-buffer.

(view-remove-frame-by-deleting): Change default value to t.
Add autoload cookie.
(view-exit-action, view-file, view-file-other-window)
(view-file-other-frame, view-buffer, view-buffer-other-window)
(view-buffer-other-frame): Rewrite doc strings.
(view-return-to-alist-update): New function to remove stale entries
from view-return-to-alist.
(view-mode-enter): Rewrite doc string and simplify code.
(view-mode-exit): Handle new case 'keep-frame.  Don't reset
view-exit-action to nil.  Simplify code and rewrite doc string.

* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
(featurep 'emacs) to t.

* emacs-lisp/bytecomp.el (byte-compile-find-bound-condition): New
function.
(byte-compile-maybe-guarded): Use it to also look for bound
symbols inside `and' forms.  Comment out non-working code that was
trying to avoid warnings for XEmacs code.

* vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.

* vc-svn.el (vc-svn-print-log, vc-svn-diff):
* vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command):
* vc-cvs.el (vc-cvs-print-log, vc-cvs-diff)
(vc-cvs-annotate-command):
* vc-arch.el (vc-arch-diff): Remove test to check if start-process
is bound, it always is.

(load_overlay_strings): Fix copy&paste typo.

Sync charset names with setup-default-fontset.
Append "-1" where second part missing.

(w32-initialize-window-system): Move SJIS font setup here from global scope.

Enable SJIS fonts before creating any fontsets.

(ido-save-history): Write the history file in UTF-8,
and add `coding' file-local variable.

(ido-save-history): Save the history file in UTF-8,
not the current filename coding system.

(interprogram-cut-function, interprogram-paste-function):
Don't make them frame-local any more.

(x-create-frame-with-faces, tty-create-frame-with-faces):
Don't set interprogram-(cut|paste)-function on each frame.

(x-select-text, x-cut-buffer-or-selection-value):
Make them work in tty frames.
(interprogram-cut-function, interprogram-paste-function): Set them globally.

Revert merge that re-required rx.

*** empty log message ***

*** empty log message ***

*** empty log message ***

*** empty log message ***

(define-abbrev-table): Record the variable definition.

Fix merge error.

(byte-compile-file-form-define-abbrev-table): New function.

Clean the code for checking suitable Emacs version.

If ps-lpr-switches is not a list, force it to be one.

If ps-lpr-switches is not a list, force it to be one.

Fix last commit.

Add w32 keyboard changes.

(w32_scroll_bar_handle_click): Use SCROLL_BAR_CLICK_EVENT.
(w32_read_socket): Generate MULTIMEDIA_KEY_EVENT from WM_APPCOMMAND.

* keyboard.c (discard_mouse_events, make_lispy_event) [WINDOWSNT]:
Remove W32_SCROLL_BAR_CLICK_EVENT.
(lispy_function_keys) [WINDOWSNT]: Add more keys.
(lispy_multimedia_keys) [WINDOWSNT]: New array.
(make_lispy_event) [WINDOWSNT]: Use it to translate
MULTIMEDIA_KEY_EVENT.

(enum event_kind) [WINDOWSNT]: Likewise.
Add MULTIMEDIA_KEY_EVENT.

Define USE_TOOLKIT_SCROLL_BARS.

(w32_pass_multimedia_buttons_to_system): New user option.
(syms_of_w32fns): Export and initialize it.
(w32_wnd_proc): Pass WM_APPCOMMAND on to w32_read_socket.

(WM_APPCOMMAND): Define if not already.
(GET_APPCOMMAND_LPARAM): Likewise.

(enable-local-variables): Doc fix.

Fix last change (synch from the EMACS_22_BASE branch).