forked from mirrors/org-mode
org-mouse: Use cl-lib
* lisp/org-mouse.el (org-mouse-insert-heading): (org-mouse-priority-list): (org-mouse-agenda-type): (org-mouse-list-options-menu): (org-mouse-insert-item): (org-mouse-context-menu): (org-agenda-mode-hook): Silence byte-compiler.
This commit is contained in:
Nicolas Goaziou
parent
032b301d78
commit
6c7e29764a
|
|
@ -258,7 +258,7 @@ If the point is at the :beginning (`org-mouse-line-position') of the line,
|
||||||
insert the new heading before the current line. Otherwise, insert it
|
insert the new heading before the current line. Otherwise, insert it
|
||||||
after the current heading."
|
after the current heading."
|
||||||
(interactive)
|
(interactive)
|
||||||
(case (org-mouse-line-position)
|
(cl-case (org-mouse-line-position)
|
||||||
(:beginning (beginning-of-line)
|
(:beginning (beginning-of-line)
|
||||||
(org-insert-heading))
|
(org-insert-heading))
|
||||||
(t (org-mouse-next-heading)
|
(t (org-mouse-next-heading)
|
||||||
|
|
@ -407,8 +407,8 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
|
||||||
(> (match-end 0) point))))))
|
(> (match-end 0) point))))))
|
||||||
|
|
||||||
(defun org-mouse-priority-list ()
|
(defun org-mouse-priority-list ()
|
||||||
(loop for priority from ?A to org-lowest-priority
|
(cl-loop for priority from ?A to org-lowest-priority
|
||||||
collect (char-to-string priority)))
|
collect (char-to-string priority)))
|
||||||
|
|
||||||
(defun org-mouse-todo-menu (state)
|
(defun org-mouse-todo-menu (state)
|
||||||
"Create the menu with TODO keywords."
|
"Create the menu with TODO keywords."
|
||||||
|
|
@ -460,33 +460,33 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
|
||||||
(insert " [ ] "))))
|
(insert " [ ] "))))
|
||||||
|
|
||||||
(defun org-mouse-agenda-type (type)
|
(defun org-mouse-agenda-type (type)
|
||||||
(case type
|
(pcase type
|
||||||
('tags "Tags: ")
|
(`tags "Tags: ")
|
||||||
('todo "TODO: ")
|
(`todo "TODO: ")
|
||||||
('tags-tree "Tags tree: ")
|
(`tags-tree "Tags tree: ")
|
||||||
('todo-tree "TODO tree: ")
|
(`todo-tree "TODO tree: ")
|
||||||
('occur-tree "Occur tree: ")
|
(`occur-tree "Occur tree: ")
|
||||||
(t "Agenda command ???")))
|
(_ "Agenda command ???")))
|
||||||
|
|
||||||
(defun org-mouse-list-options-menu (alloptions &optional function)
|
(defun org-mouse-list-options-menu (alloptions &optional function)
|
||||||
(let ((options (save-match-data
|
(let ((options (save-match-data
|
||||||
(split-string (match-string-no-properties 1)))))
|
(split-string (match-string-no-properties 1)))))
|
||||||
(print options)
|
(print options)
|
||||||
(loop for name in alloptions
|
(cl-loop for name in alloptions
|
||||||
collect
|
collect
|
||||||
(vector name
|
(vector name
|
||||||
`(progn
|
`(progn
|
||||||
(replace-match
|
(replace-match
|
||||||
(mapconcat 'identity
|
(mapconcat 'identity
|
||||||
(sort (if (member ',name ',options)
|
(sort (if (member ',name ',options)
|
||||||
(delete ',name ',options)
|
(delete ',name ',options)
|
||||||
(cons ',name ',options))
|
(cons ',name ',options))
|
||||||
'string-lessp)
|
'string-lessp)
|
||||||
" ")
|
" ")
|
||||||
nil nil nil 1)
|
nil nil nil 1)
|
||||||
(when (functionp ',function) (funcall ',function)))
|
(when (functionp ',function) (funcall ',function)))
|
||||||
:style 'toggle
|
:style 'toggle
|
||||||
:selected (and (member name options) t)))))
|
:selected (and (member name options) t)))))
|
||||||
|
|
||||||
(defun org-mouse-clip-text (text maxlength)
|
(defun org-mouse-clip-text (text maxlength)
|
||||||
(if (> (length text) maxlength)
|
(if (> (length text) maxlength)
|
||||||
|
|
@ -572,14 +572,14 @@ This means, between the beginning of line and the point."
|
||||||
(skip-chars-backward " \t*") (bolp)))
|
(skip-chars-backward " \t*") (bolp)))
|
||||||
|
|
||||||
(defun org-mouse-insert-item (text)
|
(defun org-mouse-insert-item (text)
|
||||||
(case (org-mouse-line-position)
|
(cl-case (org-mouse-line-position)
|
||||||
(:beginning ; insert before
|
(:beginning ; insert before
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(looking-at "[ \t]*")
|
(looking-at "[ \t]*")
|
||||||
(open-line 1)
|
(open-line 1)
|
||||||
(indent-to-column (- (match-end 0) (match-beginning 0)))
|
(indent-to-column (- (match-end 0) (match-beginning 0)))
|
||||||
(insert "+ "))
|
(insert "+ "))
|
||||||
(:middle ; insert after
|
(:middle ; insert after
|
||||||
(end-of-line)
|
(end-of-line)
|
||||||
(newline t)
|
(newline t)
|
||||||
(indent-relative)
|
(indent-relative)
|
||||||
|
|
@ -646,7 +646,7 @@ This means, between the beginning of line and the point."
|
||||||
((or (eolp)
|
((or (eolp)
|
||||||
(and (looking-at "\\( \\|\t\\)\\(+:[0-9a-zA-Z_:]+\\)?\\( \\|\t\\)+$")
|
(and (looking-at "\\( \\|\t\\)\\(+:[0-9a-zA-Z_:]+\\)?\\( \\|\t\\)+$")
|
||||||
(looking-back " \\|\t" (- (point) 2)
|
(looking-back " \\|\t" (- (point) 2)
|
||||||
(line-beginning-position))))
|
(line-beginning-position))))
|
||||||
(org-mouse-popup-global-menu))
|
(org-mouse-popup-global-menu))
|
||||||
((funcall get-context :checkbox)
|
((funcall get-context :checkbox)
|
||||||
(popup-menu
|
(popup-menu
|
||||||
|
|
@ -738,13 +738,13 @@ This means, between the beginning of line and the point."
|
||||||
["- 1 Month" (org-timestamp-change -1 'month)])))
|
["- 1 Month" (org-timestamp-change -1 'month)])))
|
||||||
((funcall get-context :table-special)
|
((funcall get-context :table-special)
|
||||||
(let ((mdata (match-data)))
|
(let ((mdata (match-data)))
|
||||||
(incf (car mdata) 2)
|
(cl-incf (car mdata) 2)
|
||||||
(store-match-data mdata))
|
(store-match-data mdata))
|
||||||
(message "match: %S" (match-string 0))
|
(message "match: %S" (match-string 0))
|
||||||
(popup-menu `(nil ,@(org-mouse-keyword-replace-menu
|
(popup-menu `(nil ,@(org-mouse-keyword-replace-menu
|
||||||
'(" " "!" "^" "_" "$" "#" "*" "'") 0
|
'(" " "!" "^" "_" "$" "#" "*" "'") 0
|
||||||
(lambda (mark)
|
(lambda (mark)
|
||||||
(case (string-to-char mark)
|
(cl-case (string-to-char mark)
|
||||||
(? "( ) Nothing Special")
|
(? "( ) Nothing Special")
|
||||||
(?! "(!) Column Names")
|
(?! "(!) Column Names")
|
||||||
(?^ "(^) Field Names Above")
|
(?^ "(^) Field Names Above")
|
||||||
|
|
@ -1094,17 +1094,17 @@ This means, between the beginning of line and the point."
|
||||||
; (setq org-agenda-mode-hook nil)
|
; (setq org-agenda-mode-hook nil)
|
||||||
(defvar org-agenda-mode-map)
|
(defvar org-agenda-mode-map)
|
||||||
(add-hook 'org-agenda-mode-hook
|
(add-hook 'org-agenda-mode-hook
|
||||||
#'(lambda ()
|
(lambda ()
|
||||||
(setq org-mouse-context-menu-function 'org-mouse-agenda-context-menu)
|
(setq org-mouse-context-menu-function 'org-mouse-agenda-context-menu)
|
||||||
(org-defkey org-agenda-mode-map [mouse-3] 'org-mouse-show-context-menu)
|
(org-defkey org-agenda-mode-map [mouse-3] 'org-mouse-show-context-menu)
|
||||||
(org-defkey org-agenda-mode-map [down-mouse-3] 'org-mouse-move-tree-start)
|
(org-defkey org-agenda-mode-map [down-mouse-3] 'org-mouse-move-tree-start)
|
||||||
(org-defkey org-agenda-mode-map [C-mouse-4] 'org-agenda-earlier)
|
(org-defkey org-agenda-mode-map [C-mouse-4] 'org-agenda-earlier)
|
||||||
(org-defkey org-agenda-mode-map [C-mouse-5] 'org-agenda-later)
|
(org-defkey org-agenda-mode-map [C-mouse-5] 'org-agenda-later)
|
||||||
(org-defkey org-agenda-mode-map [drag-mouse-3]
|
(org-defkey org-agenda-mode-map [drag-mouse-3]
|
||||||
#'(lambda (event) (interactive "e")
|
(lambda (event) (interactive "e")
|
||||||
(case (org-mouse-get-gesture event)
|
(cl-case (org-mouse-get-gesture event)
|
||||||
(:left (org-agenda-earlier 1))
|
(:left (org-agenda-earlier 1))
|
||||||
(:right (org-agenda-later 1)))))))
|
(:right (org-agenda-later 1)))))))
|
||||||
|
|
||||||
(provide 'org-mouse)
|
(provide 'org-mouse)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue