ansi-color-map

[dotemacs] / lisp / my-editing-defuns.el

diff --git a/lisp/my-editing-defuns.el b/lisp/my-editing-defuns.el
index bf72f9440fea4359f0696272eabddb73d70f91fc..f05070309467b393b088ecf0c48c4c7fb55d0348 100644 (file)
--- a/lisp/my-editing-defuns.el
+++ b/lisp/my-editing-defuns.el
@@ -1,17 +1,5 @@
 ;;; -*- lexical-binding: t -*-
 
-(defun my/comment-dwim (arg)
-  "Toggles the comment on for the active region if present or the current line otherwise."
-  (interactive "*p")
-  (cond
-   ((and mark-active transient-mark-mode)
-    (let ((start (save-excursion (goto-char (region-beginning)) (line-beginning-position)))
-          (end (save-excursion (goto-char (region-end)) (line-end-position))))
-      (comment-or-uncomment-region start end)))
-   (t
-    (comment-or-uncomment-region (line-beginning-position) (line-end-position arg))
-    (forward-line arg))))
-
 (defun my/copy-line (arg)
   "Copy the current line into the kill ring. With ARG copies that many lines."
   (interactive "p")
@@ -28,7 +16,7 @@
     (kill-ring-save start end)
     (when at-eof
       (kill-append "\n" t))
-    (save-excursion
+    (save-mark-and-excursion
       (forward-line)
       (dotimes (ignored arg)
         (yank)))
@@ -58,16 +46,3 @@
       (kill-line arg))
   (if (not (string-equal major-mode "fundamental-mode"))
       (indent-for-tab-command)))
-
-(defun my/yank (arg)
-  "If the text to be yanked has a newline then move to beginning of line before yanking. Otherwise same as normal `yank'."
-  (interactive "*P")
-  (advice-add 'insert-for-yank :around #'my/yank/advice)
-  (unwind-protect
-      (yank arg)
-    (advice-remove 'insert-for-yank #'my/yank/advice)))
-
-(defun my/yank/advice (original-function string)
-  (if (string-match-p "\n" string)
-      (beginning-of-line))
-  (funcall original-function string))