[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116966: * lisp/emulation/cua-base.el (<toplevel>, c
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r116966: * lisp/emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1): |
Date: |
Fri, 11 Apr 2014 01:06:41 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116966
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2014-04-10 21:06:35 -0400
message:
* lisp/emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1):
Remove left-over code.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emulation/cua-base.el cuabase.el-20091113204419-o5vbwnq5f7feedwu-2415
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-11 01:05:03 +0000
+++ b/lisp/ChangeLog 2014-04-11 01:06:35 +0000
@@ -1,5 +1,8 @@
2014-04-11 Stefan Monnier <address@hidden>
+ * emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1):
+ Remove left-over code.
+
* newcomment.el (comment-indent-new-line): Sink code where it's used.
Reuse the previous comment's indentation unconditionally if it's on its
own line.
=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el 2014-02-12 14:48:41 +0000
+++ b/lisp/emulation/cua-base.el 2014-04-11 01:06:35 +0000
@@ -1156,19 +1156,6 @@
(cancel-timer cua--prefix-override-timer))
(setq cua--prefix-override-timer nil))
- (cond
- ;; Only symbol commands can have necessary properties
- ((not (symbolp this-command))
- nil)
-
- ((not (eq (get this-command 'CUA) 'move))
- nil)
-
- ;; Set mark if user explicitly said to do so
- (cua--rectangle ;FIXME: ??
- (unless mark-active
- (push-mark-command nil nil))))
-
;; Detect extension of rectangles by mouse or other movement
(setq cua--buffer-and-point-before-command
(if cua--rectangle (cons (current-buffer) (point)))))
@@ -1367,36 +1354,6 @@
)
-;; Setup standard movement commands to be recognized by CUA.
-
-(dolist (cmd
- '(forward-char backward-char
- right-char left-char
- right-word left-word
- next-line previous-line
- forward-word backward-word
- end-of-line beginning-of-line
- end-of-visual-line beginning-of-visual-line
- move-end-of-line move-beginning-of-line
- end-of-buffer beginning-of-buffer
- scroll-up scroll-down
- scroll-up-command scroll-down-command
- up-list down-list backward-up-list
- end-of-defun beginning-of-defun
- forward-sexp backward-sexp
- forward-list backward-list
- forward-sentence backward-sentence
- forward-paragraph backward-paragraph
- ;; CC mode motion commands
- c-forward-conditional c-backward-conditional
- c-down-conditional c-up-conditional
- c-down-conditional-with-else c-up-conditional-with-else
- c-beginning-of-statement c-end-of-statement))
- (put cmd 'CUA 'move))
-
-;; Only called if pc-selection-mode is t, which means pc-select is loaded.
-(declare-function pc-selection-mode "pc-select" (&optional arg))
-
;; State prior to enabling cua-mode
;; Value is a list with the following elements:
;; delete-selection-mode
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116966: * lisp/emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1):,
Stefan Monnier <=