Merge from emacs-24; up to 2013-01-01T11:02:14Z!rudalics@gmx.at

2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85c68323cfe..358a23450a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * dired-x.el (dired-mark-extension): Convert comment to doc string.
+
 2013-07-25  Juanma Barranquero  <lekktu@gmail.com>
 
         * desktop.el (desktop--make-frame): Do not pass the `fullscreen'
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index ddb632db692..0c432593909 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -331,9 +331,9 @@ See also the functions:
 ;; Mark files with some extension.
 (defun dired-mark-extension (extension &optional marker-char)
   "Mark all files with a certain EXTENSION for use in later commands.
-A `.' is *not* automatically prepended to the string entered."
-  ;; EXTENSION may also be a list of extensions instead of a single one.
-  ;; Optional MARKER-CHAR is marker to use.
+A `.' is *not* automatically prepended to the string entered.
+EXTENSION may also be a list of extensions instead of a single one.
+Optional MARKER-CHAR is marker to use."
   (interactive "sMarking extension: \nP")
   (or (listp extension)
       (setq extension (list extension)))