Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 902-908)

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

 * emacs--rel--22  (patch 131-137)

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

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

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

6 files changed, 65 insertions, 28 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index daf43c08d97..d96a8a8cca4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-25  Jonathan Yavner  <jyavner@member.fsf.org>
+
+        * ses-example.ses: Get rid of silly life-universe-everything local
+        variable.  `symbolic-formulas' is now `ses--symbolic-formulas'.
+
+2007-10-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Mention desktop locking.
+
 2007-10-10  Eric S. Raymond  <esr@snark.thyrsus.com>
 
         * NEWS: Explain the VC fileset changes a bit better.
diff --git a/etc/NEWS b/etc/NEWS
index 00faf92d29a..d2298233c83 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -166,6 +166,18 @@ its usage.
 
 * Changes in Specialized Modes and Packages in Emacs 23.1
 
+** isearch can now search through multiple ChangeLog files.
+When running isearch in a ChangeLog file, if the search fails,
+then another C-s tries searching the previous ChangeLog,
+if there is one (e.g. go from ChangeLog to ChangeLog.12).
+
+This is enabled if isearch-buffers-multi is non-nil.
+
++++
+** In Dired-x, all command guesses for ! are now added to the default
+list accessible by M-n instead of pushing all guesses temporarily into
+the history list.
+
 ** smerge-refine highlights word-level details of changes in conflict.
 It's used automatically as you move through conflicts, see smerge-auto-refine.
 
@@ -179,13 +191,17 @@ It's used automatically as you move through hunks, see diff-auto-refine.
 ** 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.
+** In the `copyright' package, you can specify your copyright holders' names.
 Only copyright lines with holders matching copyright-names-regexp will be
 considered for update.
 
 ** eldoc highlights the function argument under point
 with the face `eldoc-highlight-function-argument'.
 
++++
+** defcustom accepts new keyword arguments, `:safe' and `:risky', which
+set a variable's `safe-local-variable' and `risky-local-variable' property.
+
 ** VC
 *** Clicking on the VC mode-line entry now pops the VC menu.
 
@@ -211,7 +227,7 @@ tex-suscript-height-minimum.
 `string', disabled by default.
 
 *** New variable `bibtex-cite-matcher-alist' contains rules to
-identify cited keys in BibTeX entries, used by `bibtex-find-crossref.
+identify cited keys in BibTeX entries, used by `bibtex-find-crossref'.
 
 *** Command `bibtex-url' now allows multiple URLs per entry.
 
@@ -251,6 +267,9 @@ that either version can be used as inferior Python by python.el.
 
 *** The variable `fortran-line-length' can change the fixed-form line-length.
 
++++
+*** (The increasingly misnamed) F90 mode supports Fortran 2003 syntax.
+
 ** Miscellaneous
 
 *** comint-mode uses `start-file-process' now (see Lisp Changes).
@@ -282,8 +301,19 @@ supported on other platforms, but not on Windows due to using the winsock
 
 * Lisp Changes in Emacs 23.1
 
++++
+** A list of default values can be specified for the DEFAULT argument of
+functions `read-from-minibuffer', `read-string', `read-command',
+`read-variable', `read-buffer', `completing-read'.  Elements of this list
+are available for inserting into the minibuffer by typing `M-n'.
+For empty input these functions return the first element of this list.
+
+** `custom-note-var-changed' tells Custom to treat the change in a certain
+variable as having been made within Custom.
+
 ** `frame-inherited-parameters' lets new frames inherit parameters from
 the selected frame.
+
 ** New keymap `input-decode-map' overrides like key-translation-map, but
 applies before function-key-map.  Also it is terminal-local contrary to
 key-translation-map.  Terminal-specific key-sequences are generally added to
@@ -376,11 +406,11 @@ with a given image specification.
 Use this instead of "~/.emacs.d".
 
 +++
