* 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.

(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.

(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.

(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-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.

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.

(Fmake_indirect_buffer): Set the buffer's tag.

Line break fix.

Line break fix.

(Ffset): Save autoload of the function being set.

(do_autoload): Don't save autoloads.

*** empty log message ***

(Ffset): Save autoload of the function being set.

(do_autoload): Don't save autoloads.

(select-tags-table): Disable undo in the `*Tags Table List*' buffer.

(select-tags-table): Disable undo in the `*Tags Table List*' buffer.

John Paul Wallington  <jpw at pobox.com>

(x_create_tip_frame): Set the `display-type' frame parameter before
setting up faces.

Comment.

John Paul Wallington  <jpw at pobox.com>

(x_create_tip_frame): Set the `display-type' frame parameter before
setting up faces.

move @dircategory to after @copying

(reftex-select-item): Use mapc rather than mapcar.

(idlwave-complete-in-buffer): Use mapc rather than mapcar.

*** empty log message ***

(append_tool_bar_item): Reformat last change.

(Fregister_code_conversion_map): Reformat last change.

*** empty log message ***

(dired-warn-writable): New face.
(dired-warn-writable-face): New variable.
(dired-font-lock-keywords): Use dired-warn-writable-face, instead of
dired-warning-face, for group- and world-writable files.

(octave-looking-at-kw): Add doc string.
(octave-re-search-forward-kw, octave-re-search-backward-kw):
Add doc string, and an explicit COUNT argument.
(octave-scan-blocks, octave-beginning-of-defun): Explicitly pass
INC to search functions.

*** empty log message ***

(octave-looking-at-kw): Add doc string.
(octave-re-search-forward-kw, octave-re-search-backward-kw):
Add doc string, and an explicit COUNT argument.
(octave-scan-blocks, octave-beginning-of-defun): Explicitly pass
INC to search functions.

John W. Eaton  <jwe at octave.org>

(octave-looking-at-kw)
(octave-re-search-forward-kw, octave-re-search-backward-kw): New functions.
(octave-in-defun-p, calculate-octave-indent)
(octave-blink-matching-block-open, octave-beginning-of-defun)
(octave-auto-fill): Use octave-looking-at-kw instead of looking-at,
to search for regexps that contain case-sensitive keywords.
(octave-beginning-of-defun): Likewise, for octave-re-search-backward-kw.
(octave-scan-blocks): Likewise, for octave-re-search-forward-kw.

John W. Eaton  <jwe at octave.org>

(octave-looking-at-kw)
(octave-re-search-forward-kw, octave-re-search-backward-kw): New functions.
(octave-in-defun-p, calculate-octave-indent)
(octave-blink-matching-block-open, octave-beginning-of-defun)
(octave-auto-fill): Use octave-looking-at-kw instead of looking-at,
to search for regexps that contain case-sensitive keywords.
(octave-beginning-of-defun): Likewise, for octave-re-search-backward-kw.
(octave-scan-blocks): Likewise, for octave-re-search-forward-kw.

(face-spec-set): When FRAME is nil, set the default for
new frames (restores pre-2007-09-17 behavior).  Doc fix.

(woman-ignore): Fix doc typo.

Do not use a single clause cond.

* frame.el (select-frame-set-input-focus): Fix typo
"max" -> "mac". Do not use a single clause cond.

* cus-start.el (all): Use test that does not match the X11 version
for mac.

(directory-abbrev-alist): Doc fix.

(url-default-expander): Use `url-file-directory'.

(url-digest-auth, url-basic-auth):
Rename `path' to `file'.  Use `url-file-directory'.

(url-basepath): Function deleted.
(url-file-directory, url-file-nondirectory): New functions
replacing url-basepath.  Callers changed.

(ebrowse-tree-mode): Disable undo in the BROWSE buffer.

Replace `abs' with `eabs'.

(eabs): Rename from `abs'.  All callers changed.

(grow_menu_items): Use larger_vector.

(GROW_RAW_KEYBUF, menu_bar_items, menu_bar_item, append_tool_bar_item): Use
larger_vector.

(make_fontset): Use larger_vector.

(Fregister_ccl_program, Fregister_code_conversion_map): Use larger_vector.

(add_overlay_mod_hooklist): Use larger_vector.

(dos_rawgetc): Undo last change (there's no ``leaving selected frame''
on MSDOS).

(comint-password-prompt-regexp): Add 'LDAP'.

(dos_rawgetc): Undo last change (there's no ``leaving selected frame''
on MSDOS).

Clarification requested by RMS.

* cus-start.el (all): Undo previous change.

Capitalize node names according to convention.

(erc-modified-channels-update): Use mapc rather than mapcar.

(feedmail-run-the-queue)
(feedmail-look-at-queue-directory): Use mapc rather than mapcar.

(reporter-dump-state): Use mapc rather than mapcar.

(eudc-edit-hotlist): Use mapc rather than mapcar.

(eudc-display-records)
(eudc-filter-duplicate-attributes)
(eudc-distribute-field-on-records, eudc-query-form)
(eudc-process-form): Use mapc rather than mapcar.

(eudc-bbdb-filter-non-matching-record)
(eudc-bbdb-query-internal): Use mapc rather than mapcar.

(eudc-ldap-simple-query-internal): Use mapc rather than mapcar.

(socks-build-auth-list): Use mapc rather than mapcar.

(top level): Use mapc rather than mapcar.

(c-make-styles-buffer-local)
(c-set-style): Use mapc rather than mapcar.

(top level, cperl-imenu-addback)
(cperl-write-tags, cperl-tags-treeify): Use mapc rather than mapcar.

(ebnf-yac-token-table): Use mapc rather than mapcar.

(ebnf-map-name, ebnf-dimensions): Use mapc rather than mapcar.

(idlwave-shell-filter-bp, top level): Use mapc rather than mapcar.

(idlwave-toolbar-add-everywhere)
(idlwave-toolbar-remove-everywhere): Use mapc rather than mapcar.

(idlwave-indent-line)
(idlwave-sintern-keyword-list, idlwave-scan-user-lib-files)
(idlwave-write-paths, idlwave-all-method-classes)
(idlwave-all-method-keyword-classes, idlwave-entry-keywords)
(idlwave-fix-keywords, idlwave-display-calling-sequence):
Use mapc rather than mapcar.

(org-export-as-html, org-export-as-ascii)
(org-fast-tag-selection): Use mapc rather than mapcar.

(woman0-rename): Fix paren typo.

*** empty log message ***

(Interactive Shell): Correct INSIDE_EMACS reference.

(Interactive Shell): Correct INSIDE_EMACS reference.

Diane Murray  <disumu at x3y2z1.net>

(url-basic-auth): Set path to "/" when URL has an empty string filename.

Diane Murray  <disumu at x3y2z1.net>

(url-basic-auth): Set path to "/" when URL has an empty string filename.

* diff-mode.el (diff-fine-change): Add :group.

* cus-start.el (all): Use the same test as the 22.2 branch.