From 233d45bf4fda0b9ac440d8651af2f873a4202f0a Mon Sep 17 00:00:00 2001 From: "git@daemon.de" Date: Wed, 25 May 2016 11:07:36 +0200 Subject: [PATCH] fix issue#3: delete word at point if point is on the beginning of word --- viking-mode.el | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/viking-mode.el b/viking-mode.el index 30d28d6..34632e1 100644 --- a/viking-mode.el +++ b/viking-mode.el @@ -19,7 +19,7 @@ ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ;; USA -;; Version: 0.05 +;; Version: 0.06 ;; Author: T.v.Dein ;; Keywords: kill delete ;; URL: https://github.com/tlinden/viking-mode @@ -170,7 +170,7 @@ ;;; Code: ;;;; Consts -(defconst viking-mode-version "0.05" "Viking Mode version.") +(defconst viking-mode-version "0.06" "Viking Mode version.") (defgroup viking-mode nil "Kill first, ask later - an emacs mode for killing things quickly" @@ -337,21 +337,6 @@ should be a point-moving function." ;;;;; Public interactive kill functions -(defun --viking-kill-word () - "If point is on space or newline, delete those (like M-SPC), else kill word at point. -If 'viking-greedy-kill is t, clean up spaces and newlines afterwards." - (interactive) - (if (viking--point-is-in-space) - (viking--kill-space) - (progn - (if (eq (point) (line-beginning-position)) - (viking--kill-word-right) - (viking--kill-word-at-point) - ) - (when viking-greedy-kill ;; clean up afterwards as well - (viking--kill-space)) - ))) - (defun viking-kill-word () "If point is on space or newline, delete those (like M-SPC), else kill word at point. If 'viking-greedy-kill is t, clean up spaces and newlines afterwards." @@ -363,7 +348,8 @@ If 'viking-greedy-kill is t, clean up spaces and newlines afterwards." (if (viking--point-is-in-space) (viking--kill-space) (progn - (if (eq (point) (line-beginning-position)) + (if (or (eq (point) (line-beginning-position)) + (looking-back "[ \t]")) (viking--kill-word-right) (viking--kill-word-at-point) )