(read-file-modes): Set default value to the original

mode string using absolute notation like u=rwx,g=rx,o=rx.
Use it as the `default' arg of `read-string'.

diff --git a/lisp/files.el b/lisp/files.el
index 1a18a1d1b1731ae41cb5fa834f9451fc21647e24..cf9f82da51e5e72a899bc5f05fe457023f8974fa 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5765,7 +5765,19 @@ PROMPT is used as the prompt, default to `File modes (octal or symbolic): '.
 ORIG-FILE is the original file of which modes will be change."
   (let* ((modes (or (if orig-file (file-modes orig-file) 0)
                    (error "File not found")))
-        (value (read-string (or prompt "File modes (octal or symbolic): "))))
+        (modestr (and (stringp orig-file)
+                      (nth 8 (file-attributes orig-file))))
+        (default
+          (and (stringp modestr)
+               (string-match "^.\\(...\\)\\(...\\)\\(...\\)$" modestr)
+               (replace-regexp-in-string
+                "-" ""
+                (format "u=%s,g=%s,o=%s"
+                        (match-string 1 modestr)
+                        (match-string 2 modestr)
+                        (match-string 3 modestr)))))
+        (value (read-string (or prompt "File modes (octal or symbolic): ")
+                            nil nil default)))
     (save-match-data
       (if (string-match "^[0-7]+" value)
          (string-to-number value 8)