Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
Now on revision 99547.
------------------------------------------------------------
revno: 99547
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Mon 2010-02-22 20:38:16 -0800
message:
  * TODO: Replace reference to CVS with explicit version number.
diff:
=== modified file 'lisp/nxml/TODO'
--- lisp/nxml/TODO	2007-11-23 06:58:00 +0000
+++ lisp/nxml/TODO	2010-02-23 04:38:16 +0000
@@ -450,7 +450,7 @@
 
 ** Investigate performance on large files all on one line.
 
-* CVS emacs issues
+* Issues for Emacs versions >= 22
 
 ** Take advantage of UTF-8 CJK support.
------------------------------------------------------------
revno: 99546
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Mon 2010-02-22 14:48:52 +0100
message:
  * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
  setting the modes by `ignore-errors'.  It might fail, for example
  if the file is not owned by the user but the group.
  (tramp-handle-write-region): Ensure, that `tmpfile' is always readable.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-02-21 21:12:46 +0000
+++ lisp/ChangeLog	2010-02-22 13:48:52 +0000
@@ -1,3 +1,10 @@
+2010-02-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
+	setting the modes by `ignore-errors'.  It might fail, for example
+	if the file is not owned by the user but the group.
+	(tramp-handle-write-region): Ensure, that `tmpfile' is always readable.
+
 2010-02-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (directory-listing-before-filename-regexp): Use

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-02-18 10:08:48 +0000
+++ lisp/net/tramp.el	2010-02-22 13:48:52 +0000
@@ -3926,7 +3926,8 @@
 
 	;; Set the mode.
 	(unless (and keep-date copy-keep-date)
-	  (set-file-modes newname (tramp-default-file-modes filename))))
+	  (ignore-errors
+	    (set-file-modes newname (tramp-default-file-modes filename)))))
 
       ;; If the operation was `rename', delete the original file.
       (unless (eq op 'copy)
@@ -5031,7 +5032,10 @@
 	  ;; filename does not exist (eq modes nil) it has been
 	  ;; renamed to the backup file.  This case `save-buffer'
 	  ;; handles permissions.
-	  (when modes (set-file-modes tmpfile modes))
+	  ;; Ensure, that it is still readable.
+	  (when modes
+	    (set-file-modes
+	     tmpfile (logior (or modes 0) (tramp-octal-to-decimal "0400"))))
 
 	  ;; This is a bit lengthy due to the different methods
 	  ;; possible for file transfer.  First, we check whether the
------------------------------------------------------------
revno: 99545
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Sun 2010-02-21 16:12:46 -0500
message:
  * files.el (directory-listing-before-filename-regexp): Use
  stricter matching for iso-style dates, to avoid false matches with
  date-like filenames (Bug#5597).
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-02-21 21:05:13 +0000
+++ lisp/ChangeLog	2010-02-21 21:12:46 +0000
@@ -1,5 +1,9 @@
 2010-02-21  Chong Yidong  <cyd@stupidchicken.com>
 
+	* files.el (directory-listing-before-filename-regexp): Use
+	stricter matching for iso-style dates, to avoid false matches with
+	date-like filenames (Bug#5597).
+
 	* htmlfontify.el (htmlfontify): Doc fix.
 
 	* eshell/eshell.el (eshell): Doc fix.

=== modified file 'lisp/files.el'
--- lisp/files.el	2010-02-14 09:23:52 +0000
+++ lisp/files.el	2010-02-21 21:12:46 +0000
@@ -5592,8 +5592,10 @@
 	 ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README
 
 	 ;; The "[BkKMGTPEZY]?" below supports "ls -alh" output.
-	 ;; The ".*" below finds the last match if there are multiple matches.
-	 ;; This avoids recognizing `jservice  10  1024' as a date in the line:
+
+	 ;; For non-iso date formats, we add the ".*" in order to find
+	 ;; the last possible match.  This avoids recognizing
+	 ;; `jservice 10 1024' as a date in the line:
 	 ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
 
          ;; vc dired listings provide the state or blanks between file
@@ -5601,9 +5603,10 @@
          ;; parantheses:
          ;; -rw-r--r-- (modified) 2005-10-22 21:25 files.el
          ;; This is not supported yet.
-    (purecopy (concat ".*[0-9][BkKMGTPEZY]?" s
-	    "\\(" western "\\|" western-comma "\\|" east-asian "\\|" iso "\\)"
-	    s "+")))
+    (purecopy (concat "\\([0-9][BkKMGTPEZY]? " iso
+		      "\\|.*[0-9][BkKMGTPEZY]? "
+		      "\\(" western "\\|" western-comma "\\|" east-asian "\\)"
+		      "\\) +")))
   "Regular expression to match up to the file name in a directory listing.
 The default value is designed to recognize dates and times
 regardless of the language.")