* lib-src/ebrowse.c (xfree): Remove definition; s/xfree/free/

remove useless if-before-free tests

* lib-src/ebrowse.c (xfree): Likewise.
* lib-src/etags.c (process_file_name, free_tree, free_fdesc): Likewise.
(popclass_above, Prolog_functions, Erlang_functions): Likewise.
* lib-src/pop.c (pop_quit): Likewise.
* lwlib/lwlib-Xm.c (xm_update_one_value): Likewise.
* lwlib/lwlib.c (safe_free_str, free_widget_value_tree): Likewise.
* src/editfns.c (Fset_time_zone_rule): Likewise.
* src/lread.c (nosuffix): Likewise.
* src/ralloc.c (get_bloc): Likewise.
* src/regex.c (reg_free): Likewise.
* src/xftfont.c (xftfont_open, xftfont_close): Likewise.
* src/xrdb.c (get_user_app, get_environ_db, x_load_resources): Likewise.
* src/xsmfns.c (smc_save_yourself_CB): Likewise.

Simplify the last change.

(epa-file-write-region): Write the entire buffer
content if START is nil.

(font_find_for_lface): Handle float font size.
(font_open_for_lface): Likewise.

*** empty log message ***

(x_supports_face_attributes_p): Check face->font before
comparing the properties.

*** empty log message ***

(w32_enumfont_pattern_entity): Use requested registry.
Treat iso10646-1 and Windows DEFAULT_CHARSET specially.
Duplicate iso8859-1 fonts as iso10646-1 if no registry specified.
Don't add empty script list.
(w32_registry): Only map DEFAULT_CHARSET to iso10646-1 here.

(mh-path, mh-variant): Use dotted syntax for `package-version' info.

Fix typo in comment.

Regenerate.

* configure.in (USE_LUCID, USE_MOTIF): Don't use "==".
* configure: Regenerate.

(dot, dotdot): Remove, update users.
".." has been used elsewhere in the file for a long time.
(LIBXT_STATIC): Remove conditional based on unused variable.

Remove obsolete TO DO comment.  (It was implemented on 1993-03-27.)

(x-get-selection): Fix typo.

Implement face-remapping-alist feature

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

(describe-text-sexp): Use `string-match-p'.  Simplify.
(describe-char): Use `looking-at-p', `string-match-p' when possible.

(syms_of_textprop) <text-property-default-nonsticky>:
(Fremove_text_properties): Fix typos in docstrings.

Merge from emacs--rel--22

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

Merge from gnus--devo--0

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

*** empty log message ***

(icomplete-get-keys): Doc fix.  Use `when'.

*** empty log message ***

New file.

(describe-variable-custom-version-info): Handle dotted
`package-version' info.

*** empty log message ***

Fix typos.

(vc-cvs-after-dir-status): Support spaces in file
names and improve support for unregistered files.

(Windows Keyboard): Fix text added on 2008-05-29.

(font_list_entities): Fix the car part of data to be
stored in the cache.

(Fancy Diary Display): Simplify.

(ftfont_font_format): Don't use strcasestr.

(compile-last): Replace tr in `els' assignment with sed.  Remove shell
variable `elc'.  Split tests to hopefully be more portable.  Fix `sel'
assignment.

* chartab.c (Foptimize_char_table, optimize_sub_char_table):
Add a `test' argument so another predicate than `equal' can be used.
(map_sub_char_table): Use `eq' rather than `equal' to merge ranges.
(map_char_table): Remove unused vars `c' and `i'.
* lisp.h (Foptimize_char_table): Adjust declaration.
* charset.c (Fclear_charset_maps): Adjust call to Foptimize_char_table.

(lisp2): Add minibuffer.elc.

(completion-table-dynamic): Doc fix.

(vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
return `unregistered' when applicable.

(Coding Conventions): Do not encourage the use of "-flag" variable names.

(checkdoc-this-string-valid-engine):
Don't encourage naming variables with "-flag".

(Ffont_info): Define only if HAVE_WINDOW_SYSTEM is
defined.
(syms_of_font): Defsubr Sfont_info only if HAVE_WINDOW_SYSTEM is
defined.

(Iteration Clauses): Fix incorrect "identical" examples.

(Fancy Diary Display): Update for diary-display-function replacing
diary-display-hook.

(org-get-entries-from-diary): Also set diary-display-function.

(calendar-mouse-view-diary-entries): Use LIST-ONLY argument of
diary-list-entries rather than setting diary-display-hook.

(cal-tex-list-diary-entries): Use LIST-ONLY argument of
diary-list-entries rather than setting diary-display-hook.

(cal-html-list-diary-entries): Use LIST-ONLY argument of
diary-list-entries rather than setting diary-display-hook.

(calendar-dedicate-diary): Update for diary-display-function replacing
diary-display-hook.

(appt-check): Use diary-display-function rather than diary-display-hook.

(diary-display-function): New name for diary-display-hook.  Keep old
name as obsolete alias.  Doc fix.  Change custom type and version.
(diary-list-entries-hook, diary-list-entries, diary-simple-display)
(diary-fancy-display): Doc fixes.
(diary-list-entries, diary-include-other-diary-files, diary-mail-entries):
Use diary-display-function rather than diary-display-hook.

(update-elclist): Hide the warning when it does not apply, make it
milder when it does.
(autogen-clean): New target.
(maintainer-clean): Use autogen-clean.

(utf-8-with-signature): Renamed from utf-8-sig.
(utf-8-auto): Adjusted for the above change.

(Fmake_variable_buffer_local, Fmake_local_variable)
(Fmake_variable_frame_local): Disallow mixing buffer-local and
frame-local settings for the same variable.

(describe-font): Don't check fontset
here, and just call font-info.  Get the default font by from the
default face.

* fontset.c (Ffont_info): Moved to font.c.
(syms_of_fontset): Delete defsubr of Sfont_info.

(font_style_to_value, font_score): Delete casting of the
args to xstcasecmp.
(register_font_driver): Increment num_font_drivers only when
registering the driver globally.
(Ffont_info): Moved from fontset.c.  Handle a font object too.
(syms_of_font): Defsubr Sfont_info.

(url-file-name-completion): Add missing argument.

(utf-8-sig, utf-8-auto): New coding systems.

(define-coding-system): Accept :bom for
utf-8.

(CODING_UTF_8_BOM): New macro.
(enum coding_category): Delete coding_category_utf_8, add
coding_category_utf_8_auto, coding_category_utf_8_nosig, and
coding_category_utf_8_sig.
(CATEGORY_MASK_UTF_8): Delete it.
(CATEGORY_MASK_UTF_8_AUTO, CATEGORY_MASK_UTF_8_NOSIG)
(CATEGORY_MASK_UTF_8_SIG): New macros.
(CATEGORY_MASK_ANY): Delete CATEGORY_MASK_UTF_8, add
CATEGORY_MASK_UTF_8_AUTO, CATEGORY_MASK_UTF_8_NOSIG, and
CATEGORY_MASK_UTF_8_SIG.
(CATEGORY_MASK_UTF_8): New macro.
(UTF_BOM, UTF_8_BOM_1, UTF_8_BOM_2, UTF_8_BOM_3): New macros.
(detect_coding_utf_8): Check BOM.
(decode_coding_utf_8, encode_coding_utf_8): Handle BOM.
(decode_coding_utf_16): Adjusted for the change of enum
utf_bom_type.
(encode_coding_utf_16): Likewise.
(setup_coding_system): Likewise.  Set CODING_UTF_8_BOM (coding).
(detect_coding, detect_coding_system): Handle utf-8-auto.
(Fdefine_coding_system_internal): Handle `bom' property for utf-8.
(syms_of_coding): Fix setting up of Vcoding_category_table.

(enum define_coding_utf8_arg_index): New enum.
(enum coding_attr_index): Change coding_attr_utf_16_bom to
coding_attr_utf_bom.
(enum utf_bom_type): Renamed from utf_16_bom_type.
(struct utf_16_spec): Adjusted for the above change.
(struct coding_system): Add utf_8_bom in `spec' union.

(utf-7-encode): Use the right escape char depending on imap/nonimap encoding.

(completion-pcm-all-completions): Add the base-size.

(relative_filename): Treat "///" like "/" in filenames.

(icomplete-prospects-height): Add :group.

(icomplete-completions): Typo.

*** empty log message ***

(add_font_entity_to_list): Allow non-opentype truetype fonts back
in the uniscribe backend, but disallow any font that has no
unicode subrange support.

(Faccept_process_output): If `millisec' is non-nil, `seconds' default to 0.
(wait_reading_process_output): Also return non-nil if we read output
from a non-running process.

(icomplete-prospects-length): Make obsolete.
(icomplete-prospects-height): New var.
(icomplete-completions): Use it.

(w32font_open_internal): Prefer truetype fonts unless
'raster' specified.

*** empty log message ***

(auto-insert): Add :link.

(Windows Keyboard): Add descriptions of w32-register-hot-key
and w32-unregister-hot-key.

(tar-header): New field `header-start'.
(tar-header-block-tokenize): Set it when useful.
Drop "GNUtar " magic value, which even GNU Tar doesn't know about.
(tar-header-data-end): New function.
(tar-summarize-buffer): Use it.
(tar-next-line): Fix goal column for long usernames.
(tar-expunge-internal): Use header-start.
(tar-rename-entry): Handle ustar-style long names.
(tar-alter-one-field): Add optional `descriptor' argument.
(tar-subfile-save-buffer): Use it.

(Fx_family_fonts): Set frame correctly.

(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.

(Fx_list_fonts): Make it return a list of font names.

(hack-local-variables): Don't signal an error if the local
variable section is not properly terminated.

(easy-menu-convert-item, easy-menu-convert-item-1):
Move the duplicate-generation outside of the caching so it also works
for identical entries.

(tar-summarize-buffer): Fix reporter initialization.
(tar-mode): Use write-region-annotate-functions rather than
write-contents-functions.
(tar-extract): Remove unused var `pos'.
(tar-subfile-save-buffer): Remove unused var `following-descs'.
(tar-mode-write-file): Remove.
(tar-write-region-annotate): New function.

Don't touch subdirs.el if it is unchanged.

(jka-compr-write-region): Typo.

Docstring improvement.

* progmodes/flymake.el (flymake-save-buffer-in-file):
* shadowfile.el (shadow-copy-file):
* arc-mode.el (archive-*-write-file-member):
* files.el (diff-buffer-with-file):
* subr.el (with-temp-file): Pass nil to write-region.
* jka-compr.el (jka-compr-write-region): Preserve `start's nullness.

(x_draw_glyph_string): Use clipmask if specified.

(doc-view-mode-map): Bind `q' to quit-window, as is the custom.

* src/fileio.c (Fwrite_region): Delay the defaulting to beg&z to after
calling build_annotations.
* lisp/files.el (basic-save-buffer-2): Pass nil rather than (point-min)
to write-region.

*** empty log message ***

(Ffont_info): Don't call font_close_object.

(font_parse_family_registry): Use Ffont_put to validate
foundry and family.
(font_delete_unmatched): Don't check spacing.
(font_list_entities): Add spacing to the spec to list fonts.

(ftfont_spec_pattern): Don't set FC_SPACING to pattern.
(ftfont_list): Check spacing here.  Don't include FC_CHARSET in
objset.

*** empty log message ***

(Fdecode_coding_region, Fencode_coding_region, Fencode_coding_string):
(syms_of_coding) <coding-system-for-read, coding-system-for-write>:
<latin-extra-code-table>: Fix typos in docstrings.
(syms_of_coding) <coding-system-alist>: Doc fix.
(syms_of_coding) <translation-table-for-input>: Reflow docstring.

Fix typo in comment.

*** empty log message ***

(encode_coding_raw_text): Fix previous change.
(encode_coding_object): When the dst_object is a buffer and is
different from src_object, move gap to PT.

(update-elclist): Work around non-portability of "\" in various
implementations of echo.

(x_draw_glyph_string): If a clipmask is specified, use it.

* xterm.c (x_draw_glyph_string): If a clipmask is specified, use it.