diff --git a/core/siren-core.el b/core/siren-core.el index 92f24f8..9812637 100644 --- a/core/siren-core.el +++ b/core/siren-core.el @@ -18,28 +18,5 @@ Position the cursor at it's beginning, according to the current mode." (interactive "P") (sp-wrap-with-pair ,s))) -(defun siren-move-beginning-of-line (arg) - "Move point back to indentation of beginning of line. - -Move point to the first non-whitespace character on this line. -If point is already there, move to the beginning of the line. -Effectively toggle between the first non-whitespace character and -the beginning of the line. - -If ARG is not nil or 1, move forward ARG - 1 lines first. If -point reaches the beginning or end of the buffer, stop there." - (interactive "^p") - (setq arg (or arg 1)) - - ;; Move lines first - (when (/= arg 1) - (let ((line-move-visual nil)) - (forward-line (1- arg)))) - - (let ((orig-point (point))) - (back-to-indentation) - (when (= orig-point (point)) - (move-beginning-of-line 1)))) - (provide 'siren-core) diff --git a/modules/siren-global-keybindings.el b/modules/siren-global-keybindings.el index 05be4da..85a20b8 100644 --- a/modules/siren-global-keybindings.el +++ b/modules/siren-global-keybindings.el @@ -58,9 +58,6 @@ ;; Rename current file and buffer (via siren-helpers.el) (global-set-key (kbd "C-c r") 'rename-file-and-buffer) -;; Use siren-move-beginning-of-line -(global-set-key (kbd "C-a") 'siren-move-beginning-of-line) - ;; Mac OS X specific keybindings (when (eq system-type 'darwin) diff --git a/modules/siren-move-beginning-of-line.el b/modules/siren-move-beginning-of-line.el index 597a4cd..a3bb723 100644 --- a/modules/siren-move-beginning-of-line.el +++ b/modules/siren-move-beginning-of-line.el @@ -27,8 +27,8 @@ point reaches the beginning or end of the buffer, stop there." (when (= orig-point (point)) (move-beginning-of-line 1)))) -(global-set-key [remap move-beginning-of-line] - 'siren-move-beginning-of-line) +;; Use siren-move-beginning-of-line +(global-set-key (kbd "C-a") 'siren-move-beginning-of-line) (provide 'siren-move-beginning-of-line)