Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 59-69)

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

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

2007-07-23  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the
   underlying file is uptodate.

2007-07-17  Dan Nicolaescu  <dann@ics.uci.edu>

   * lisp/vc.el: Add more info about the vc-registered function.

2007-07-15  Richard M. Stallman  <rms@gnu.org>

   * lisp/kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys.

   * lisp/tutorial.el (tutorial--find-changed-keys):
   Handle C-x specially like ESC.

2007-07-15  Aaron Hawley  <aaronh@garden.org>

   * lisp/tar-mode.el (tar-get-descriptor): No error for zero-length file.

2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
   string.

2007-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.

2007-07-16  Richard M. Stallman  <rms@gnu.org>

   * lispref/display.texi (Defining Faces): Fix previous change.

2007-07-20  Eli Zaretskii  <eliz@gnu.org>

   * src/w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32):
   Define if not defined.

2007-07-18  Jason Rumney  <jasonr@gnu.org>

   * src/w32proc.c (w32_executable_type): Handle 64 bit executables.

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

10 files changed, 65 insertions, 19 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 264bd2ae9ec..0a8e7421056 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the
+	underlying file is uptodate.
+
 2007-07-23   Christopher J. Madsen  <cjm@cjmweb.net>
 
 	* replace.el (perform-replace): Use isearch-no-upper-case-p.
@@ -364,6 +369,10 @@
 	avoid incorrect kmacro-ring-empty-p messages.
 	Reported by Michael Schierl <schierlm@gmx.de>.
 
+2007-07-17  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc.el: Add more info about the vc-registered function.
+
 2007-07-17  Michael Albinus  <michael.albinus@gmx.de>
 
 	* files.el (file-remote-p): Introduce optional parameter
@@ -469,6 +478,17 @@
 	* bookmark.el (bookmark-show-all-annotations):
 	Make sure each inserted annotation ends with newline.
 
+2007-07-15  Richard Stallman  <rms@gnu.org>
+
+	* kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys.
+
+	* tutorial.el (tutorial--find-changed-keys):
+	Handle C-x specially like ESC.
+
+2007-07-15  Aaron Hawley  <aaronh@garden.org>
+
+	* tar-mode.el (tar-get-descriptor): No error for zero-length file.
+
 2007-07-15  Juri Linkov  <juri@jurta.org>
 
 	* delsel.el (delete-selection-pre-hook):
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 906e747cac5..458dfcff523 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -519,15 +519,13 @@ non-nil, otherwise in local time."
           (mailing-address (or add-log-mailing-address user-mail-address)))
 
       (when whoami
-        (setq full-name (read-string "Full name: "
-                                     (or add-log-full-name (user-full-name))))
+        (setq full-name (read-string "Full name: " full-name))
         ;; Note that some sites have room and phone number fields in
         ;; full name which look silly when inserted.  Rather than do
         ;; anything about that here, let user give prefix argument so that
         ;; s/he can edit the full name field in prompter if s/he wants.
         (setq mailing-address
-              (read-string "Mailing address: "
-                           (or add-log-mailing-address user-mail-address))))
+	      (read-string "Mailing address: " mailing-address)))
 
       ;; If file starts with a copyright and permission notice, skip them.
       ;; Assume they end at first blank line.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6a66ebbf756..fa1f2527894 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
