summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/doc/jao-org-links.el9
-rw-r--r--lib/net/jao-notmuch.el11
-rw-r--r--lib/wm/jao-exwm-zathura.el2
3 files changed, 15 insertions, 7 deletions
diff --git a/lib/doc/jao-org-links.el b/lib/doc/jao-org-links.el
index fc1a241..1bd8709 100644
--- a/lib/doc/jao-org-links.el
+++ b/lib/doc/jao-org-links.el
@@ -8,6 +8,8 @@
(require 'jao-pdf)
(require 'jao-afio)
+(declare-function jao-pdf-skim-org "jao-mac")
+
(defvar jao-org--sink-dir "./")
(defvar jao-org-open-pdf-fun #'jao-org--default-open)
@@ -112,9 +114,9 @@
(new (not (file-exists-p file))))
(if (and (not file-name) (or arg new))
(org-store-link nil t)
- (when-let* ((fboundp 'jao-pdf-skim-org-link)
- (lnk (jao-pdf-skim-org-link nil)))
- (kill-new lnk)))
+ (when (fboundp 'jao-pdf-skim-org-link)
+ (when-let* ((lnk (jao-pdf-skim-org-link nil)))
+ (kill-new lnk))))
(find-file-other-window file)
(when new
(jao-org-insert-doc-skeleton (jao-pdf-title file-name))
@@ -123,6 +125,7 @@
;;;###autoload
(defun jao-org-pdf-goto-org* () (interactive) (jao-org-pdf-goto-org t))
+;;;###autoload
(defun jao-org-org-to-pdf-file ()
(expand-file-name (concat "doc/" (file-name-base buffer-file-name) ".pdf")
(file-name-directory jao-org-notes-dir)))
diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el
index 0809d7b..db23bc1 100644
--- a/lib/net/jao-notmuch.el
+++ b/lib/net/jao-notmuch.el
@@ -402,7 +402,8 @@
(tb (seq-find (lambda (b)
(with-current-buffer b
(and (derived-mode-p 'notmuch-tree-mode) b)))
- (buffer-list))))
+ (buffer-list)))
+ (subject (propertize subject 'face 'message-header-subject)))
`((:eval
(jao-notmuch--format-header-line ,(buffer-name tb) ,cb ,subject)))
(concat " " subject)))
@@ -545,11 +546,15 @@
(t " "))))
(provide 'jao-notmuch)
+
;;; bars
+(defvar jao-notmuch-bar-max 188)
+
(defun jao-notmuch-hbar (margin)
- (widget-insert (propertize (make-string (- (window-width) margin) ?—)
- 'face '(:foreground "grey80")))
+ (let ((w (- (min (window-width) jao-notmuch-bar-max) margin)))
+ (widget-insert (propertize (make-string w ?—) 'face '(:foreground "grey80"))))
(newline))
+
;;; org links
(defun jao-notmuch-id-file-name (id)
(let ((cmd (format "notmuch search --output=files id:%s" id)))
diff --git a/lib/wm/jao-exwm-zathura.el b/lib/wm/jao-exwm-zathura.el
index f26f0f9..0a11dbb 100644
--- a/lib/wm/jao-exwm-zathura.el
+++ b/lib/wm/jao-exwm-zathura.el
@@ -77,7 +77,7 @@
(defun jao-exwm-zathura-goto-org (&optional arg)
(interactive "P")
(when-let* ((info (jao-zathura--file-info (current-buffer)))
- (file (jao-org-find-for-pdf (car info))))
+ (file (jao-org-notes-find-for-pdf (car info))))
(let ((newp (not (file-exists-p file))))
(when (or arg newp) (org-store-link nil t))
(find-file-other-window file)