(DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
(IS_ANY_SEP): Only define if !defined(HAVE_GET_CURRENT_DIR_NAME).
(main_argc): Remove.
(strprefix): Use strncmp.

(comment-add): If EXTRA, double `comment-add' value.

(main) [SIGSTOP]: Change conditional from WINDOWSNT.

(add-log-current-defun): Fix thinko w.r.t derived-mode-p.

Change by author without assignment is tiny.

Refill copyright.

NB previous change had incorrect CVS log entry.  Correct log:

(tex-validate-buffer): Use paragraph motion functions, rather than
hard-coding "\n\n".
(tex-validate-region): Check for eobp, to speed up.
(tex-next-unmatched-end): Doc fix.

Revert previous change.

Revert previous change.

(Fmake_network_process): Doc fix.

(current_frame): Change the default.
(longopts): Replace --current-frame by --create-frame.
(decode_options): Reverse the meaning of -c.
(print_help_and_exit): Update help text accordingly.
(main): Remove the -version and -good-version messages.

(w32_init_fringe, mac_init_fringe): Declare rif argument.

(auto-mode-alist): Use archive-mode for .rar files.

(auto-coding-alist): Rar archives are binary.

*** empty log message ***

Add basic support for Rar.
(archive-find-type): Recognize Rar's signature.
(archive-desummarize): New fun.
(archive-summarize): Use it to restore the buffer's data in case
someone wants to switch to some other major mode.
(archive-resummarize): Use it as well.
(archive-rar-summarize, archive-rar-extract): New functions.

Remove spurious * in docstrings.
(filesets-running-xemacs): Remove.  Use (featurep 'xemacs) instead.
(filesets-conditional-sort): Remove unused arg `simply-do-it'.
(filesets-ingroup-collect): Remove unused arg `depth'.
(filesets-update): Remove unused arg `version'.

(finder-compile-keywords): Fix up comment style.
(finder-mouse-face-on-line): previous-line -> forward-line.

Fix up comment style.

Remove spurious * in docstrings.
(recentf-save-list): Fix up comment style.

Fix up comment style.

Remove spurious * in docstrings.
(octave-mode-map): Move init into declaration and remove \t binding.
(octave-mode-startup-message): Remove unused var.
(octave-scan-blocks): Remove unused arg `from'.
(octave-forward-block, octave-down-block, octave-up-block): Update callers.

(meta-mode-syntax-table): Move init into decl.
(meta-mode-map): Likewise and remove \t binding.

Remove spurious * in docstrings.
(snmp-rfc1155-types, snmp-rfc1213-types, snmp-rfc1902-types)
(snmp-rfc1903-types, snmp-rfc1155-access, snmp-rfc1902-access)
(snmp-rfc1212-status, snmp-rfc1902-status): Remove list wrappers now
that completion accepts lists of strings.
(snmp-mode-syntax-table): Move initialization into declaration.
(snmp-mode-map): Likewise and remove \t binding.
(snmp-common-mode): Set tab-always-indent according to snmp-t-a-i.
(snmp-indent-line, snmp-mode-imenu-create-index): Remove unused var.
(snmp-indent-command): Remove.

(lisp-mode-shared-map): Use the default TAB binding to obey tab-always-indent.

(browse-url-elinks-new-window): New function.
(browse-url-elinks): Use browse-url-elinks-new-window.  Accept
optional second argument `new-window'.  Fix typo in doc-string.
(browse-url-elinks-sentinel): Use browse-url-elinks-new-window.
Improve error message.

(browse-url-url-encode-chars): Use the right parameter name in the function body.
Reported by Johannes Weiner.

(detect_eol_type, detect_eol_type_in_2_octet_form):
Fix a C warning regarding variable constness.

(handle_one_xevent): Fix a C warning.

(socks-open-network-stream): Standardize error message from previous
change.

(socks-open-network-stream): Signal an explicit error if the port
associated with a service string can't be found.

*** empty log message ***

Changes from author without assignment are tiny.

(tex-terminate-paragraph): Leave point at the site of any mismatch.

(tex-terminate-paragraph): Use backward-paragraph.

*** empty log message ***

Sync changes from upstream ERC

(server-running-p): New function.

(w32-focus-frame): Make obsolete alias for x-focus-frame.

(select-frame-set-input-focus, select-frame-by-name): Use x-focus-frame for w32.

(Fx_focus_frame): Rename from Fw32_focus_frame.

*** empty log message ***

(tex-verbatim-environments): Eliminate CL dependency.

(comment-add): New arg EXTRA.
(comment-region-default): Pass EXTRA if not indenting lines.

(browse-url-url-encode-chars): New function.
URL-encode some chars in a string.
(browse-url-encode-url): Rewrite using the previous function.
(browse-url-file-url): Use `browse-url-url-encode-chars'.
(browse-url-elinks-sentinel): Fix typo.
(browse-url-new-window-flag): Doc change.

(gdpy_def): New variable.
(xg_initialize): Initialize gdpy_def.
(xg_display_close): If no other display exists, set gdpy_def to a
new connection.

(tex-compilation-parse-errors): Prefer the filename from
`--file-line-error', if it is available.

Joe Wells  <jbw at macs.hw.ac.uk>  (tiny change)

(tex-compilation-parse-errors): Also match TeX `--file-line-error'
format.

Delete add-hook calls that were moved to
xterm-mouse-mode.
(xterm-mouse-mode): Disable resume-tty-functions, explain why it
does not work.

Delete add-hook calls that were moved to
xterm-mouse-mode.

(custom-theme-set-faces): Undo previous change.

(face-spec-set): When FRAME nil, look up each frame in SPEC.

(tex-region): Simplify previous change,
handling the case where the region is not in `tex-main-file'.
(tex-region-1): Delete.
(tex-region-header): New function, doing the header part of the
old tex-region-1.

*** empty log message ***

(newline): Simplify use of prefix-numeric-value.
(line-move-partial): Remove unused var `ppos'.
(line-move-1): Replace 9999 with most-positive-fixnum.
(move-end-of-line): Use more efficient single-property search.
(move-beginning-of-line): Remove unused var `start'.
(blink-matching-open): Restructure in a more functional style.

*** empty log message ***

(list-holidays): Remove the cyclic alias.

(xg_get_image_for_pixmap): Always create a GdkPixbuf
when we have no file name for the icon.
(xg_tool_bar_expose_callback): Remove.
(xg_create_tool_bar): Don't connect expose signal to
xg_tool_bar_expose_callback.
(xg_get_file_with_chooser): Move GCPRO1 after declarations.

(reset_malloc_hooks): Set the hooks to the previous
values instead of zapping them.

(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.

(server-with-environment): Simplify.
(server-select-display, server-unselect-display): Re-add functions that
seem to have been lost in the multi-tty merge.
(server-eval-and-print, server-create-tty-frame)
(server-create-window-system-frame, server-goto-toplevel)
(server-execute, server-return-error): New functions extracted from
server-process-filter.
(server-execute-continuation): New functions.
(server-process-filter): Restructure so that all arguments are analysed
first and then acted upon in a subsequent stage  This way
server-goto-toplevel can be executed later, when we know if
it's necessary.
Remove the "-version" and "-version-good" support.

Drew Adams  <drew.adams at oracle.com>

(custom-face-edit-activate): Doc fix.

*** empty log message ***

(Holidays): Change all instances of `holiday-list' back to `list-holidays'.

File gfdl.1 has been removed.

Following cal-bahai renaming, update all
instances of list-bahai-diary-entries to diary-bahai-list-entries,
mark-bahai-diary-entries to diary-bahai-mark-entries,
calendar-goto-bahai-date to calendar-bahai-goto-date,
insert-bahai-diary-entry to diary-bahai-insert-entry,
insert-monthly-bahai-diary-entry to diary-bahai-insert-monthly-entry,
insert-yearly-bahai-diary-entry to diary-bahai-insert-yearly-entry, and
calendar-print-bahai-date to calendar-bahai-print-date.

(cal-menu-diary-menu, cal-menu-goto-menu):
Following cal-bahai renaming, update all instances of
insert-bahai-diary-entry to diary-bahai-insert-entry,
insert-monthly-bahai-diary-entry to diary-bahai-insert-monthly-entry,
insert-yearly-bahai-diary-entry to diary-bahai-insert-yearly-entry, and
calendar-goto-bahai-date to calendar-bahai-goto-date

Following cal-bahai renaming, update all instances of
list-bahai-diary-entries to diary-bahai-list-entries,
mark-bahai-diary-entries to diary-bahai-mark-entries, and
mark-bahai-calendar-date-pattern to calendar-bahai-mark-date-pattern.

Fix typos in aliases in previous change.

Remove unused file.

(tex-region): Handle the case where the region is not in
`tex-main-file'.  Move the old code that applies to both cases...
(tex-region-1): ...to this new function.

(vc-process-sentinel): New function.
(vc-exec-after): Use it instead of using ugly hackish analysis and
construction of Elisp code.
(vc-sentinel-movepoint): New dynamically scoped var.
(vc-print-log, vc-annotate): Set it to move the user's point.

*** empty log message ***

(vc-cvs-annotate-time): Use inhibit-read-only and inhibit-modification-hooks.

(mark-bahai-diary-entries): Fix up typo.
(calendar-bahai-print-date, calendar-bahai-goto-date)
(diary-bahai-list-entries, diary-bahai-insert-entry):
New names to clean up the namespace a bit more.
(calendar-goto-bahai-date, calendar-print-bahai-date): Compat aliases.

(css): New custom group.
(css-electrick-keys, css-selector, css-property)
(css-indent-offset): Specify custom group.

(bibtex-style-indent-basic): Specify a custom group.

(holiday-list): Rename it back to `list-holidays', but leave
`holiday-list' as an alias.

*** empty log message ***

Fix makeinfo version regexp.

*** empty log message ***

(cvs-tags-list, cvs-retrieve-revision, cvs-find-modif)
(cvs-execute-single-file): Use process-file.
(cvs-run-process): Use start-file-process.

* xt-mouse.el (xterm-mouse-mode): Add hooks here not at the top
level.  Remove the hooks when turning off the mode.

* term/xterm.el: Require xt-mouse at compile time.
(terminal-init-xterm): Turn on xterm mouse tracking for this
terminal if xterm-mouse-mode is enabled.

(xterm-function-map): Replace bindings that were
deleted by the merge.

(xterm-function-map): Delete duplicated entries.

*** empty log message ***

(bubbles-version): Bump value to "0.5".
(bubbles-mode-map): Move define-key statements here.
(bubbles-game-theme-menu): Ditto.
(bubbles-graphics-theme-menu): Ditto.
(bubbles-menu): Ditto.
(bubbles-mode): Initialize buffer-undo-list, redisplay.
(bubbles--initialize): Reset buffer-undo-list, redisplay.
(bubbles-plop): Set buffer-undo-list, redisplay.
(bubbles-undo): Reset buffer-undo-list, redisplay.
(bubbles--show-images): Take care of missing text properties.

(fancy-startup-text, fancy-about-text): Fix face quoting.

(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.

(xg_separator_p) <separator_names>: Move to file scope.

(init_fringe_bitmap) <swap nibble>: Move to file scope.

Add arch tagline

Rename all list-holidays instances to holiday-list.

Rename all check-calendar-holidays callers to calendar-check-holidays.

Rename all list-calendar-holidays callers to calendar-list-holidays,
and list-holidays to holiday-list.

Rename all list-calendar-holidays callers to calendar-list-holidays,
list-holidays to holiday-list, check-calendar-holidays to
calendar-check-holidays, and mark-calendar-holidays to
calendar-mark-holidays.

Rename all filter-visible-calendar-holidays callers to
holiday-filter-visible-calendar.

Comment.

Update all instances of mark-calendar-holidays,
list-calendar-holidays, list-holidays with the new names.

*** empty log message ***

* tramp.texi (Filename Syntax): Provide links to "Inline methods"
and "External transfer methods".