3 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bae35e3974c..00e5df9f5e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * simple.el (shift-select-mode): Make it a defcustom.
+        * cus-start.el: Remove shift-select-mode.
+
 2009-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (shift-select-mode): Move declaration from callint.c.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 10b352f0e46..d8d3cc5d3ac 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -98,7 +98,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                            "22.1")
              ;; callint.c
              (mark-even-if-inactive editing-basics boolean)
-             (shift-select-mode editing-basics boolean)
              ;; callproc.c
              (shell-file-name execute file)
              (exec-path execute
diff --git a/lisp/simple.el b/lisp/simple.el
index 8664634196e..999809e6bd8 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3746,7 +3746,7 @@ mode temporarily."
           (t (activate-mark)))
     nil))
 
-(defvar shift-select-mode t
+(defcustom shift-select-mode t
   "When non-nil, shifted motion keys activate the mark momentarily.
 
 While the mark is activated in this way, any shift-translated point
@@ -3756,7 +3756,9 @@ by any subsequent point motion key that was not shift-translated, or
 by any action that normally deactivates the mark in Transient Mark mode.
 
 See `this-command-keys-shift-translated' for the meaning of
-shift-translation.")
+shift-translation."
+  :type 'boolean
+  :group 'editing-basics)
 
 (defun handle-shift-selection ()
   "Activate/deactivate mark depending on invocation thru ``shift translation.''