*** empty log message ***

Remove descriptions about --without-x.  Remove
--without-carbon from configure options for X11 build.

Regenerate.

Prefer X11 to Carbon only when some X-specific
option is specified (Thanks to Jan Dj� and Andreas Schwab).

(set-default-coding-systems): Always
set default-file-name-coding-system to utf-8 for Mac Darwin.

*** empty log message ***

(setwins): Remove.
(WINS_ALMOST): New macro.
(WINS): Use it.
(autoloads): Don't extract autoloads from files in obsolete/.

(get_server_config): Declare set_fg as FARPROC to avoid a compiler warning.

(url-retrieve-synchronously): Allow quitting when inhibit-quit is t.

** Slowness of remove-overlays.
Resolved.

(whitespace-buffer): Call remove-overlays after overlay-recenter for
performance.  Suggested by Martin Rudalics.

* whitespace.el (whitespace-buffer): Call remove-overlays after
overlay-recenter for performance.  Suggested by Martin Rudalics.

(get_server_config) [WINDOWSNT]: Search the server file on APPDATA
if it doesn't exist on HOME, even if HOME is defined.

* lisp/net/tramp.el (tramp-default-method): scp is the default method.

* man/tramp.texi (Configuration): scp is the default method.
(Default Method): Use ssh as example for another method.

*** empty log message ***

(get_server_config): Extract also the Emacs pid from the server file.
On Windows, try to force the Emacs frame to the foreground.

(server-start): Save also the Emacs pid in the server authentication file.

(reftex-pop-to-bibtex-entry): Preserve point when displaying a bibtex
cross reference in the echo area.

*** empty log message ***

*** empty log message ***

(syms_of_xsmfns): Fix typo in docstring.

(syms_of_lread): Fix typo in docstring.

(make-char): Fix typo in docstring.
(load-with-code-conversion, charsetp): Doc fixes.

(hook): Fix typos in docstring.

(skkdic-convert): Fix typo in docstring.

(custom-mode-map): Move defvar above code using it.
(custom-mode-link-map): New variable.
(custom-group-link, custom-manual): Use follow-link.

* cus-edit.el (custom-mode-map): Move defvar above code using it.
(custom-mode-link-map): New variable.
(custom-group-link, custom-manual): Use follow-link.

Fix typo in name of author of bibtex.el,
"Mark Shapiro" -> "Marc Shapiro".  Update his email address.

Update Marc Shapiro's email address.

(BUGS): Remove "Build failure under Suse 10.0" was
due to a local miss-configuration.

*** empty log message ***

