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

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

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

Fix last commit.

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

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

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

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

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

(abbrev--write): Fix up typo.

(define-abbrev-table): Doc fix.

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

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

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

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.

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

Whitespace.

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

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

remember.el: Make remember-buffer an alias of remember-finalize

Merge from gnus--devo--0

Patches applied:

 * gnus--devo--0  (patch 404-406)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 266)

   - Merge from emacs--rel--22

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

*** empty log message ***

Remove mentions of Planner in remember.el.

Advise removal of old vc-svn.

(bad-packages-alist): Add an entry for standalone vc-svn.

Remove HAVE_X11R5.

Remove HAVE_X11R5.

Remove HAVE_X11R5 and HAVE_X11R4.

Regenerate.

Regenerate.

Remove HAVE_X11R5 check.

* makefile.w32-in (obj): Remove sunfns.o.

* makefile.MPW (SOME_MACHINE_OBJECTS): Remove sunfns.o.

* Makefile.in: Remove references to sunfns.c and sunfns.o.

(authors-scan-change-log)
(authors-scan-el): Don't enable local eval; enable only safe local
variables, without querying.

Remember: Fix mistake in last commit and improve remember-mode docstring.

remember.el (remember-mode-map): Define and initialize in one step.

Remember: Put on a low-cookie diet, and improve docstrings.

*** empty log message ***

* printing.el (printing): Fix :version, printing.el was included
for in emacs-22.1.
(pr-path-style, pr-path-alist, pr-txt-name)
(pr-txt-printer-alist, pr-ps-name, pr-ps-printer-alist)
(pr-temp-dir, pr-ps-temp-file, pr-file-modes, pr-gv-command)
(pr-gs-command, pr-gs-switches, pr-gs-device, pr-gs-resolution)
(pr-print-using-ghostscript, pr-file-tumble, pr-auto-region)
(pr-auto-mode, pr-mode-alist, pr-ps-utility)
(pr-ps-utility-alist, pr-menu-char-height, pr-menu-char-width)
(pr-setting-database, pr-visible-entry-list)
(pr-delete-temp-file, pr-list-directory, pr-buffer-name)
(pr-buffer-name-ignore, pr-buffer-verbose): Remove incorrect
:version.

(nroff-mode): Set indent-line-function.
(nroff-indent-line-function): New function.
(nroff-count-text-lines): Use nroff-forward-text-line rather than
obsolete alias.

(doc-view-cache-directory): Remove superfluous concat.

Ryan Yeske <rcyeske at gmail.com>

(rcirc-last-quit-line, rcirc-last-line)
(rcirc-elapsed-lines): New argument PROCESS.  Update callers.
(rcirc-print): Only update the line count when not marking the
line as ommittable.
(rcirc-log-write): Specify coding system when writing logfile.
(rcirc-markup-fill): Make sure ellipsis does not cause line to wrap.

Johan Bockg�  <bojohan at gnu.org>

(x_draw_stretch_glyph_string): Don't set s->stippled_p here, since it
has already been set by x_set_glyph_string_gc from
x_draw_glyph_string.

http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01571.html

(footnote-numeric-regexp)
(footnote-english-upper-regexp, footnote-english-lower-regexp)
(footnote-roman-lower-regexp, footnote-roman-upper-regexp):
Match multi-character footnotes.

* ediff-util.el (ediff-nuke-selective-display): Move definition to
top level, make it dependent on the emacs flavor.

* play/gamegrid.el (gamegrid-kill-timer, gamegrid-start-timer):
Test for XEmacs not for itimer.

* cmdargs.texi (Misc Variables): Remove Sun windows info.

* MACHINES: Remove Sun windows info.

* term/sun-mouse.el:
* obsolete/sun-fns.el:
* obsolete/sun-curs.el: Remove files.

* term/sun.el (select-previous-complex-command):

* sunfns.c: Remove file

* m/sun386.h:
* m/sun2.h:
* m/sparc.h: Remove Sun windows code.

Silence some byte-compiler warnings in ERC

* doc-view.el (doc-view-cache-directory): Fix bug where an integer
was given to concat.

(doc-view-mode-map): Bind doc-view-goto-page to the keys
used normally for goto-line.  Change `g' to revert the buffer.
Add redundant `r' binding for buffer-revert.

(mail-abbrevs-mode): Use define-minor-mode.
(mail-abbrevs-setup): Use abbrev-expand-functions.
(build-mail-abbrevs): Use with-temp-buffer.
(define-mail-abbrev): Simplify.
(mail-abbrev-expand-wrapper): Rename sendmail-pre-abbrev-expand-hook.
Change it for use on abbrev-expand-functions.
(mail-abbrev-complete-alias): Use with-syntax-table.

* net/tramp.el (tramp-handle-shell-command): Call `start-file-process'
directly.  Fix bug in deleting temp file.

(python-mode-abbrev-table): Use :regexp.
Merge defvar and define-abbrev-table.
(def-python-skeleton): Use :case-fixed and :enable-function.
(python-abbrev-pc-hook, python-abbrev-syntax-table, python-pea-hook): Remove.
(python-mode): Don't modify pre-abbrev-expand-hook.

* keyboard.c (syms_of_keyboard): Initialize the initial_kboard.
(init_keyboard): Set current_kboard's window-system to nil.
(tty_read_avail_input): Typo.
* frame.c (make_initial_frame): Don't initialize the initial_kboard.

(ediff-file-checked-out-p)
(ediff-file-checked-in-p): Only call vc-locking-user for XEmacs.

(abbrev-symbol): Correct let->let*.
(abbrev--before-point): Only use abbrev-start-location if before point.

(strokes-alphabetic-lessp): Simplify.  Doc fix.
(strokes-unload-hook): Remove function and variable.
(strokes-unload-function): New-style unload function,
adapted from `strokes-unload-hook'.

(cl-cannot-unload): Remove function.
(cl-unload-hook): Remove variable.
(cl-unload-function): New-style unload function,
adapted from `cl-cannot-unload'.

(elp-unload-hook): Remove function and variable.
(elp-unload-function): New-style unload function,
adapted from `elp-unload-hook'.