Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 806-813)

   - Merge from emacs--rel--22
   - Update from CVS

 * emacs--rel--22  (patch 51-58)

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

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230

5 files changed, 130 insertions, 19 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b88e98af123..3b459fc952b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,24 @@
+2007-07-15  Karl Fogel  <kfogel@red-bean.com>
+
+        * NEWS: Revert 2007-07-13T23:20:21Z!kfogel@red-bean.com, which
+        documented bookmark keybinding changes that were later reverted.
+
+2007-07-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * PROBLEMS: Mention gtk-engines-qt problem.
+
+2007-07-13  Karl Fogel  <kfogel@red-bean.com>
+
+        * NEWS: Update for recent bookmark keybinding changes.
+
+2007-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Add Tramp and comint-mode changes.
+
+2007-07-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: `file-remote-p' has a new optional parameter CONNECTED.
+
 2007-07-07  Michael Albinus  <michael.albinus@gmx.de>
 
         * NEWS: New function `start-file-process'.
diff --git a/etc/NEWS b/etc/NEWS
index 8006fa427ed..6b21ba4eb1a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -73,6 +73,9 @@ recenter the visited source file.  Its value can be a number (for example,
 
 * Changes in Specialized Modes and Packages in Emacs 23.1
 
+** compilation-auto-jump-to-first-error tells `compile' to jump to
+the first error encountered during compilations.
+
 ** In the `copyright' package, you can specify your copyright holders's names.
 Only copyright lines with holders matching copyright-names-regexp will be
 considered for update.
@@ -95,9 +98,49 @@ identify cited keys in BibTeX entries, used by `bibtex-find-crossref.
 
 *** Command `bibtex-url' now allows multiple URLs per entry.
 
++++
+** Tramp
+
+*** New connection methods.
+The new methods "plinkx", "plink2", "psftp", "sftp" and "fish" have
+been introduced.  There are also new so-called gateway methods
+"tunnel" and "socks".
+
+*** Multihop syntax has been removed.
+The pseudo-method "multi" has been removed.  Instead of, multi hops
+can be specified by the new variable `tramp-default-proxies-alist'.
+
+*** More default settings.
+Default values can be set via the variables `tramp-default-user',
+`tramp-default-user-alist' and `tramp-default-host'.
+
+*** Connection information is cached.
+In order to reduce connection setup, information about used
+connections are kept persistent in a file.  The name of this file is
+defined in the variable `tramp-persistency-file-name'.
+
+*** Control of remote processes.
+Running processes on a remote host can be controlled by settings in
+`tramp-remote-path' and `tramp-remote-process-environment'.
+
+*** Success of remote copy is checked.
+When the variable `file-precious-flag' is set, the success of a remote
+file copy is checked via the file's checksum.
+
+** comint-mode uses `start-file-process' now (see Lisp Changes).
+If `default-directory' is a remote file name, subprocesses are started
+on the corresponding remote system.
+
 
 * Changes in Emacs 23.1 on non-free operating systems
 
+---
+** IPv6 is supported on MS-Windows.
+Emacs now supports IPv6 on Windows XP and later, and earlier versions
+of Windows with third party IPv6 stacks installed. Previously IPv6 was
+supported on other platforms, but not on Windows due to using the winsock
+1.1 header file, even though Emacs was linking to the winsock 2 library.
+
 
 * Incompatible Lisp Changes in Emacs 23.1
 
@@ -107,6 +150,16 @@ identify cited keys in BibTeX entries, used by `bibtex-find-crossref.
 
 * Lisp Changes in Emacs 23.1
 
++++ 
+** In `condition-case', a handler can specify "let the debugger run first".
+
+You do this by writing `debug' in the list of conditions to be handled,
+like this:
+
+    (condition-case nil
+        (foo bar)
+      ((debug error) nil))
+
 ** The `require-match' argument to `completing-read' accepts a new value
 `confirm-only'.
 
@@ -126,6 +179,14 @@ with a given image specification.
 but obeys file handlers.  The file handler is chosen based on
 `default-directory'.
 
++++
+** `file-remote-p' has a new optional parameter CONNECTED.
+With this paramter passed non-nil, it is checked whether a remote
+connection has been established already.
+
+** The two new functions `looking-at-p' and `string-match-p' can do
+the same matching as `looking-at' and `string-match' without changing
+the match data.
 
 * New Packages for Lisp Programming in Emacs 23.1
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 4da26ff9271..3d5ff1aff3a 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -46,6 +46,11 @@ before deleting/copying the indicated directory recursively.
 than the window, the usual keys for moving the cursor cause the image
 to be scrolled horizontally or vertically instead.
 
+** Scrollbars follow the system theme on Windows XP and later.
+Windows XP introduced themed scrollbars, but applications have to take
+special steps to use them. Emacs now has the appropriate resources linked
+in to make it use the scrollbars from the system theme.
+
 * New Modes and Packages in Emacs 22.2
 
 ** The new package css-mode.el provides a major mode for editing CSS files.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 0d66c375e2b..1747ae791a5 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1164,6 +1164,10 @@ present or commented out:
    Emacs*Foreground
    Emacs*Background
 
+It is also reported that a bug in the gtk-engines-qt engine can cause this if
+Emacs is compiled with Gtk+.
+The bug is fixed in version 0.7 or newer of gtk-engines-qt.
+
 *** KDE: Emacs hangs on KDE when a large portion of text is killed.
 
 This is caused by a bug in the KDE applet `klipper' which periodically
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index d9f60f62f8c..588d4523206 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{5.01}
+\def\orgversionnumber{5.03}
 \def\versionyear{2007}          % latest update
 \def\year{2007}                 % latest copyright year
 
@@ -544,6 +544,24 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{create sparse tree with matching tags}{C-c \\}
 \key{globally (agenda) match tags at cursor}{C-c C-o}
 
+\section{Properties and Column View}
+
+\key{special commands in property lines}{C-c C-c}
+\key{next/previous allowed value}{S-left/right}
+\key{turn on column view}{C-c C-x C-c}
+
+\key{quit column view}{q}
+\key{next/previous allowed value}{S-left/right}
+\key{next/previous allowed value}{n / p}
+\key{edit value}{e}
+\key{edit allowed values list}{a}
+\key{show value}{v}
+\key{make column wider/narrower}{> / <}
+\key{move column left/right}{M-left/right}
+\key{add new column}{M-S-right}
+\key{Delete current column}{M-S-left}
+
+
 \section{Timestamps}
 
 \key{prompt for date and insert timestamp}{C-c .}
@@ -566,6 +584,8 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 %\key{... forward/backward one month}{M-S-LEFT/RIGT}
 \key{Toggle custom format display for dates/times}{C-c C-x C-t}
 
+\newcolumn
+
 {\bf Clocking time}
 
 \key{start clock on current item}{C-c C-x C-i}
@@ -575,12 +595,6 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{remove displayed times}{C-c C-c}
 \key{insert/update table with clock report}{C-c C-x C-r}
 
-\section{LaTeX and cdlatex-mode}
-
-\key{preview LaTeX fragment}{C-c C-x C-l}
-\key{Expand abbreviation (cdlatex-mode)}{TAB}
-\key{Insert/modify math symbol (cdlatex-mode)}{` / '}
-
 \section{Agenda Views}
 
 \key{add/move current file to front of agenda}{C-c [}
@@ -648,6 +662,7 @@ To set categories, add lines like$^2$:
 \key{change timestamp to today}{>}
 \key{insert new entry into diary}{i}
 
+\newcolumn
 \key{start the clock on current item (clock-in)}{I}
 \key{stop the clock (clock-out)}{O}
 \key{cancel current clock}{X}
@@ -656,7 +671,6 @@ To set categories, add lines like$^2$:
 
 \key{Open link in current line}{C-c C-o}
 
-\newcolumn
 {\bf Calendar commands}
 
 \key{find agenda cursor date in calendar}{c}
@@ -678,6 +692,12 @@ Include Emacs diary entries into Org-mode agenda with:
 (setq org-agenda-include-diary t)
 \endexample
 
+\section{LaTeX and cdlatex-mode}
+
+\key{preview LaTeX fragment}{C-c C-x C-l}
+\key{Expand abbreviation (cdlatex-mode)}{TAB}
+\key{Insert/modify math symbol (cdlatex-mode)}{` / '}
+
 \section{Exporting and Publishing}
 
 Exporting creates files with extensions {\it .txt\/} and {\it .html\/}
@@ -690,17 +710,17 @@ some other place.
 \key{insert template of export options}{C-c C-x t}
 \key{toggle fixed width for entry or region}{C-c :}
 
-{\bf HTML formatting}
-
-\key{make words {\bf bold}}{*bold*}
-\key{make words {\it italic}}{/italic/}
-\key{make words \underbar{underlined}}{_underlined_}
-\key{sub- and superscripts}{x\^{}3, J_dust}
-\key{\TeX{}-like macros}{\\alpha, \\to}
-\key{typeset lines in fixed width font}{start with :}
-\key{tables are exported as HTML tables}{start with |}
-\key{links become HTML links}{http:... etc}
-\key{include html tags}{@<b>...@</b>}
+%{\bf HTML formatting}
+
+%\key{make words {\bf bold}}{*bold*}
+%\key{make words {\it italic}}{/italic/}
+%\key{make words \underbar{underlined}}{_underlined_}
+%\key{sub- and superscripts}{x\^{}3, J_dust}
+%\key{\TeX{}-like macros}{\\alpha, \\to}
+%\key{typeset lines in fixed width font}{start with :}
+%\key{tables are exported as HTML tables}{start with |}
+%\key{links become HTML links}{http:... etc}
+%\key{include html tags}{@<b>...@</b>}
 
 %{\bf Export options}
 %