* lisp/delsel.el: Deprecate the `kill' option. Use lexical-binding.

(open-line): Delete like all other commands, instead of killing.
(delete-active-region): Don't define any return any value.

2 files changed, 12 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73f155243f5..694a35be61d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,17 @@
 2015-02-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* delsel.el: Deprecate the `kill' option.  Use lexical-binding.
+	(open-line): Delete like all other commands, instead of killing.
+	(delete-active-region): Don't define any return any value.
+
 	* progmodes/python.el: Try to preserve compatibility with Emacs-24.
 	(python-mode): Don't assume eldoc-documentation-function has a non-nil
 	default.
 
 2015-02-04  Sam Steingold  <sds@gnu.org>
 
-	* progmodes/python.el (python-indent-calculate-indentation): Avoid
-	the error when computing top-level indentation.
+	* progmodes/python.el (python-indent-calculate-indentation):
+	Avoid the error when computing top-level indentation.
 
 2015-02-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/delsel.el b/lisp/delsel.el
index e6bb3b952b3..740b60345ed 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,4 +1,4 @@
-;;; delsel.el --- delete selection if you insert
+;;; delsel.el --- delete selection if you insert  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1992, 1997-1998, 2001-2015 Free Software Foundation,
 ;; Inc.
@@ -35,16 +35,12 @@
 ;; property on their symbols; commands which insert text but don't
 ;; have this property won't delete the selection.  It can be one of
 ;; the values:
-;;  'yank
+;;  `yank'
 ;;      For commands which do a yank; ensures the region about to be
 ;;      deleted isn't yanked.
-;;  'supersede
+;;  `supersede'
 ;;      Delete the active region and ignore the current command,
 ;;      i.e. the command will just delete the region.
-;;  'kill
-;;      `kill-region' is used on the selection, rather than
-;;      `delete-region'.  (Text selected with the mouse will typically
-;;      be yankable anyhow.)
 ;;  t
 ;;      The normal case: delete the active region prior to executing
 ;;      the command which will insert replacement text.
@@ -93,8 +89,7 @@ If KILLP in not-nil, the active region is killed instead of deleted."
           (cons (current-buffer)
                 (and (consp buffer-undo-list) (car buffer-undo-list)))))
    (t
-    (funcall region-extract-function 'delete-only)))
-  t)
+    (funcall region-extract-function 'delete-only))))
 
 (defun delete-selection-repeat-replace-region (arg)
   "Repeat replacing text of highlighted region with typed text.
@@ -167,7 +162,7 @@ With ARG, repeat that many times.  `C-u' means until end of buffer."
      For commands which need to dynamically determine this behavior.
      FUNCTION should take no argument and return one of the above values or nil."
   (condition-case data
-      (cond ((eq type 'kill)
+      (cond ((eq type 'kill)            ;Deprecated, backward compatibility.
 	     (delete-active-region t)
 	     (if (and overwrite-mode
 		      (eq this-command 'self-insert-command))
@@ -255,7 +250,7 @@ See `delete-selection-helper'."
 (put 'newline-and-indent 'delete-selection t)
 (put 'newline 'delete-selection t)
 (put 'electric-newline-and-maybe-indent 'delete-selection t)
-(put 'open-line 'delete-selection 'kill)
+(put 'open-line 'delete-selection t)
 
 ;; This is very useful for canceling a selection in the minibuffer without
 ;; aborting the minibuffer.