# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 743671871 0
# Node ID 20486b99584f6ca0cd160778402847a65c686be7
# Parent  d719788a0aaaebc00e55193693cbd221765df537
(kill-ring-save): Delete spurious `message' call.
(set-mark): If POS is nil, call deactivate-mark.

diff -r d719788a0aaa -r 20486b99584f lisp/simple.el
--- a/lisp/simple.el	Mon Jul 26 07:10:13 1993 +0000
+++ b/lisp/simple.el	Mon Jul 26 07:31:11 1993 +0000
@@ -1095,9 +1095,7 @@
 	      ;; If user quit, deactivate the mark
 	      ;; as C-g would as a command.
 	      (and quit-flag mark-active
-		   (progn
-		     (message "foo")	;XXX what is this here for?  --roland
-		     (deactivate-mark))))
+		   (deactivate-mark)))
 	  (let* ((killed-text (current-kill 0))
 		 (message-len (min (length killed-text) 40)))
 	    (if (= (point) beg)
@@ -1262,6 +1260,7 @@
 ;; run deactivate-mark-hook.  This shorthand should simplify.
 (defsubst deactivate-mark ()
   "Deactivate the mark by setting `mark-active' to nil.
+\(That makes a difference only in Transient Mark mode.)
 Also runs the hook `deactivate-mark-hook'."
   (setq mark-active nil)
   (run-hooks 'deactivate-mark-hook))
@@ -1283,9 +1282,13 @@
 
    (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
 
-  (setq mark-active t)
-  (run-hooks 'activate-mark-hook)
-  (set-marker (mark-marker) pos (current-buffer)))
+  (if pos
+      (progn
+	(setq mark-active t)
+	(run-hooks 'activate-mark-hook)
+	(set-marker (mark-marker) pos (current-buffer)))
+    (deactivate-mark)
+    (set-marker (mark-marker) pos (current-buffer))))
 
 (defvar mark-ring nil
   "The list of saved former marks of the current buffer,