Changeset 4111 for trunk/lisp/emulation/cua-base.el

Timestamp:

2006年07月16日 08時36分52秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/emulation/cua-base.el (modified) (4 diffs)

trunk/lisp/emulation/cua-base.el

@@ -306 +306 @@
-  :group 'cua)
-
+(defcustom cua-delete-selection t
+  "*If non-nil, typed text replaces text in the active selection."
+  :type '(choice (const :tag "Disabled" nil)
+                 (other :tag "Enabled" t))
+  :group 'cua)
+
-(defcustom cua-keep-region-after-copy nil
-  "If non-nil, don't deselect the region after copying."
-  :type 'boolean
+  :group 'cua)
+
+(defcustom cua-toggle-set-mark t
+  "*In non-nil, the `cua-set-mark' command toggles the mark."
+  :type '(choice (const :tag "Disabled" nil)
+                 (other :tag "Enabled" t))
-  :group 'cua)
-
@@ -392 +404 @@
-Must be set prior to enabling CUA."
-  :type '(choice (const :tag "Meta key" meta)
-
+
+
-                 (const :tag "Super key" super))
-  :group 'cua)
@@ -784 +797 @@
-  "Replace the active region with the character you type."
-  (interactive)
-cua-delete-region
+and cua-delete-selection (cua-delete-region)
-    (unless (eq this-original-command this-command)
-      (let ((overwrite-mode
@@ -1002 +1015 @@
-    (setq this-command 'pop-to-mark-command)
-    (pop-to-mark-command))
-mark-active
+(and cua-toggle-set-mark mark-active)
-    (cua--deactivate)
-    (message "Mark Cleared"))