tastytea
/
register-quicknav
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Understandability: Replace “item” with “register”, 

“registers” with “register-list” and “item-pos” with “register-pos”. Shorten
register-quicknav--item-position to register-quicknav--position.
This commit is contained in:
tastytea 2020-03-08 04:41:42 +01:00
parent 4757e63fcd
commit 4f9866fa85
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
register-quicknav.el
View File

@ -102,27 +102,27 @@ the global value otherwise."
register-quicknav--last-register-v register-quicknav--last-register-v
(default-value 'register-quicknav--last-register-v)))) (default-value 'register-quicknav--last-register-v))))
(defun register-quicknav--item-file-name (item) (defun register-quicknav--register-file-name (register)
"Return file-name of ITEM. "Return file-name of REGISTER.
Works on markers and file-queries." Works on markers and file-queries."
(if (markerp (cdr item)) (if (markerp (cdr register))
(buffer-file-name (marker-buffer (cdr item))) (buffer-file-name (marker-buffer (cdr register)))
(nth 2 item))) (nth 2 register)))
(defun register-quicknav--is-current-buffer? (item) (defun register-quicknav--is-current-buffer? (register)
"Return t if ITEM is in current buffer. "Return t if REGISTER is in current buffer.
Works on markers and file-queries." Works on markers and file-queries."
(if (markerp (cdr item)) (if (markerp (cdr register))
(eq (current-buffer) (marker-buffer (cdr item))) (eq (current-buffer) (marker-buffer (cdr register)))
(string= (buffer-file-name (current-buffer)) (string= (buffer-file-name (current-buffer))
(register-quicknav--item-file-name item)))) (register-quicknav--register-file-name register))))
(defun register-quicknav--item-position (item) (defun register-quicknav--position (register)
"Return position of ITEM. "Return position of REGISTER.
Works on markers and file-queries." Works on markers and file-queries."
(if (markerp (cdr item)) (if (markerp (cdr register))
(marker-position (cdr item)) (marker-position (cdr register))
(nth 3 item))) (nth 3 register)))
(defun register-quicknav--registers () (defun register-quicknav--registers ()
"Return all position registers, sorted by file name and position. "Return all position registers, sorted by file name and position.
@ -132,24 +132,24 @@ current buffer."
(lambda (a b) (lambda (a b)
"Return t if position of A is < B. "Return t if position of A is < B.
Works on markers and file-queries." Works on markers and file-queries."
(and (string= (register-quicknav--item-file-name a) (and (string= (register-quicknav--register-file-name a)
(register-quicknav--item-file-name b)) (register-quicknav--register-file-name b))
(< (register-quicknav--item-position a) (< (register-quicknav--position a)
(register-quicknav--item-position b)))))) (register-quicknav--position b))))))
(let ((result)) (let ((result))
(dolist (item register-alist) (dolist (register register-alist)
(if (or (markerp (cdr item)) (if (or (markerp (cdr register))
(eq (nth 1 item) 'file-query)) (eq (nth 1 register) 'file-query))
(if register-quicknav-buffer-only (if register-quicknav-buffer-only
(when (register-quicknav--is-current-buffer? item) (when (register-quicknav--is-current-buffer? register)
(push item result)) (push register result))
(push item result)))) (push register result))))
(sort result #'sort-registers)))) (sort result #'sort-registers))))
(defun register-quicknav--jump-to-register (next) (defun register-quicknav--jump-to-register (next)
"Jump to next position register if NEXT is t, to previous otherwise." "Jump to next position register if NEXT is t, to previous otherwise."
(let* ((registers (register-quicknav--registers)) (let* ((register-list (register-quicknav--registers))
(index (cl-position (register-quicknav--last-register) registers)) (index (cl-position (register-quicknav--last-register) register-list))
(stop-searching)) (stop-searching))
(unless (eq index nil) (unless (eq index nil)
(if next (if next
@ -157,34 +157,34 @@ Works on markers and file-queries."
(cl-incf index))) (cl-incf index)))
;; Try to find the position register closest to point. ;; Try to find the position register closest to point.
(dolist (item registers) (dolist (register register-list)
(when (register-quicknav--is-current-buffer? item) (when (register-quicknav--is-current-buffer? register)
(let ((item-pos (register-quicknav--item-position item))) (let ((register-pos (register-quicknav--position register)))
(if next (if next
(when (<= item-pos (point)) (when (<= register-pos (point))
(setq index (cl-position item registers))) (setq index (cl-position register register-list)))
(when (and (not stop-searching) (>= item-pos (point))) (when (and (not stop-searching) (>= register-pos (point)))
(setq index (cl-position item registers) (setq index (cl-position register register-list)
stop-searching t)))))) stop-searching t))))))
;; If an index was found, set it to the next/previous register. If not, set ;; If an index was found, set it to the next/previous register. If not, set
;; it to the first/last. ;; it to the first/last.
(if index (if index
(progn (progn
(when (> index (- (length registers) 1)) (when (> index (- (length register-list) 1))
(setq index nil)) (setq index nil))
(if next (if next
(progn (progn
(if (or (eq index nil) (eq index (- (length registers) 1))) (if (or (eq index nil) (eq index (- (length register-list) 1)))
(setq index 0) (setq index 0)
(cl-incf index))) (cl-incf index)))
(if (or (eq index nil) (eq index 0)) (if (or (eq index nil) (eq index 0))
(setq index (- (length registers) 1)) (setq index (- (length register-list) 1))
(cl-decf index))) (cl-decf index)))
(register-to-point (car (nth index registers))) (register-to-point (car (nth index register-list)))
(register-quicknav--last-register (nth index registers))) (register-quicknav--last-register (nth index register-list)))
(register-to-point (car (car registers))) (register-to-point (car (car register-list)))
(register-quicknav--last-register (car registers))))) (register-quicknav--last-register (car register-list)))))
;;;###autoload ;;;###autoload
(defun register-quicknav-next-register () (defun register-quicknav-next-register ()