(encoded-kbd-setup-display): Be careful not to remove keymaps that just
happen to inherit from one of ours.  When setting up our keymap, make sure
it won't be accidentally modified by someone else.

(emerge-setup): Use insert-buffer-substring.
(emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise.

(org-columns-eval): Use forward-line.

Delete eol whitespace; nfc.

(delphi-newline): Use forward-line.

(dired-next-line, dired-previous-line): Use forward-line.

(artist-previous-line, artist-next-line): Use forward-line.

(fill-individual-paragraphs): Fix typo in docstring.

(fill-individual-paragraphs): Doc fix.
(adaptive-fill-function): Doc fix.  Remove * from docstring.

Tom Horsley  <tom.horsley at att.net>:

interprogram-paste-function can return a list.

Tom Horsley  <tom.horsley at att.net>

(interprogram-paste-function): Doc fix.
(current-kill): Accept list of strings as well
as single string from `interprogram-paste-function'.

Regenerate.

(ibuffer-saved-filter-groups): Doc fix.

*** empty log message ***

(Mode Line Mouse): Mention minor mode names.

Add mouse-1 in mode-line for minor modes.

Drew Adams  <drew.adams at oracle.com>

(mode-line-minor-mode-keymap): Add mouse-minor-mode-menu on mouse-1.
(mode-line-modes): Add mouse-1 to help-echo text.
(mouse-minor-mode-menu, minor-mode-menu-from-indicator): New functions.
(mode-line-minor-mode-help): Doc fix.

(auto-mode-alist): Add \\. before PDF/PS/DVI extensions.  Regroup.

Remove fill-paragraph-or-region.

(Filling): Update arguments of fill-paragraph.
fill-paragraph operates on the active region in Transient Mark mode.
Remove fill-paragraph-or-region.

(Spelling): ispell-word operates on the active region in Transient Mark mode.

(Arguments): Replace fill-paragraph-or-region with fill-paragraph.

(Fill Commands): Undocument fill-paragraph-or-region.
fill-paragraph operates on the active region in Transient Mark mode.
(Fill Prefix, Format Indentation): Replace fill-paragraph-or-region
with fill-paragraph.

(indent-for-tab-command): Change interactive spec from "P" to "p".
(indent-for-tab-command): Add check for interactive arg before
indenting the active region.

(ispell-word): Add interactive arg `region'.  Fix docstring.

(tutorial--default-keys): Replace fill-paragraph-or-region with fill-paragraph.

(esc-map): Bind M-q to fill-paragraph instead of fill-paragraph-or-region.

(fill-paragraph-or-region): Remove function at the request of RMS.
(fill-paragraph): Change `arg' to optional `justify'.  Add interactive
arg `region'.  Fix docstring.  At the first `or' branch add call to
`fill-region' if it the region is active in transient-mark-mode.

Don't require loadhist.

* xselect.c (x_own_selection, x_handle_selection_clear)
(x_clear_frame_selections):
* w32menu.c (list_of_panes, list_of_items):
* w32fns.c (w32_color_map_lookup, Fx_create_frame, Fx_display_list):
* textprop.c (validate_plist, interval_has_all_properties)
(interval_has_some_properties, interval_has_some_properties_list)
(add_properties, text_property_list):
* process.c (Fget_buffer_process, list_processes_1, status_notify):
* minibuf.c (Fassoc_string):
* macselect.c (x_own_selection, x_clear_frame_selections)
(Fx_disown_selection_internal):
* keymap.c (Fcommand_remapping, where_is_internal, describe_map_tree):
Use CONSP rather than !NILP and XC[AD]R rather than Fc[ad]r.

(feature-symbols, file-provides, file-requires, file-set-intersect,
file-dependents): Simplify.
(unload-feature-special-hooks): Update list of special hooks.

* bindings.el (completion-ignored-extensions): Remove pdf and dvi
extensions since they can be viewed with doc-view.

* files.el (auto-mode-alist): Make doc-view-mode the default mode
for pdf, ps and dvi files.

* doc-view.el: Make doc-view-mode the standard mode for viewing
pdf, [e]ps and dvi files and add binding C-c C-c to toggle between
text and image display.  Add binding C-c C-e to switch to an
editing mode.
(doc-view-ghostscript-options, doc-view-ps->pdf): Add "-dSAFER" to
avoid security problems when rendering files untrusted sources.

Display message when tutorial position is not saved

Mention xpdf.  Fix spelling of Ghostscript.
(doc-view-ghostscript-options): Fix typo in doc string.

(compilation-next-error-function): Fix timestamp
handling, so compilation-fake-loc works again.

(server-select-display): Nop if we do not support m-f-o-d.
(server-process-filter): Revert last change.

(vc-diff-sentinel, vc-diff-internal): Revert some changes in the
behavior unrelated to filesets.

Regenerate.

Link to libs for calling res_init() if available.
(Fmake_network_process): Call res_init() before getaddrinfo or
gethostbyname, if possible.

* process.c: Link to libs for calling res_init() if available.
(Fmake_network_process): Call res_init() before getaddrinfo or
gethostbyname, if possible.

(HAVE_RES_INIT): Define if res_init() exists.
(HAVE_LIBRESOLV): Also define if we are using res_init().

* configure.in (HAVE_RES_INIT): Define if res_init() exists.
(HAVE_LIBRESOLV): Also define if we are using res_init().

Doc fix.

(read1): Set pvectype for char_tables.

(Glossary): Use "key binding" consistently.

(Init Non-ASCII): Use "key binding" consistently.

building.texi (Source Buffers): Use "key binding" consistently.

*** empty log message ***

*** empty log message ***

(Diary): Fix directive.

(longlines-wrap-follows-window-size): Integer value
specifies wrapping margin.
(longlines-mode, longlines-window-change-function): Set
window-specific wrapping margin based on the above.

* longlines.el (longlines-wrap-follows-window-size): Integer value
specifies wrapping margin.
(longlines-mode, longlines-window-change-function): Set
window-specific wrapping margin based on the above.

(XMISCANY, XMARKER, XINTFWD, XBOOLFWD, XOBJFWD, XOVERLAY, XBUFFER_OBJFWD)
(XBUFFER_LOCAL_VALUE, XKBOARD_OBJFWD, XSAVE_VALUE): Add type checks.
(SOME_BUFFER_LOCAL_VALUEP, GC_SOME_BUFFER_LOCAL_VALUEP): Remove.

(free_misc): Use XMISCTYPE.
(live_misc_p, gc_sweep): Use Lisp_Misc_Any.

(eshell-complex-commands): Add "ls".

* eshell/esh-cmd.el (eshell-complex-commands): Add "ls".

(server-process-filter): Only set display if X11 is
supported.

Remove file, since it's just a duplicate of one in etc/

(cc-imenu-c++-generic-expression): Tweak regexp to avoid overflow.

(Qcompletion_ignore_case): New external Lisp_Object.
(Fread_file_name): Use it rather than intern'ing.

(Qcompletion_ignore_case): Change to external.
(syms_of_dired) [VMS]: Remove Qcompletion_ignore_case.

(Qcompletion_ignore_case): New Lisp_Object.
(syms_of_minibuf): Add Qcompletion_ignore_case.

(Qcompletion_ignore_case): New external Lisp_Object.
(Fread_coding_system): Ignore case of user input.

Merge from emacs--rel--22

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

* xfns.c (Fx_create_frame, Fx_display_list):
* window.c (window_fixed_size_p, enlarge_window, shrink_window_lowest_first):
* macterm.c (init_font_name_table):
* macfns.c (Fx_create_frame, Fx_display_list):
* lread.c (close_load_descs):
* keyboard.c (read_char_x_menu_prompt):
* fns.c (Fmember, Fmemql, Fdelete, Fset_char_table_parent):
* coding.c (code_convert_region_unwind): Test the type of an object
rather than just !NILP before extracting data from it.

(Fpurecopy): Set the pvec tag on pseudo vectors.

* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
(XMISCANY): New macro.
(XMISCTYPE): Use it.
(struct Lisp_Misc_Any): New type.
(union Lisp_Misc): Use it.
(struct Lisp_Buffer_Local_Value): Add `local_if_set' bit.
* data.c (Fboundp, store_symval_forwarding, swap_in_global_binding)
(find_symbol_value, set_internal, default_value, Fset_default)
(Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local, Flocal_variable_p)
(Flocal_variable_if_set_p, Fvariable_binding_locus):
The SOME_BUFFER_LOCAL_VALUEP distinction is replaced by local_if_set.
* alloc.c (allocate_buffer): Set the size and tag.
(allocate_misc, mark_maybe_object, mark_object, survives_gc_p):
Use XMISCANY.
(die): Follow the GNU convention for error messages.
* print.c (print_object): SOME_BUFFER_LOCAL_VALUEP -> local_if_set.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Don't set the
tag any more.
(set_buffer_internal_1):
* frame.c (store_frame_param):
* eval.c (specbind):
* xdisp.c (select_frame_for_redisplay): Drop SOME_BUFFER_LOCAL_VALUEP.

(reindent-then-newline-and-indent): Don't assume that
indent-according-to-mode preserves point.

*** empty log message ***

(bs-mode): Set hooks (accidentally left out in the previous commit).

(bs--window-config-coming-from): Revert 2006-11-09 change.
(bs--restore-window-config): Keep the selected frame.
(bs--track-window-changes, bs--remove-hooks): New functions.
(bs-mode): Use `define-derived-mode'.  Set hook to track window changes.
(bs--show-with-configuration): Revert 2006-11-09 change.
Don't reuse window unless it is visible on the selected frame.
Restore window configuration (possibly in a different frame)
before creating any window.

(bs--make-header-match-string, bs-show-in-buffer, bs--nth-wrapper): Simplify.
(bs-select, bs--insert-one-entry): Simplify.  Use `when'.
(bs-buffer-list): Simplify.  Use `when'.  Use `string-match-p'.
(bs-sort-buffer-interns-are-last): Use `string-match-p'.
(bs-attributes-list, bs-max-window-height, bs-must-always-show-regexp,
bs-maximal-buffer-name-column, bs-minimal-buffer-name-column, bs-configurations,
bs-default-configuration, bs-alternative-configuration,
bs-cycle-configuration-name, bs-string-show-always, bs-string-show-never,
bs-string-current, bs-string-current-marked, bs-string-marked,
bs-string-show-normally, bs-sort-functions, bs-default-sort-name):
Remove * in docstrings.
(bs--redisplay, bs--goto-current-buffer, bs--current-buffer, bs-delete,
bs-apply-sort-faces, bs-next-config-aux): Use `when'.
(bs--window-config-coming-from): Revert 2006-11-09 change.
(bs--restore-window-config): Keep the selected frame.
(bs--track-window-changes, bs--remove-hooks): New functions.
(bs-mode): Use `define-derived-mode'.  Set hook to track window changes.
(bs--create-header): Remove.
(bs--create-header-line): New function, based on `bs--create-header'.
(bs--show-header): Use `bs--create-header-line'.
(bs--show-with-configuration): Revert 2006-11-09 change.
Don't reuse window unless it is visible on the selected frame.
Restore window configuration (possibly in a different frame)
before creating any window.

(handle_display_prop): Ignore display specs after
replacing one when string text is being replaced.
(handle_single_display_spec): Pretend as if characters with display
property haven't been consumed only when buffer text is being replaced.

(Fsnarf_documentation): Simplify.

Re-fill copyright header.
(blink-matching-open): Don't report false errors with the `$' syntax
class.

(ad-get-advice-info): Change to a function.
(ad-get-advice-info-macro): New macro, like old ad-get-advice-info.
(ad-is-advised, ad-get-advice-info-field)
(ad-set-advice-info-field): Use ad-get-advice-info-macro.

(ad-get-advice-info): Change to a function.
(ad-get-advice-info-macro): New macro, like old ad-get-advice-info.
(ad-is-advised, ad-get-advice-info-field)
(ad-set-advice-info-field): Use ad-get-advice-info-macro.

(Diary): Clarify text about diary file example.

Revert accidental deletion.

Re-fill copyright header.
(blink-matching-open): Don't report false errors with the `$' syntax
class.

(vc-workfile-version): Compatibility alias.
(vc-default-working-revision): Compatibility for backends.

(filesets-alist-get): Use `let' rather than `let*'.
(filesets-ormap, filesets-sort-case-sensitive-flag, filesets-remake-shortcut,
filesets-ingroup-collect-files): Fix typos in docstrings.
(filesets-data-get-name, filesets-data-get-data, filesets-data-set,
filesets-cmd-query-replace-getargs, filesets-ingroup-collect,
filesets-find-or-display-file): Doc fixes.

(filesets-alist-get): Use `let' rather than `let*'.
(filesets-ormap, filesets-sort-case-sensitive-flag, filesets-remake-shortcut,
filesets-ingroup-collect-files): Fix typos in docstrings.
(filesets-conditional-sort, filesets-find-or-display-file,
filesets-data-get-name, filesets-data-get-data, filesets-data-set,
filesets-cmd-query-replace-getargs, filesets-ingroup-collect): Doc fixes.

(sendmail-error-reporting-interactive)
(sendmail-error-reporting-non-interactive): New variables for sendmail
error reporting options to simplify support for imperfect sendmail emulators.
(sendmail-send-it): Use them instead of list literals.

Revert previous change; it creates a dependency
loop between advice.el and help-fns.el.

Require advice when compiling.

Don't require url when compiling, as url-type is no longer a macro.

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 116-121)

   - Update from CVS

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

