1 files changed, 29 insertions, 5 deletions
diff --git a/emacs/.emacs.d/lisp/my/my-editing.el b/emacs/.emacs.d/lisp/my/my-editing.el
index 0775063..8ce68dd 100644
--- a/emacs/.emacs.d/lisp/my/my-editing.el
+++ b/emacs/.emacs.d/lisp/my/my-editing.el
@@ -189,7 +189,10 @@ by passing optional prefix ARG (\\[universal-argument])."
           (beginning-of-line)
           (newline)
           (forward-line -1)
-          (indent-according-to-mode))
+          ;; `indent-according-to-mode' causes cursor to jump to the
+          ;; beginning of an org src block
+          (unless (and (derived-mode-p 'org-mode) (org-in-src-block-p))
+            (indent-according-to-mode)))
       (forward-line -1)
       (my-new-line-below))))
 
@@ -528,7 +531,7 @@ With an prefix-arg, copy the file name relative to project root."
   (interactive)
   (let ((old-max (point-max))
         (old-point (point)))
-    (comment-kill (or n 1))
+    (when comment-start (comment-kill (or n 1)))
     (when (= old-max (point-max))
       (goto-char old-point)
       (kill-sexp n))))
@@ -546,11 +549,32 @@ With an prefix-arg, copy the file name relative to project root."
 
 (defun my-elide-region (b e)
   (interactive "r")
-  (let ((message-elide-ellipsis (concat comment-start
-                                        " [... %l lines elided]
-")))
+  (let ((message-elide-ellipsis
+         (if (> (count-lines b (min (1+ e) (point-max))) 1)
+             (concat comment-start
+                     " [... %l lines elided]
+")
+           (format " [... %d words elided]" (count-words b e)))))
     (message-elide-region b e)))
 
+(defun my-elide-text (text limit)
+  "Elide TEXT to about LIMIT characters."
+  (let ((keep (- limit 25)))
+    (when (< keep 0)
+      (error "Too few characters to limit to. Should be at least 25."))
+    (with-temp-buffer
+      (insert text)
+      (goto-char (point-min))
+      (while (and (<= (point) keep) (< (point) (point-max)))
+        (forward-word))
+      (cond ((> (point) keep)
+             (backward-word)
+             (my-elide-region (point) (point-max))
+             (buffer-string))
+            (t text))
+      ))
+  )
+
 (defun my-replace-no-filter (old-fun &rest r)
   (let ((search-invisible t))
     (apply old-fun r)))