# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1275346225 0
# Node ID a82e98d2915bd4647dc34e2da8c01ea9c8ad7e7e
# Parent  c0c86482b2ab8c94555a692a0591328d23454e81# Parent  16046445c7ef9d68a31c735195a357c00f1615ad
Merge from mainline.

diff -r c0c86482b2ab -r a82e98d2915b doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Sun May 30 22:54:27 2010 +0000
+++ b/doc/emacs/ChangeLog	Mon May 31 22:50:25 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-31  Daiki Ueno  <ueno@unixuser.org>
+
+	* dired.texi (Operating on Files): Mention encryption commands
+	(Bug#6315).
+
 2010-05-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* basic.texi (Moving Point): Update due to renaming of commands bound
diff -r c0c86482b2ab -r a82e98d2915b doc/emacs/dired.texi
--- a/doc/emacs/dired.texi	Sun May 30 22:54:27 2010 +0000
+++ b/doc/emacs/dired.texi	Mon May 31 22:50:25 2010 +0000
@@ -688,6 +688,34 @@
 Compress the specified files (@code{dired-do-compress}).  If the file
 appears to be a compressed file already, uncompress it instead.
 
+@findex epa-dired-do-decrypt
+@kindex :d @r{(Dired)}
+@cindex decrypting files (in Dired)
+@item :d
+Decrypt the specified files (@code{epa-dired-do-decrypt}).
+@xref{Dired integration,,, epa, EasyPG Assistant User's Manual}.
+
+@findex epa-dired-do-verify
+@kindex :v @r{(Dired)}
+@cindex verifying digital signatures on files (in Dired)
+@item :v
+Verify digital signatures on the specified files (@code{epa-dired-do-verify}).
+@xref{Dired integration,,, epa, EasyPG Assistant User's Manual}.
+
+@findex epa-dired-do-sign
+@kindex :s @r{(Dired)}
+@cindex signing files (in Dired)
+@item :s
+Digitally sign the specified files (@code{epa-dired-do-sign}).
+@xref{Dired integration,,, epa, EasyPG Assistant User's Manual}.
+
+@findex epa-dired-do-encrypt
+@kindex :e @r{(Dired)}
+@cindex encrypting files (in Dired)
+@item :e
+Encrypt the specified files (@code{epa-dired-do-encrypt}).
+@xref{Dired integration,,, epa, EasyPG Assistant User's Manual}.
+
 @findex dired-do-load
 @kindex L @r{(Dired)}
 @cindex loading several files (in Dired)
diff -r c0c86482b2ab -r a82e98d2915b lisp/ChangeLog
--- a/lisp/ChangeLog	Sun May 30 22:54:27 2010 +0000
+++ b/lisp/ChangeLog	Mon May 31 22:50:25 2010 +0000
@@ -1,3 +1,12 @@
+2010-05-31  Drew Adams  <drew.adams@oracle.com>
+
+	* files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298).
+
+2010-05-31  Juanma Barranquero  <lekktu@gmail.com>
+
+	* subr.el (momentary-string-display): Just use read-event to read
+	the exit event (Bug#6238).
+
 2010-05-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* international/mule.el (define-coding-system): Doc fix (bug#6313).
diff -r c0c86482b2ab -r a82e98d2915b lisp/files.el
--- a/lisp/files.el	Sun May 30 22:54:27 2010 +0000
+++ b/lisp/files.el	Mon May 31 22:50:25 2010 +0000
@@ -4673,7 +4673,7 @@
 
 (defconst directory-files-no-dot-files-regexp
   "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"
-  "Regexp of file names excluging \".\" an \"..\".")
+  "Regexp matching any file name except \".\" and \"..\".")
 
 (defun delete-directory (directory &optional recursive trash)
   "Delete the directory named DIRECTORY.  Does not follow symlinks.
diff -r c0c86482b2ab -r a82e98d2915b lisp/subr.el
--- a/lisp/subr.el	Sun May 30 22:54:27 2010 +0000
+++ b/lisp/subr.el	Mon May 31 22:50:25 2010 +0000
@@ -2204,22 +2204,11 @@
                 (recenter (/ (window-height) 2))))
           (message (or message "Type %s to continue editing.")
                    (single-key-description exit-char))
-          (let (char)
-            (if (integerp exit-char)
-                (condition-case nil
-                    (progn
-                      (setq char (read-char))
-                      (or (eq char exit-char)
-                          (setq unread-command-events (list char))))
-                  (error
-                   ;; `exit-char' is a character, hence it differs
-                   ;; from char, which is an event.
-                   (setq unread-command-events (list char))))
-              ;; `exit-char' can be an event, or an event description list.
-              (setq char (read-event))
-              (or (eq char exit-char)
-                  (eq char (event-convert-list exit-char))
-                  (setq unread-command-events (list char))))))
+	  (let ((event (read-event)))
+	    ;; `exit-char' can be an event, or an event description list.
+	    (or (eq event exit-char)
+		(eq event (event-convert-list exit-char))
+		(setq unread-command-events (list event)))))
       (delete-overlay ol))))
 
 
diff -r c0c86482b2ab -r a82e98d2915b src/ChangeLog
--- a/src/ChangeLog	Sun May 30 22:54:27 2010 +0000
+++ b/src/ChangeLog	Mon May 31 22:50:25 2010 +0000
@@ -21,7 +21,7 @@
 	* font.c (font_delete_unmatched): Check Vface_ignored_fonts.
 	Don't sheck SPEC if it is nil.
 	(font_list_entities): Call font_delete_unmatched if
-	Vface_ignored_fonts is non-nil.
+	Vface_ignored_fonts is non-nil.  (Bug#6287)
 
 2010-05-28  Glenn Morris  <rgm@gnu.org>