joestar

commit 8339d1bf2ad8ffbfee2fea52f2c37c2eb3f8dc6b
parent 01b9e654e554ae07007ef776a83d0c011eedaf2a
Author: rmj <pwishie@gmail.com>
Date:   Sat, 18 Apr 2020 17:05:14 -0700

block helper funcs

Diffstat:
M
README.org
 | 
3
++-
M
joestar.el
 | 
36
+++++++++++++++++++++++++++++-------

2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/README.org b/README.org
@@ -3,7 +3,8 @@
 #+EMAIL: pwishie@gmail.com
 #+OPTIONS: num:nil
 
-Joestar is a minor mode for emacs that seeks to emulate [[https://github.com/jhallen/joe-editor][Joe's Own Editor]], a wordstar-like terminal text editor.
+Joestar is a minor mode for emacs that seeks to emulate [[https://github.com/jhallen/joe-editor][Joe's Own Editor]], a wordstar-like terminal text editor. It is a fork of the old [[https://github.com/dfr62/wormstar][Wormstar mode]].
+This project seeks to make a Wordstar mode for modern Emacs. 
 * Installation
 Joestar needs the libraries [[https://www.emacswiki.org/emacs/HighlightLibrary][Highlight]] and [[https://github.com/apchamberlain/undo-tree.el][Undo Tree]]. Once you have those:
 #+BEGIN_SRC shell
diff --git a/joestar.el b/joestar.el
@@ -49,6 +49,13 @@
 (defvar joe-stream           nil "Contains last defined Block.  Stream.")
 (defvar joe-rect             nil "Contains last defined Block.  Rectangle.")
 
+;; For converting the block to region.
+(defvar joe-last-emacs-mark  nil "The last position of mark.")
+(defvar joe-last-emacs-point nil "The last position of point.")
+
+(make-variable-buffer-local 'joe-last-emacs-mark)
+(make-variable-buffer-local 'joe-last-emacs-point)
+
 ;;; set mark variables
 (defvar joe-mark-0 nil "Mark 0.")
 (defvar joe-mark-1 nil "Mark 1.")
@@ -168,11 +175,23 @@
 	  ()
 	(message "Zero length Block..."))
     (if joe-block-mark-start
-	(error "End of Block not set.")
+	(error "End of Block not set")
       (if joe-block-mark-end
-	  (error "Start of Block not set.")
+	  (error "Start of Block not set")
       (error "No Block")))))
 
+(defun joe-block-to-region()
+  "Convert the joe-block into region."
+  (setq joe-last-emacs-mark (mark))
+  (setq joe-last-emacs-point (point-marker))
+  (set-mark joe-block-mark-start)
+  (goto-char joe-block-mark-end))
+
+(defun joe-restore-emacs-mark-and-point ()
+  "Return mark and point to their original values."
+  (goto-char joe-last-emacs-point)
+  (set-mark joe-last-emacs-mark))
+
 ;; aliases
 (defalias 'joe-nbuf 'next-buffer)
 (defalias 'joe-pbuf 'previous-buffer)
@@ -304,11 +323,14 @@
   "Delete the block.
 Move mark to joestar's end of block and move point to joestar's end of block."
   (interactive)
-  (let* ((cur-local (point-marker)))
-    (set-mark joe-block-mark-start)
-    (goto-char joe-block-mark-end)
-    (call-interactively 'kill-region)
-    (goto-char cur-local)))
+  (joe-block-to-region)
+  (call-interactively 'kill-region)
+  (joe-restore-emacs-mark-and-point))
+
+(defun joe-blkcpy()
+  "Copy the region into the kill ring." ; TODO optionally not into the kill ring
+  (interactive)
+  ())
 
 ;; end