(ido-copy-current-word): C-o copies region if active.

1 files changed, 15 insertions, 12 deletions

diff --git a/lisp/ido.el b/lisp/ido.el
index b414dcec145..97e285916d6 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2917,18 +2917,21 @@ If repeated, insert text from buffer instead."
   (let ((word (save-excursion
 		(set-buffer ido-entry-buffer)
 		(let ((p (point)) start-line end-line start-name name)
-		  (beginning-of-line)
-		  (setq start-line (point))
-		  (end-of-line)
-		  (setq end-line (point))
-		  (goto-char p)
-		  (if (re-search-backward "[^-_a-zA-Z0-9:./\\~@]" start-line 1)
-		      (forward-char 1))
-		  (setq start-name (point))
-		  (re-search-forward "[-_a-zA-Z0-9:./\\~@]*" end-line 1)
-		  (if (= start-name (point))
-		      nil
-		    (buffer-substring-no-properties start-name (point)))))))
+		  (if (and mark-active (/= p (mark)))
+		      (setq start-name (mark))
+		    (beginning-of-line)
+		    (setq start-line (point))
+		    (end-of-line)
+		    (setq end-line (point))
+		    (goto-char p)
+		    (if (re-search-backward "[^-_a-zA-Z0-9:./\\~@]" start-line 1)
+			(forward-char 1))
+		    (setq start-name (point))
+		    (re-search-forward "[-_a-zA-Z0-9:./\\~@]*" end-line 1)
+		    (if (= start-name (point))
+			(setq start-name nil)))
+		  (and start-name
+		       (buffer-substring-no-properties start-name (point)))))))
     (if (cond
 	 ((not word) nil)
 	 ((string-match "\\`[~/]" word)