[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6588e27 1/2: [xpm int] Whitespace munging; nfc.
|
From: |
Thien-Thi Nguyen |
|
Subject: |
[elpa] master 6588e27 1/2: [xpm int] Whitespace munging; nfc. |
|
Date: |
Sat, 4 Feb 2017 14:38:09 +0000 (UTC) |
branch: master
commit 6588e27fa2420306fa06a5edfb1c953f385e3893
Author: Thien-Thi Nguyen <address@hidden>
Commit: Thien-Thi Nguyen <address@hidden>
[xpm int] Whitespace munging; nfc.
---
packages/xpm/xpm-compose.el | 62 +++++++++++++++++++++++--------------------
packages/xpm/xpm-ops.el | 33 ++++++++++++-----------
packages/xpm/xpm-ui.el | 17 ++++++------
3 files changed, 60 insertions(+), 52 deletions(-)
diff --git a/packages/xpm/xpm-compose.el b/packages/xpm/xpm-compose.el
index 435e41b..c6475ba 100644
--- a/packages/xpm/xpm-compose.el
+++ b/packages/xpm/xpm-compose.el
@@ -29,14 +29,15 @@
(xpm--w/gg (w h origin flags) xpm--gg
(save-excursion
(goto-char origin)
- (cl-loop with skip = (if (memq 'intangible-sides flags)
- 1
- 4)
- repeat h
- collect (let ((p (point)))
- (forward-char w)
- (prog1 (buffer-substring-no-properties p (point))
- (forward-char skip)))))))
+ (cl-loop
+ with skip = (if (memq 'intangible-sides flags)
+ 1
+ 4)
+ repeat h
+ collect (let ((p (point)))
+ (forward-char w)
+ (prog1 (buffer-substring-no-properties p (point))
+ (forward-char skip)))))))
(defun xpm--clone (src)
(insert-buffer-substring src)
@@ -78,22 +79,23 @@ This copies all pixels from TWO that are not PX."
(= (* cpp w) (length (car lines)))))
;; do it
(goto-char origin)
- (cl-loop with skip = (if (memq 'intangible-sides flags)
- 1
- 4)
- for line in lines
- do (cl-loop
- ;; this is slow and stupid
- ;; todo: use ‘compare-strings’
- for x below w
- do (let* ((i (* x cpp))
- (el (substring line i (+ i cpp))))
- (if (string= px el)
- (forward-char cpp)
- (insert el)
- (delete-char cpp))))
- do (when (< (point) (point-max))
- (forward-char skip)))
+ (cl-loop
+ with skip = (if (memq 'intangible-sides flags)
+ 1
+ 4)
+ for line in lines
+ do (cl-loop
+ ;; this is slow and stupid
+ ;; todo: use ‘compare-strings’
+ for x below w
+ do (let* ((i (* x cpp))
+ (el (substring line i (+ i cpp))))
+ (if (string= px el)
+ (forward-char cpp)
+ (insert el)
+ (delete-char cpp))))
+ do (when (< (point) (point-max))
+ (forward-char skip)))
(current-buffer)))))
(defun xpm-fill (px)
@@ -101,9 +103,10 @@ This copies all pixels from TWO that are not PX."
(interactive "sPX: ")
(xpm--w/gg (w h) (xpm--gate)
(save-excursion
- (cl-loop with x = (cons 0 (1- w))
- for y below h
- do (xpm-put-points px x y)))))
+ (cl-loop
+ with x = (cons 0 (1- w))
+ for y below h
+ do (xpm-put-points px x y)))))
(provide 'xpm-compose)
@@ -125,8 +128,9 @@ This copies all pixels from TWO that are not PX."
(xpm-fill ?-)
(cl-flet
((vec () (let ((v (make-vector 42 nil)))
- (cl-loop for i below 42
- do (aset v i (random 10)))
+ (cl-loop
+ for i below 42
+ do (aset v i (random 10)))
v)))
(xpm-put-points ?\s (vec) (vec))))
(cl-assert (and (bufferp one)
diff --git a/packages/xpm/xpm-ops.el b/packages/xpm/xpm-ops.el
index a2bc96a..64d7923 100644
--- a/packages/xpm/xpm-ops.el
+++ b/packages/xpm/xpm-ops.el
@@ -40,26 +40,29 @@
(beg x)
(end x))
(when (oldp)
- (cl-loop while (oldp)
- do (backward-char cpp)
- do (cl-decf beg)
- finally do (cl-incf beg))
+ (cl-loop
+ while (oldp)
+ do (backward-char cpp)
+ do (cl-decf beg)
+ finally do (cl-incf beg))
(goto-char p)
- (cl-loop while (oldp)
- do (forward-char cpp)
- do (cl-incf end)
- finally do (cl-decf end))
+ (cl-loop
+ while (oldp)
+ do (forward-char cpp)
+ do (cl-incf end)
+ finally do (cl-decf end))
(cons beg end)))))
(setq bye (let ((p (pos x y)))
(buffer-substring-no-properties
p (+ p cpp))))
(queue-enqueue q (cons x y))
- (cl-loop until (queue-empty q)
- do (let* ((coord (queue-dequeue q))
- (ext (extent coord)))
- (when ext
- (xpm-put-points px ext y)
- ;; todo: expansion and queuing of y-1 and y+1
- )))))))
+ (cl-loop
+ until (queue-empty q)
+ do (let* ((coord (queue-dequeue q))
+ (ext (extent coord)))
+ (when ext
+ (xpm-put-points px ext y)
+ ;; todo: expansion and queuing of y-1 and y+1
+ )))))))
;;; xpm-ops.el ends here
diff --git a/packages/xpm/xpm-ui.el b/packages/xpm/xpm-ui.el
index fb6a9dc..7d46a96 100644
--- a/packages/xpm/xpm-ui.el
+++ b/packages/xpm/xpm-ui.el
@@ -46,14 +46,15 @@
(name (format "*%s Palette*" (buffer-name)))
normal none)
;; normalize and extract "None" if necessary
- (cl-loop for (px . alist) in (xpm--palette-alist cpp pinfo)
- ;; todo: handle case where there is no ‘c’
- do (let ((color (cdr (assq 'c alist))))
- (if (member color '("none" "None"))
- (setq none px)
- (push (cons px color)
- normal)))
- finally do (setq normal (nreverse normal)))
+ (cl-loop
+ for (px . alist) in (xpm--palette-alist cpp pinfo)
+ ;; todo: handle case where there is no ‘c’
+ do (let ((color (cdr (assq 'c alist))))
+ (if (member color '("none" "None"))
+ (setq none px)
+ (push (cons px color)
+ normal)))
+ finally do (setq normal (nreverse normal)))
(list-colors-display (mapcar 'cdr normal) name
(xpm-set-pen-func (current-buffer)
normal