From c99ce7d8fa9f4af7ece6439c568987e5e7d82681 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 10 Apr 2014 21:06:35 -0400 Subject: [PATCH] * lisp/emulation/cua-base.el (, cua--pre-command-handler-1): Remove left-over code. --- lisp/ChangeLog | 3 +++ lisp/emulation/cua-base.el | 43 -------------------------------------- 2 files changed, 3 insertions(+), 43 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5761ced42b..37e09893829 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-04-11 Stefan Monnier + * emulation/cua-base.el (, 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. diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 96c9ba1e095..ee70071b7ec 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1156,19 +1156,6 @@ If ARG is the atom `-', scroll upward by nearly full screen." (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 @@ If ARG is the atom `-', scroll upward by nearly full screen." ) -;; 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 -- 2.39.5