* keyboard.c (discard_mouse_events, make_lispy_event) [WINDOWSNT]:
Remove W32_SCROLL_BAR_CLICK_EVENT.
(lispy_function_keys) [WINDOWSNT]: Add more keys.
(lispy_multimedia_keys) [WINDOWSNT]: New array.
(make_lispy_event) [WINDOWSNT]: Use it to translate
MULTIMEDIA_KEY_EVENT.

(enum event_kind) [WINDOWSNT]: Likewise.
Add MULTIMEDIA_KEY_EVENT.

Define USE_TOOLKIT_SCROLL_BARS.

(w32_pass_multimedia_buttons_to_system): New user option.
(syms_of_w32fns): Export and initialize it.
(w32_wnd_proc): Pass WM_APPCOMMAND on to w32_read_socket.

(WM_APPCOMMAND): Define if not already.
(GET_APPCOMMAND_LPARAM): Likewise.

(enable-local-variables): Doc fix.

Fix last change (synch from the EMACS_22_BASE branch).

Merge from gnus--devo--0

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

Merge from emacs--rel--22

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

(face-normalize-spec): Remove function.
(frame-set-background-mode): Undo last change.

* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.

* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.

* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.

* vc.el (vc-diff-internal): Remove code for an old version of
gnus.

Revert previous change - merge mistake.

(enable-local-variables): Doc fix.

* net/tramp.el (tramp-maybe-open-connection): Use a local copy of
`process-environment'.

Obsolete for some years.

Change regexp to match dir like 'a...b'

Change regexp to match dir like 'a...b'

(smerge-refine-subst): Pass "-d" to diff.

Fix last commit.

Explain combine-and-quote-strings, split-string-and-unquote.
Some re-ordering.

* tramp.texi (Overview): Mention also the PuTTY integration under
Win32.  Remove paragraphs about Tramp's experimental status.
(Frequently Asked Questions): Add code example for highlighting the
mode line.

* net/tramp.el (tramp-handle-substitute-in-file-name): Don't
expand the remote connection identification.
(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
Set also $PS2 and $PS3 when setting $PS1.  Check for shell echoing
before calling stty.

* net/tramp-cache.el (tramp-cache-print)
(tramp-dump-connection-properties): Fix docstring.
(tramp-list-connections): Renamed from
`tramp-cache-list-connections'.

* net/tramp-cmds.el (tramp-cleanup-connection): Apply it.

* net/tramp-ftp.el (tramp-ftp-file-name-handler): Don't expand the
remote connection identification when setting connection property.

* net/tramp-smb.el (tramp-smb-handle-substitute-in-file-name):
"//" substitutes only in the local filename part.

(handle_face_prop): Fix last change.

(struct it): Don't define OVERLAY_STRING_CHUNK_SIZE twice.

* dispextern.h (struct it): Don't define OVERLAY_STRING_CHUNK_SIZE
twice.

* xdisp.c (handle_face_prop): Fix last change.

*** empty log message ***

*** empty log message ***

Placeholder entry about unsupported Mac Carbon port.

Deprecate Mac Carbon port.

Comment.

David Hansen  <david.hansen at gmx.net>

(eshell-extended-glob): Sort matches.

(tpu-map-key): Use unless rather than cond.
Remove superfluous concats.  Move final set-buffer to non-emacs-specific code.

Rob Riepel  <riepel at networking.stanford.edu>

(tpu-map-key): Remove un-needed cond branch.

Johan Bockg�  <bojohan at gnu.org>

(eshell-insertion-filter, eshell-sentinel): Use `with-current-buffer'.

Johan Bockg�  <bojohan at gnu.org>

(eshell-output-filter): Use `with-current-buffer'.

Johan Bockg�  <bojohan at gnu.org>

(eshell-insertion-filter, eshell-sentinel): Use `with-current-buffer'.

Johan Bockg�  <bojohan at gnu.org>

(eshell-output-filter): Use `with-current-buffer'.

*** empty log message ***

(server-start): Only register cleanup after server was
started.

* net/tramp.el (top): Don't autoload `tramp-cache-print'.

* net/tramp-cache (tramp-cache-print): Move down.
(tramp-cache-list-connections): New defun.

* net/tramp-cmds.el (tramp-cleanup-connection): Use it.

*** empty log message ***

*** empty log message ***