+	string.
+
+2007-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.
+
 2007-07-14  David Kastrup  <dak@gnu.org>
 
 	* gnus-art.el (gnus-mime-delete-part): Don't go through article-edit
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 0d5443f576c..21c99749804 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -215,11 +215,11 @@ If nil, a faster, but more primitive, buffer is used instead."
 (put 'gnus-server-offline-face 'face-alias 'gnus-server-offline)
 
 (defvar gnus-server-font-lock-keywords
-  '(("(\\(agent\\))" 1 gnus-server-agent)
-    ("(\\(opened\\))" 1 gnus-server-opened)
-    ("(\\(closed\\))" 1 gnus-server-closed)
-    ("(\\(offline\\))" 1 gnus-server-offline)
-    ("(\\(denied\\))" 1 gnus-server-denied)))
+  '(("(\\(agent\\))" 1 'gnus-server-agent)
+    ("(\\(opened\\))" 1 'gnus-server-opened)
+    ("(\\(closed\\))" 1 'gnus-server-closed)
+    ("(\\(offline\\))" 1 'gnus-server-offline)
+    ("(\\(denied\\))" 1 'gnus-server-denied)))
 
 (defun gnus-server-mode ()
   "Major mode for listing and editing servers.
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 26eae64777f..acd39c8dfa1 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -162,7 +162,10 @@ This can be either \"inline\" or \"attachment\".")
 Each element consist of the following entries: label,
 start-regexp, end-regexp, extract-function, test-function.
 
-After modifying this list you must run \\[mm-uu-configure].")
+After modifying this list you must run \\[mm-uu-configure].
+
+You can disable elements from this list by customizing
+`mm-uu-configure-list'.")
 
 (defcustom mm-uu-configure-list '((shar . disabled))
   "A list of mm-uu configuration.
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 8d162e73da6..094b3b02b6f 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -798,8 +798,9 @@ may be shaded by a local key binding."
 	  ok cmd)
       (when (= (length key-seq) 1)
 	(let ((ch (aref key-seq 0)))
-	  (if (or (and (>= ch ?0) (<= ch ?9))
-		  (and (>= ch ?A) (<= ch ?Z)))
+	  (if (and (integerp ch)
+		   (or (and (>= ch ?0) (<= ch ?9))
+		       (and (>= ch ?A) (<= ch ?Z))))
 	      (setq key-seq (concat "\C-x\C-k" key-seq)
 		    ok t))))
       (when (and (not (equal key-seq ""))
diff --git a/lisp/ses.el b/lisp/ses.el
index 4f51c803de1..c729ca4b432 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1470,17 +1470,22 @@ Narrows the buffer to show only the print area.  Gives it `read-only' and
   (overlay-put ses--curcell-overlay 'face 'underline))
 
 (defun ses-cleanup ()
-  "Cleanup when changing a buffer from SES mode to something else.  Delete
-overlay, remove special text properties."
+  "Cleanup when changing a buffer from SES mode to something else.
+Delete overlays, remove special text properties."
   (widen)
   (let ((inhibit-read-only t)
+        ;; When reverting, hide the buffer name, otherwise Emacs will ask
+        ;; the user "the file is modified, do you really want to make
+        ;; modifications to this buffer", where the "modifications" refer to
+        ;; the irrelevant set-text-properties below.
+        (buffer-file-name nil)
 	(was-modified      (buffer-modified-p)))
     ;;Delete read-only, keymap, and intangible properties
     (set-text-properties (point-min) (point-max) nil)
     ;;Delete overlay
     (mapc 'delete-overlay (overlays-in (point-min) (point-max)))
     (unless was-modified
-      (set-buffer-modified-p nil))))
+      (restore-buffer-modified-p nil))))
 
 ;;;###autoload
 (defun ses-mode ()
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index b97cb11165e..3d908eb3191 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -667,7 +667,7 @@ appear on disk when you save the tar-file's buffer."
 		     ((eq link-p 38) "a volume header")
 		     ((eq link-p 55) "an extended pax header")
 		     (t "a link"))))
-    (if (zerop size) (error "This is a zero-length file"))
+    (if (zerop size) (message "This is a zero-length file"))
     descriptor))
 
 (defun tar-mouse-extract (event)
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 7c97579ab6e..6a52d751c5b 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -431,11 +431,17 @@ where
 	       (def-fun (nth 0 kdf))
 	       (def-fun-txt (format "%s" def-fun))
 	       (rem-fun (command-remapping def-fun))
+	       ;; Handle prefix definitions specially
+	       ;; so that a mode that rebinds some subcommands
+	       ;; won't make it appear that the whole prefix is gone.
 	       (key-fun (if (eq def-fun 'ESC-prefix)
 			    (lookup-key global-map [27])
-			  (key-binding key)))
+			  (if (eq def-fun 'Control-X-prefix)
+			      (lookup-key global-map [24])
+			    (key-binding key))))
 	       (where (where-is-internal (if rem-fun rem-fun def-fun)))
 	       cwhere)
+
 	  (if where
 	      (progn
 		(setq cwhere (car where)
diff --git a/lisp/vc.el b/lisp/vc.el
index d12a6c20eee..0bbaf33d78d 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -113,8 +113,12 @@
 ;; * registered (file)
 ;;
 ;;   Return non-nil if FILE is registered in this backend.  Both this
-;;   function as well as `state' should be careful to fail gracefully in the
-;;   event that the backend executable is absent.
+;;   function as well as `state' should be careful to fail gracefully
+;;   in the event that the backend executable is absent.  It is
+;;   preferable that this function's body is autoloaded, that way only
+;;   calling vc-registered does not cause the backend to be loaded
+;;   (all the vc-FOO-registered functions are called to try to find
+;;   the controlling backend for FILE.
 ;;
 ;; * state (file)
 ;;