Restore deleted entry.

(w32_font_is_double_byte, my_create_scrollbar): Make static.
(syms_of_w32term) <w32-enable-unicode-output>: Fix typo in docstring.

*** empty log message ***

(ring-convert-sequence-to-ring)
(ring-insert+extend, ring-remove+insert+extend, ring-member)
(ring-next, ring-previous): New functions.

(ring-convert-sequence-to-ring)
(ring-insert+extend, ring-remove+insert+extend, ring-member)
(ring-next, ring-previous): New functions.

(describe-function-1): Find source of advised functions.

(documentation): Advice deleted.  Doc for advised functions
is now handled at C level.
(ad-stop-advice, ad-start-advice): Don't enable or disable
advice for `documentation'.
(ad-advised-definition-docstring-regexp): Var deleted.
(ad-make-advised-definition-docstring): Store orig name
as text property of string.
(ad-advised-definition-p): Check for text property of docstring.

*** empty log message ***

(fancy-startup-tail): Say exactly what does the button
dismiss ("Dismiss this startup screen").  Use text "Never show
it again" for the checkbox after this button.
(fancy-startup-screen, fancy-about-screen): Put point before the
first link, so the user can quickly select links with the keyboard.
(normal-mouse-startup-screen): Add more useful text describing how
to follow a link.

*** empty log message ***

(ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
(ispell-region): Change messages displayed at the start and end of
the spell-checking to be the same.

(describe-face): Allow handling a string as the face name.