(ido-save-history): Write the history file in the current filename
coding system, and add `coding' file-local variable.

*** empty log message ***

(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
abort with a message on unhandled store_type values.

(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
abort with a message on unhandled store_type values.

* textmodes/org.el (org-table-formula-substitute-names): Removed
forgotten temporary debugging code.

*** empty log message ***

*** empty log message ***

(Select Input Method): Describe how to activate an input
method in the text mode.

* tramp.el (tramp-wait-for-output): Ignore escape sequences in the
prompt.

Fix last commit.

(wdired-use-dired-vertical-movement): Doc fix.

net/tls.el (tls-end-of-info): Doc fix.

*** empty log message ***

*** empty log message ***

(utf-7-imap): New coding system.
(utf-7-imap-post-read-conversion): New function.
(utf-7-imap-pre-write-conversion): New function.

(gud-gdb): Remove vestigial gdba doc and code.

*** empty log message ***

(abbrev--write): Fix up typo.

(define-abbrev-table): Doc fix.

(Info-revert-buffer-function): New func.
(Info-mode): Arrange to use it for reverting.

(handle_face_prop): Test for strings that came from overlays,
not just for after-strings and before-strings.
Call face_for_overlay_string and pass the overlay to it.
(handle_display_prop): Determine whether property came from an overlay.
Pass OVERLAY arg to handle_single_display_spec.
(handle_single_display_spec): New arg OVERLAY sets it->from_overlay.
(load_overlay_strings): Fill in it->string_overlays.
(get_overlay_strings_1, push_it, pop_it): Handle it->from_overlays.

(face_for_overlay_string): Function renamed from
face_at_buffer_position_no_overlays, and add arg OVERLAY.

(struct it): New elt string_overlays.
New elt from_overlay, also in stack.
Rearrange a few elements.
(face_for_overlay_string): Decl renamed from
face_at_buffer_position_no_overlays, and add argument.

Whitespace change.

(expand-abbrev): Move point back to expansion's end.

Don't require rx when compiling.
(tls-end-of-info): Rewrite without using rx.
(open-tls-stream)): Use with-current-buffer.

Riccardo Murri  <riccardo.murri at gmail.com>

Require rx when compiling.
(tls-end-of-info): New variable.
(open-tls-stream): Keep reading input until `tls-end-of-info' is matched.

Riccardo Murri  <riccardo.murri at gmail.com>

Require rx when compiling.
(tls-end-of-info): New variable.
(open-tls-stream): Keep reading input until `tls-end-of-info' is matched.

*** empty log message ***

(append-to-register, prepend-to-register):
Don't signal error on empty register; use the text, instead.

Remember: Use define-obsolete-function-alias for `remember-buffer'.

*** empty log message ***

*** empty log message ***

(handle_face_prop): Use face_at_buffer_position_no_overlays
to get the base face for an overlay string.

(face_at_buffer_position_no_overlays): Add decl.

(face_at_buffer_position_no_overlays): New function.

Ulrich Mueller  <ulm at gentoo.org>  (tiny change)

(bad-packages-alist): Anchor semantic regexp.

Ulrich Mueller  <ulm at gentoo.org>  (tiny change)

(bad-packages-alist): Anchor semantic regexp.

In Fortran mode, M-; is now bound to...

(fortran-mode-map): Don't bind M-;.
(fortran-mode): Set values for comment-region-function,
uncomment-region-function and comment-insert-comment-function.
(fortran-uncomment-region): New function.

(nroff-mode): Set comment-insert-comment-function rather than
indent-line-function.
(nroff-indent-line-function): Remove.
(nroff-insert-comment-function): New function.

(comment-dwim): Call comment-insert-comment-function, if defined, for
blank lines.  Doc fix.

(handle_stop): Move some code out of loop.

*** empty log message ***

*** empty log message ***

2007-11-02  Michael Kifer  <kifer@cs.stonybrook.edu>

* ediff-vers (ediff-vc-working-revision): add a quote.

2007-11-02  Drake Wilson  <drake@begriffli.ch>  (tiny change)

* files.el (hack-local-variables): Fix membership tests to avoid
treating all variables as safe if `enable-local-variables' is
set to :safe.

2007-11-02  Drake Wilson  <drake@begriffli.ch>  (tiny change)

* files.el (hack-local-variables): Fix membership tests to avoid
treating all variables as safe if `enable-local-variables' is
set to :safe.

Whitespace.

(tags-table-mode): Disable undo.

(tags-table-mode): Disable undo.

(comment-indent): Let comment-insert-comment-function,
if defined, do all the work of inserting a new comment.

Revert previous change.
Whitespace.

Revert previous change.

(bad-packages-alist): Revert previous change.

(bad-packages-alist): Revert previous change.

* emacs-lisp/lselect.el: Move to obsolete/lselect.el.

* obsolete/lselect.el: Do not warn about unknown functions.

2007-11-02  Michael Kifer  <kifer@cs.stonybrook.edu>

* viper-ex.el (viper-ex): do not ignore the region.

* viper-cmd.el (viper-prev-destructive-command)
(viper-insert-prev-from-insertion-ring): use ring-copy instead of
copy-sequence.

* ediff-util.el (ediff-make-current-diff-overlay): do not use face-name.
Got rid of ediff-copy-list.

* ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not
use face-name.
(ediff-test-utility,ediff-diff-mandatory-option)
(ediff-reset-diff-options): removed to simplify yhe mandatory option
handling on windows.
(ediff-set-diff-options): added.
(ediff-diff-options): changed.

* ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window.
(ediff-vc-merge-internal): use ediff-vc-revision-other-window and
ediff-vc-working-revision.
Require vc-hooks.