(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.

(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

* macmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

* w32menu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.

* xmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.

(Acknowledgments): Fix name spelling, add Anna Bigatti.

(Acknowledgments): Fix name spelling.

(List Variables): Document COMPARE-FN.

Avoid use of "binding" to mean a relation;
use it only to refer to the meaning associated with a key.

(Top): Change menu node description.

(Managing Overlays): Document overlay-recenter.

(flyspell-correct-word-before-point):
New function broken out of flyspell-correct-word.
(flyspell-mode-map): Bind it to M-RET.
(flyspell-correct-word): Call it.

(fill-minibuffer-function): New function.
(fill-paragraph): Bind fill-paragraph-function to fill-minibuffer-function.

(ruler-mode-map): Add bindings for up-events so that they aren't undefined.

No maintainer now.

(dired-readin): Locally bind file-name-coding-system.

Shorten and clarify usual mode line mouse help string.

(autoloads): Don't include `obsolete'.

*** empty log message ***

*** empty log message ***

(pr-alist-custom-set, pr-ps-utility-custom-set)
(pr-ps-name-custom-set, pr-txt-name-custom-set): Don't update the
Printing menu if it's not initialized.
(pr-menu-bind): Act on menu-bar-file-menu directly.

* printing.el (pr-alist-custom-set, pr-ps-utility-custom-set)
(pr-ps-name-custom-set, pr-txt-name-custom-set): Don't update the
Printing menu if it's not initialized.
(pr-menu-bind): Act on menu-bar-file-menu directly.

Finish minor changes seen from DVI output.
Replace 22.1.100 with 22.1.1.
(current-kill): Mention functions that directly or indirectly call
`kill-new', which sets `kill-ring-yank-pointer'.
(Understanding current-kill): Change `lasted' to `last'.  Remove
extraneous parenthesis.  Reword item about returning `car' of list.
(yank): Remove mention of `rotate-yank-pointer'.
(Y Axis Element): Add comment regarding replacement of blank space.
(print-Y-axis Penultimate): Explain that `print-graph' will pass
`height-of-top-line' so `print-Y-axis' does not have a bug.

(longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
(decode_options): Don't get EMACS_SERVER_FILE here, it could override command
line options.
(decode_options) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't parse "-s" option.
(fail): Don't check for missing arguments, it is now done in set_socket.
(file_name_absolute_p): New function (loosely based on the one in fileio.c).
(initialize_sockets): Don't check for duplicate loading of Winsock.
(get_server_config): Only try relative paths in the default directory locations.
(set_tcp_socket): Don't call INITIALIZE().  Warn when connecting to a remote
server.
(set_socket): Call INITIALIZE().  Search explicit command-line arguments, then
environment variable EMACS_SERVER_FILE, then implicit socket paths, before
trying the alternate editor.
(main): Use file_name_absolute_p.

*** empty log message ***

(allout-adjust-file-variable, allout-passphrase-verifier-string,
allout-passphrase-hint-string, allout-toggle-current-subtree-encryption):
Fix typos in docstrings.

(hook): Fix typo in docstring.

(emacs-lock-from-exiting): Fix typo in docstring.

(follow-avoid-tail-recenter-p): Fix typo in docstring.

(view-emacs-news): Fix typo in error message.

(hexl-mode): Fix typo in docstring.

(menu-bar-update-buffers): Fix typo in help menu entry.

(mouse-copy-work-around-drag-bug): Fix typo in docstring.

(mouse-set-font): Fix typo in docstring.

(resume-emacs-args-file): Fix typo in docstring.

(t-mouse-process, t-mouse-mode): Fix typos in docstrings.

(terminal-emulator): Fix typo in message.

(apropos-synonyms): Fix typo in docstring.

(file-name-shadow-tty-properties): Fix typo in docstring.

(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.

(authors-fixed-entries): Fix typo.

(custom-print-install, custom-print-uninstall, custom-format):
Fix typos in docstrings.

(x-kill-primary-selection, x-delete-primary-selection,
x-copy-primary-selection): Fix typos in error messages.

(list-load-path-shadows): Fix typo in docstring.

Fix typo in interactive message.

(tpu-help-text, tpu-save-all-buffers-kill-emacs, tpu-emacs-replace,
tpu-reset-control-keys): Fix typos in docstrings.

(vip-emacs-local-map, vip-change-mode-to-emacs): Fix typo in docstring.

(viper-emacs-state-cursor-color): Fix typo in docstring.

(viper-emacs-kbd-map, viper-toggle-key): Fix typos in docstrings.

(viper-mode, viper-set-hooks, viper-major-mode-modifier-list):
Fix typos in docstrings.

(report-emacs-bug): Fix typos in output message.

(vms-pmail-save-and-exit, vms-pmail-abort, vms-pmail-setup):
Fix typos in docstrings.

(dun-help): Fix typo in docstring.

(handwrite): Fix typo in docstring.

(hanoi-unix-64): Fix typo in docstring.

(idlwave-rescan-asynchronously): Fix typo in docstring.

(fixed): Fix typo in docstring.

(ispell, ispell-local-dictionary-alist, ispell-help): Fix typos in docstrings.
(ispell-help): Fix typo in output message.

(org-file-apps, org-emphasis-regexp-components, org-emphasis-alist):
Fix typos in docstrings.

(batch-texinfo-format): Fix typo in docstring.

(feedmail-queue-reminder, feedmail-queue-reminder-alist,
feedmail-confirm-outgoing, feedmail-confirm-outgoing-timeout, feedmail-nuke-bcc,
feedmail-nuke-resent-bcc, feedmail-fill-to-cc-fill-column, feedmail-sender-line,
feedmail-force-binary-write, feedmail-from-line, feedmail-deduce-envelope-from,
feedmail-x-mailer-line, feedmail-message-id-generator, feedmail-date-generator,
feedmail-fiddle-plex-user-list, feedmail-enable-spray,
feedmail-spray-this-address, feedmail-spray-address-fiddle-plex-list,
feedmail-enable-queue, feedmail-queue-runner-confirm-global,
feedmail-ask-before-queue-prompt, feedmail-ask-before-queue-reprompt,
feedmail-prompt-before-queue-standard-alist,
feedmail-prompt-before-queue-user-alist,
feedmail-prompt-before-queue-help-supplement,
feedmail-queue-use-send-time-for-message-id, feedmail-queue-default-file-slug,
feedmail-queue-fqm-suffix, feedmail-mail-send-hook-splitter,
feedmail-mail-send-hook, feedmail-mail-send-hook-queued,
feedmail-confirm-addresses-hook-example, feedmail-last-chance-hook,
feedmail-before-fcc-hook, feedmail-queue-runner-mode-setter,
feedmail-queue-alternative-mail-header-separator,
feedmail-queue-runner-message-sender, feedmail-buffer-eating-function,
feedmail-binmail-template, feedmail-run-the-queue-no-prompts,
feedmail-run-the-queue-global-prompt, feedmail-queue-subject-slug-maker,
feedmail-fiddle-header, feedmail-envelope-deducer, feedmail-fiddle-date,
feedmail-default-message-id-generator, feedmail-fiddle-message-id,
feedmail-fiddle-x-mailer, feedmail-fiddle-spray-address,
feedmail-deduce-address-list): Fix typos in docstrings.

(erc-dcc-send-file): Fix typo in error message.

(truncate): Fix typo in docstring.

(erc-autoaway-reestablish-idletimer): Fix typo in docstring.

(read-passwd): Fix typo in docstring.

(read-feature): Don't complete features not loaded from a file (which make
`unload-feature' to fail).

Yet more minor changes:
(defcustom): Said that `:options' is usually for a hook.  Remove
extraneous space in parenthetical remark concerning
`text-mode-hook-identify'.  At end, mention other defines, too.
(Beginning a .emacs File): Reverse words about comments so they
parallel numbers of listed semi-colons.
(Text and Auto-fill): Remove extraneous blank line in example.
(Mail Aliases): Remove extraneous blank line in example.
(Keybindings): Reformat as needed with `key' rather than `kbd'.
(Keybindings, Miscellaneous, Mode Line): For small book format, start
section name on top of new page.
(Simple Extension): Replace longer expression with `emacs-major-version'.
Remove comment about `number-to-string' function.
(Miscellaneous): Add filename option, `-H', to `grep' example
(debug, debug-on-entry):  Replace `GNU Emacs 22' with `a recent GNU
Emacs'.
(edebug): More properly state where to place point for 'M-x edebug-defun'.

(add-log-time-zone-rule): Mark as safe-local-variable.

** Icicles, Printing and Easy Menu.
Fix checked in.

(command-line-1): Kill emacs if the last frame is deleted while
evaluating the command-line arguments.

* startup.el (command-line-1): Kill emacs if the last frame is
deleted while evaluating the command-line arguments.