(vc-start-entry): Fix setting the in the case the function
is called from vc-dired.  Use when instead of if where
appropriate.

Error if ps-lpr-switches is not a list.

(Special Diary Entries): Fix Thanksgiving example.

Merge from emacs--rel--22

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

(custom-note-var-changed): Remove the `interactive'
spec from this new non-interactive function.

(isearch-mode-end-hook, isearch-mode-end-hook-quit):
Fix docstring.  Reported by Leo Liu <sdl.web@gmail.com>.

(BASE_PURESIZE): Increase to 1130000.

(doc-view-mode-map, doc-view-menu, doc-view-pdf->txt-sentinel):
Adapt to new search UI.
(doc-view-search-backward): New function.
(doc-view-search): Query new regexp if prefix arg is given, else
jump to next/previous match.
(doc-view-mode): Handle compressed files.
(jka-compr): Required for compressed files.

Add query-replace-show-replacement and match-substitute-replacement.

(Query Replace): Mention `query-replace-show-replacement'.

(Replacing Match): Describe new `match-substitute-replacement'.

(query-replace-show-replacement): New defcustom.
(perform-replace): Use `match-substitute-replacement' if
`query-replace-show-replacement' is non-nil.

(match-substitute-replacement): New function.

(emacs-copyright): Add emacs-copyright.

(help-map, help-for-help-internal): Add `C-h C-a'.

Add `button'.  Move up `startup'.

Backport startup screen related changes from the trunk.

* files.el (auto-mode-alist): Select org-mode for files with the
extension ".org".

*** empty log message ***

*** empty log message ***

(describe-function, describe-variable)
(describe-syntax, describe-categories):
Use with-help-window instead of with-output-to-temp-buffer.

(list-colors-display): Use with-help-window instead of with-output-to-temp-buffer.

(list-faces-display, describe-face):
Use with-help-window instead of with-output-to-temp-buffer.

(describe-display-table): Use with-help-window instead of with-output-to-temp-buffer.

(describe-char): Use with-help-window instead of with-output-to-temp-buffer.

(apropos-describe-plist):
Use with-help-window instead of with-output-to-temp-buffer.

(help-mode): Set view-exit-action to bury the
buffer instead of fiddling with windows.  Simplify code.
(help-mode-finish): When help-window eqs t set it to the selected
window and have with-help-window set up view-return-to-alist.
(help-buffer): Add autoload cookie.

(help-window, help-window-point-marker): New variables.
(help-window-select): New option.
(with-help-window): New macro for displaying help windows.
(help-window-display-message, help-window-setup-finish)
(help-window-setup): New functions used for setting up help windows.
(print-help-return-message): Reset help-window to nil.
(view-lossage): Use with-help-window instead of
with-output-to-temp-buffer and move help-window-point-marker after
inserted text.
(describe-bindings, describe-key, describe-mode): Use
with-help-window instead of with-output-to-temp-buffer.

(view-remove-frame-by-deleting): Change default value to t.
Add autoload cookie.
(view-exit-action, view-file, view-file-other-window)
(view-file-other-frame, view-buffer, view-buffer-other-window)
(view-buffer-other-frame): Rewrite doc strings.
(view-return-to-alist-update): New function to remove stale entries
from view-return-to-alist.
(view-mode-enter): Rewrite doc string and simplify code.
(view-mode-exit): Handle new case 'keep-frame.  Don't reset
view-exit-action to nil.  Simplify code and rewrite doc string.

* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
(featurep 'emacs) to t.

* emacs-lisp/bytecomp.el (byte-compile-find-bound-condition): New
function.
(byte-compile-maybe-guarded): Use it to also look for bound
symbols inside `and' forms.  Comment out non-working code that was
trying to avoid warnings for XEmacs code.

* vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.

* vc-svn.el (vc-svn-print-log, vc-svn-diff):
* vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command):
* vc-cvs.el (vc-cvs-print-log, vc-cvs-diff)
(vc-cvs-annotate-command):
* vc-arch.el (vc-arch-diff): Remove test to check if start-process
is bound, it always is.

(load_overlay_strings): Fix copy&paste typo.

Sync charset names with setup-default-fontset.
Append "-1" where second part missing.

(w32-initialize-window-system): Move SJIS font setup here from global scope.

Enable SJIS fonts before creating any fontsets.

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

(ido-save-history): Save the history file in UTF-8,
not the current filename coding system.

(interprogram-cut-function, interprogram-paste-function):
Don't make them frame-local any more.

(x-create-frame-with-faces, tty-create-frame-with-faces):
Don't set interprogram-(cut|paste)-function on each frame.

(x-select-text, x-cut-buffer-or-selection-value):
Make them work in tty frames.
(interprogram-cut-function, interprogram-paste-function): Set them globally.

Revert merge that re-required rx.

*** empty log message ***

*** empty log message ***

*** empty log message ***

*** empty log message ***

(define-abbrev-table): Record the variable definition.

Fix merge error.

(byte-compile-file-form-define-abbrev-table): New function.

Clean the code for checking suitable Emacs version.

If ps-lpr-switches is not a list, force it to be one.

Fix last commit.

Add w32 keyboard changes.

(w32_scroll_bar_handle_click): Use SCROLL_BAR_CLICK_EVENT.
(w32_read_socket): Generate MULTIMEDIA_KEY_EVENT from WM_APPCOMMAND.

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

Patches applied:

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

   - Update from CVS

2007-11-03  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-sum.el (gnus-summary-highlight): Mark as risky local variable.

2007-11-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus.texi, man/gnus-faq.texi, man/message.texi: Bump version to 5.10.9.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-147

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.