-** The new function `start-file-process is similar to `start-process',
+** The new function `start-file-process' is similar to `start-process',
 but obeys file handlers.  The file handler is chosen based on
 `default-directory'.  The functions `start-file-process-shell-command'
 and `process-file-shell-command' are also new; they call internally
-`start-file-process and `process-file', respectively.
+`start-file-process' and `process-file', respectively.
 
 +++
 ** `file-remote-p' has new optional parameters IDENTIFICATION and CONNECTED.
@@ -398,6 +428,12 @@ forms to subroutines.
 
 * New Packages for Lisp Programming in Emacs 23.1
 
+** The package isearch-multi.el has been added.  It implements a new mode
+`isearch-buffers-minor-mode' that allows isearch to search through
+multiple buffers.  In this mode a new variable
+`isearch-buffers-next-buffer-function' defines the function to call
+to get the next buffer to search in the series of multiple buffers.
+
 ** The new package avl-tree.el deals with the AVL tree data structure.
 
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index f68285d1dfd..89e90fb361a 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -59,7 +59,7 @@ 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.
 
-** focus-follows-mouse defaults to nil on MS Windows
+** focus-follows-mouse defaults to nil on MS Windows.
 Previously this variable was incorrectly documented as having no effect
 on MS Windows, and the default was inappropriate for the majority of
 Windows installations. Users of software which modifies the behaviour of
@@ -70,6 +70,13 @@ this variable.
 was needed.  In text command mode, if you have problems before execution has
 started, use M-x gud-gdb.
 
+** desktop.el now detects conflicting uses of the desktop file.
+When loading the desktop, desktop.el can now detect that the file is already
+in use.  The default behavior is to ask the user what to do, but you can
+customize it with the new option `desktop-load-locked-desktop'.  When saving,
+desktop.el warns about attempts to overwrite a desktop file if it determines
+that the desktop being saved is not an update of the one on disk.
+
 * New Modes and Packages in Emacs 22.2
 
 ** bibtex-style-mode helps you write BibTeX's *.bst files.
@@ -97,11 +104,10 @@ This can be used to add menu entries for backend specific functions.
 
 * Lisp Changes in Emacs 22.2.
 
-** The command `repeat' no longer attempts to repeat a command bound
-   to an input event.
-
+** Frame-local variables are deprecated and are slated for removal.
+   Use frame parameters instead.
 ** The function invisible-p returns non-nil if the character
-   after a specified position is invisible.
+after a specified position is invisible.
 
 +++
 ** inhibit-modification-hooks is bound to t while running modification hooks.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index d098fcc2c11..049c8c8bb6d 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2204,12 +2204,9 @@ month names with consistent widths for some locales on some versions
 of Windows. This is caused by a deficiency in the underlying system
 library function.
 
-The functions set-time-zone-rule, and display-time-world (which uses it)
-do not work on Windows. Fixing this is difficult, since Windows uses
-localtime for the system clock, and any attempt to change the timezone
-would have to be accompanied by a clock change for the results to remain
-consistent. The way in which these functions are used is not intended to
-cause such system-wide disruption.
+The function set-time-zone-rule gives incorrect results for many
+non-US timezones.  This is due to over-simplistic handling of
+daylight savings switchovers by the Windows libraries.
 
 Files larger than 4GB cause overflow in the size (represented as a
 32-bit integer) reported by `file-attributes'.  This affects Dired as
diff --git a/etc/TODO b/etc/TODO
index 5b438c778f3..c702f8997c3 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -329,9 +329,6 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
   Check the assignments file for other packages which might go in and
   have been missed.
 
-** Install ruby-mode (needs assignment)?
-   http://lists.gnu.org/archive/html/emacs-devel/2007-06/msg00051.html
-
 ** Make keymaps a first-class Lisp object (this means a rewrite of
   keymap.c).  What should it do apart from being opaque ?
   multiple inheritance ?  faster where-is ?  no more fix_submap_inheritance ?
@@ -554,13 +551,6 @@ but which can also be used as a modifier).
    the window associated with that modeline.
    http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg02416.html
 
-** When running isearch in a ChangeLog file, if the search fails,
-   then after another C-s try searching the previous ChangeLog, if
-   there is one. (e.g. go from ChangeLog to ChangeLog.12).
-   http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg02237.html
-   Juri Linkov has a patch for this:
-   http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00265.html
-
 * Internal changes
 
 ** Cleanup all the GC_ mark bit stuff -- there is no longer any distinction
diff --git a/etc/ses-example.ses b/etc/ses-example.ses
index 6155483e29d..9ae2e879f6f 100644
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -119,7 +119,7 @@ Sales summary - Acme fundraising
 
 (ses-cell A16 990904 990904 nil nil)
 (ses-cell B16 Eastern-area (quote Eastern-area) nil (D7 C7 D6 C6 D5 C5))
-(ses-cell C16 21 (/ life-universe-everything 2) nil (D7 C7 D6 C6 D5 C5))
+(ses-cell C16 21 (/ 42 2) nil (D7 C7 D6 C6 D5 C5))
 (ses-cell D16 nil nil nil nil)
 (ses-cell E16 nil nil nil nil)
 
@@ -202,8 +202,7 @@ Sales summary - Acme fundraising
 
 ;;; Local Variables:
 ;;; mode: ses
-;;; life-universe-everything: 42
-;;; symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other"))
+;;; ses--symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other"))
 ;;; End:
 
 ;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007