From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 17 Dec 2013 15:48:26 +0000 (+0800)
Subject: * simple.el (kill-region): Pass mark first then point, so kill-append works right.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~370
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76da345537e550892b8bc9434ee0b3b82b44c573;p=emacs.git

* simple.el (kill-region): Pass mark first then point, so kill-append works right.
(copy-region-as-kill, kill-ring-save): Likewise.

Fixes: debbugs:12819
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23c146fb128..8d67a12e3d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-17  Dima Kogan  <dima@secretsauce.net>  (tiny change)
+
+	* simple.el (kill-region): Pass mark first, then point, so that
+	kill-append works right (Bug#12819).
+	(copy-region-as-kill, kill-ring-save): Likewise.
+
 2013-12-17  Leo Liu  <sdl.web@gmail.com>
 
 	* net/rcirc.el (rcirc-add-face):
diff --git a/lisp/simple.el b/lisp/simple.el
index 78fb12f8c9c..412d75f9221 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3638,9 +3638,9 @@ to make one entry in the kill ring.
 
 The optional argument REGION if non-nil, indicates that we're not just killing
 some text between BEG and END, but we're killing the region."
-  ;; Pass point first, then mark, because the order matters
-  ;; when calling kill-append.
-  (interactive (list (point) (mark) 'region))
+  ;; Pass mark first, then point, because the order matters when
+  ;; calling `kill-append'.
+  (interactive (list (mark) (point) 'region))
   (unless (and beg end)
     (error "The mark is not set now, so there is no region"))
   (condition-case nil
@@ -3686,7 +3686,10 @@ The optional argument REGION if non-nil, indicates that we're not just copying
 some text between BEG and END, but we're copying the region.
 
 This command's old key binding has been given to `kill-ring-save'."
-  (interactive "r\np")
+  ;; Pass mark first, then point, because the order matters when
+  ;; calling `kill-append'.
+  (interactive (list (mark) (point)
+		     (prefix-numeric-value current-prefix-arg)))
   (let ((str (if region
                  (funcall region-extract-function nil)
                (filter-buffer-substring beg end))))
@@ -3710,7 +3713,10 @@ some text between BEG and END, but we're copying the region.
 
 This command is similar to `copy-region-as-kill', except that it gives
 visual feedback indicating the extent of the region being copied."
-  (interactive "r\np")
+  ;; Pass mark first, then point, because the order matters when
+  ;; calling `kill-append'.
+  (interactive (list (mark) (point)
+		     (prefix-numeric-value current-prefix-arg)))
   (copy-region-as-kill beg end region)
   ;; This use of called-interactively-p is correct because the code it
   ;; controls just gives the user visual feedback.