|
103 | 103 | ;; Silent byte-compiler
|
104 | 104 | (defvar view-exit-action)
|
105 | 105 | (declare-function org-collect-keywords "org")
|
| 106 | +(defvar age-armor) |
| 107 | +(defvar age-file-encrypt-to) |
| 108 | +(declare-function age-make-context "ext:age.el") |
| 109 | +(declare-function age-select-keys "ext:age.el") |
106 | 110 |
|
107 | 111 | (when (version< org-version "9.2")
|
108 | 112 | (defalias 'org-set-tags-to 'org-set-tags))
|
@@ -764,7 +768,7 @@ This allows the use of `org-journal-tag-alist' and
|
764 | 768 | and return (equal entry date))) ;; If an entry exists don't create a header
|
765 | 769 |
|
766 | 770 |
|
767 |
| - (when (looking-back "[^\t ]" (point-at-bol)) |
| 771 | + (when (looking-back "[^\t ]" (line-beginning-position)) |
768 | 772 | (insert "\n"))
|
769 | 773 | (insert entry-header)
|
770 | 774 |
|
@@ -965,8 +969,8 @@ to process the carryover entries in `prev-buffer'."
|
965 | 969 | (save-excursion
|
966 | 970 | (while (re-search-forward "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\( [a-z]+\\)?\\)>" nil t)
|
967 | 971 | (unless (save-excursion
|
968 |
| - (goto-char (point-at-bol)) |
969 |
| - (re-search-forward "\\<\\(SCHEDULED\\|DEADLINE\\):" (point-at-eol) t)) |
| 972 | + (goto-char (line-beginning-position)) |
| 973 | + (re-search-forward "\\<\\(SCHEDULED\\|DEADLINE\\):" (line-end-position) t)) |
970 | 974 | (replace-match
|
971 | 975 | (format-time-string "%Y-%m-%d %a"
|
972 | 976 | (org-journal--calendar-date->time
|
@@ -1048,7 +1052,7 @@ previous day's file to the current file."
|
1048 | 1052 | end (save-excursion (outline-next-heading) (point))
|
1049 | 1053 | text (buffer-substring-no-properties start end))
|
1050 | 1054 | (push (cons start (cons end text)) carryover-item-with-parents)))
|
1051 |
| - (setq start (point-at-bol) |
| 1055 | + (setq start (line-beginning-position) |
1052 | 1056 | end (progn (outline-end-of-subtree) (outline-next-heading) (point))
|
1053 | 1057 | text (buffer-substring-no-properties start end))
|
1054 | 1058 | (setq carryover-item-with-parents (append carryover-item-with-parents (list (cons start (cons end text)))))))
|
@@ -1212,7 +1216,7 @@ With non-nil prefix argument create a regular entry instead of a TODO entry."
|
1212 | 1216 | (let (org-journal-carryover-items)
|
1213 | 1217 | (org-save-outline-visibility t
|
1214 | 1218 | (org-journal-new-entry t time)
|
1215 |
| - (when (looking-back "[^\t ]" (point-at-bol) t) |
| 1219 | + (when (looking-back "[^\t ]" (line-beginning-position) t) |
1216 | 1220 | (insert "\n"))
|
1217 | 1221 | (org-yank))))))
|
1218 | 1222 |
|
@@ -1354,7 +1358,7 @@ If NO-SELECT is non-nil, open it, but don't show it."
|
1354 | 1358 | (when (file-exists-p org-journal--cache-file)
|
1355 | 1359 | (with-temp-buffer
|
1356 | 1360 | (insert-file-contents org-journal--cache-file)
|
1357 |
| - (setq org-journal--dates (read (buffer-substring (point-at-bol) (point-at-eol)))))))) |
| 1361 | + (setq org-journal--dates (read (buffer-substring (line-beginning-position) (line-end-position)))))))) |
1358 | 1362 | (org-journal--sort-dates))
|
1359 | 1363 |
|
1360 | 1364 | (defun org-journal--sort-dates ()
|
|
0 commit comments