branch: elpa/forth-mode
commit 50adf0d552845fca18e7dbaba35c4a2696fee1a7
Author: Lars Brinkhoff <[email protected]>
Commit: Lars Brinkhoff <[email protected]>
Remove byte-compile warnings.
---
forth-block-mode.el | 19 +++++++++++++------
forth-interaction-mode.el | 1 +
forth-mode.el | 3 +++
parse.el | 4 +++-
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/forth-block-mode.el b/forth-block-mode.el
index 856fe013ef..b81918fb0d 100644
--- a/forth-block-mode.el
+++ b/forth-block-mode.el
@@ -1,15 +1,22 @@
+(require 'cl)
+(require 'forth-mode)
+
+(defun forth-line (n)
+ (goto-char (point-min))
+ (forward-line (1- n)))
+
(defun forth-block-p ()
"Guess whether the current buffer is a Forth block file."
(message (format "%s %s" (point-max) (logand (point-max) 1023)))
(and (eq (logand (point-max) 1023) 1)
(save-excursion
- (beginning-of-buffer)
+ (forth-beginning)
(not (search-forward "\n" 1024 t)))))
(defun forth-unblockify ()
(let ((after-change-functions nil))
(save-excursion
- (beginning-of-buffer)
+ (forth-beginning)
(while (ignore-errors (forward-char 64) t)
(insert ?\n))
(let ((delete-trailing-lines t))
@@ -28,7 +35,7 @@
(defun forth-blockify ()
(let ((after-change-functions nil))
(save-excursion
- (beginning-of-buffer)
+ (forth-beginning)
(while (forth-pad-line))
(while (plusp (logand (point) 1023))
(insert " "))
@@ -64,18 +71,18 @@
(cond ((plusp forth-change-newlines)
(let ((n (logand (+ (line-number-at-pos) 15) -16)))
(save-excursion
- (goto-line (1+ n))
+ (forth-line (1+ n))
(delete-region (line-beginning-position) (line-end-position))
(delete-char 1))))
((minusp forth-change-newlines)
(let ((n (logand (+ (line-number-at-pos) 15) -16)))
(save-excursion
- (goto-line n)
+ (forth-line n)
(insert "\n")))))
(save-excursion
(end-of-line)
(while (> (- (point) (line-beginning-position)) 64)
- (delete-backward-char 1))))
+ (delete-char -1))))
(define-minor-mode forth-block-mode
"Minor mode for Forth code in blocks."
diff --git a/forth-interaction-mode.el b/forth-interaction-mode.el
index 0246cfd68b..8f80f60baa 100644
--- a/forth-interaction-mode.el
+++ b/forth-interaction-mode.el
@@ -1,4 +1,5 @@
(require 'comint)
+(require 'forth-mode)
(defvar forth-interaction-buffer nil)
(defvar forth-interaction-callback nil)
diff --git a/forth-mode.el b/forth-mode.el
index 607274e149..03d4ebaa15 100644
--- a/forth-mode.el
+++ b/forth-mode.el
@@ -110,5 +110,8 @@
(interactive (list (buffer-file-name (current-buffer))))
(forth-interaction-send (concat "include " file)))
+(defun forth-beginning ()
+ (goto-char (point-min)))
+
(provide 'forth-mode)
;;; forth-mode.el ends here
diff --git a/parse.el b/parse.el
index 2082df6fd6..93505b8a4a 100644
--- a/parse.el
+++ b/parse.el
@@ -1,3 +1,5 @@
+(require 'forth-mode)
+
(defvar forth-stack-comments (make-hash-table :test 'equal))
(defun forth-parse-colon-definition ()
@@ -25,7 +27,7 @@
(defun forth-parse-buffer (&optional buffer)
(setq buffer (or buffer (current-buffer)))
(save-excursion
- (beginning-of-buffer)
+ (forth-beginning)
(end-of-defun)
(beginning-of-defun)
(while t
