Re: [PATCH] org-bibtex-yank: Allow to populate existing item
Ihor Radchenko wrote: > Martin Kampas writes: > > Subject: [PATCH] org-bibtex-yank: Allow to populate existing item > > Applied, onto main, with amendments. > I changed the argument name from NONEW to UPDATE-HEADING and updated the > commit message. > https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/? id=37e468cf1 > > Thanks for your contribution! Thank you too! signature.asc Description: This is a digitally signed message part.
Re: [PATCH] org-bibtex-yank: Allow to populate existing item
On neděle 18. února 2024 15:29:09 CET Ihor Radchenko wrote: > In the code, you do not check for t, but for non-nil. So, please say > "non-nil" in the docstring as well. As stated in the commit message, aligning with org-bibtex-create... ok, let me update the doc string of org-bibtex-create as well. > Also, I'd prefer a more descriptive name, like update-heading. nonew is > ambiguous - it can be interpreted in several ways. ...aligning with org-bibtex-create. > > + (interactive "P") > > + (let (entry > > +(noindent nonew)) > > Why do you bind noindent here? It says nothing about (re)indenting the existing entry, so my feeling was it would be better to avoid doing that if there is no way to override. Now if you need to ask about it, it seems it is not really an issue, so I removed it, hardcoding nil there. BR, Martin >From 8210921aa94430b651c9813acb1c12448db00fb8 Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Mon, 12 Feb 2024 13:24:54 +0100 Subject: [PATCH] org-bibtex-yank: Allow to populate existing item Align with `org-bibtex-create'. * lisp/ol-bibtex.el (org-bibtex-write): New optional argument `nonew', similar to the existing `nonew' argument of `org-bibtex-create'. * lisp/ol-bibtex.el (org-bibtex-yank): New optional argument `nonew', similar to the existing `nonew' argument of `org-bibtex-create'. --- etc/ORG-NEWS | 10 ++ lisp/ol-bibtex.el | 42 -- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 7d2f70ab6..4751deaaa 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -812,6 +812,11 @@ propagating the value for this variable to ~org-agenda-archives-mode~. For acceptable values and their meaning, see the value of that variable. ** New features +*** ~org-bibtex-yank~ accepts a prefix argument + +When called with a prefix argument, ~org-bibtex-yank~ adds data to the +headline of the entry at point instead of creating a new one. + *** =ob-plantuml.el=: Support tikz file format output =ob-plantuml.el= now output =tikz= :file format via @@ -1011,6 +1016,11 @@ The same can be done via startup options: : #+STARTUP: fnanon ** New functions and changes in function arguments +*** New optional argument =NONEW= for ~org-bibtex-yank~ + +When the new argument is non-nil, add data to the headline of the +entry at point. + *** New API functions to store data within ~org-element-cache~ Elisp programs can now store data inside Org element cache. diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el index c5a950e2d..4ec4dc958 100644 --- a/lisp/ol-bibtex.el +++ b/lisp/ol-bibtex.el @@ -642,8 +642,8 @@ With prefix argument OPTIONAL also prompt for optional fields." (defun org-bibtex-create (&optional arg nonew) "Create a new entry at the given level. -With a prefix arg, query for optional fields as well. -If nonew is t, add data to the headline of the entry at point." +With a prefix ARG, query for optional fields as well. +If NONEW is non-nil, add data to the headline of the entry at point." (interactive "P") (let* ((type (completing-read "Type: " (mapcar (lambda (type) @@ -722,29 +722,32 @@ Return the number of saved entries." (interactive "fFile: ") (org-bibtex-read-buffer (find-file-noselect file 'nowarn 'rawfile))) -(defun org-bibtex-write (&optional noindent) +(defun org-bibtex-write (&optional noindent nonew) "Insert a heading built from the first element of `org-bibtex-entries'. When optional argument NOINDENT is non-nil, do not indent the properties -drawer." +drawer. If NONEW is non-nil, add data to the headline of the entry at +point." (interactive) (unless org-bibtex-entries (error "No entries in `org-bibtex-entries'")) (let* ((entry (pop org-bibtex-entries)) (org-special-properties nil) ; avoids errors with `org-entry-put' (val (lambda (field) (cdr (assoc field entry - (togtag (lambda (tag) (org-toggle-tag tag 'on -(org-insert-heading) -(insert (funcall org-bibtex-headline-format-function entry)) -(insert "\n:PROPERTIES:\n") -(org-bibtex-put "TITLE" (funcall val :title) 'insert) + (togtag (lambda (tag) (org-toggle-tag tag 'on))) + (insert-raw (not nonew))) +(unless nonew + (org-insert-heading) + (insert (funcall org-bibtex-headline-format-function entry)) + (insert "\n:PROPERTIES:\n")) +(org-bibtex-put "TITLE" (funcall val :title) insert-raw) (org-bibtex-put org-bibtex-type-property-name (downcase (funcall val :type)) -'insert) +insert-raw) (dolist (pair entry) (pcase (car pair) (:titlenil) (:type nil) - (:key
[PATCH] org-bibtex-yank: Allow to populate existing item
Hi, The attached patch allows to use org-bibtex-yank to populate an existing item instead of creating a new one, aligning its behavior with org-bibtex-create. BR, Martin Kampas >From 96af3ef46bb056e58206af77d3d37c5af2e43d7f Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Mon, 12 Feb 2024 13:24:54 +0100 Subject: [PATCH] org-bibtex-yank: Allow to populate existing item Align with org-bibtex-create. * lisp/ol-bibtex.el (org-bibtex-write): New optional argument nonew, similar to the existing nonew argument of org-bibtex-create * lisp/ol-bibtex.el (org-bibtex-yank): New optional argument nonew, similar to the existing nonew argument of org-bibtex-create --- lisp/ol-bibtex.el | 39 ++- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el index c5a950e2d..6ae4ae3cc 100644 --- a/lisp/ol-bibtex.el +++ b/lisp/ol-bibtex.el @@ -722,29 +722,31 @@ Return the number of saved entries." (interactive "fFile: ") (org-bibtex-read-buffer (find-file-noselect file 'nowarn 'rawfile))) -(defun org-bibtex-write (&optional noindent) +(defun org-bibtex-write (&optional noindent nonew) "Insert a heading built from the first element of `org-bibtex-entries'. When optional argument NOINDENT is non-nil, do not indent the properties -drawer." +drawer. If NONEW is t, add data to the headline of the entry at point." (interactive) (unless org-bibtex-entries (error "No entries in `org-bibtex-entries'")) (let* ((entry (pop org-bibtex-entries)) (org-special-properties nil) ; avoids errors with `org-entry-put' (val (lambda (field) (cdr (assoc field entry - (togtag (lambda (tag) (org-toggle-tag tag 'on -(org-insert-heading) -(insert (funcall org-bibtex-headline-format-function entry)) -(insert "\n:PROPERTIES:\n") -(org-bibtex-put "TITLE" (funcall val :title) 'insert) + (togtag (lambda (tag) (org-toggle-tag tag 'on))) + (insert-raw (not nonew))) +(unless nonew + (org-insert-heading) + (insert (funcall org-bibtex-headline-format-function entry)) + (insert "\n:PROPERTIES:\n")) +(org-bibtex-put "TITLE" (funcall val :title) insert-raw) (org-bibtex-put org-bibtex-type-property-name (downcase (funcall val :type)) -'insert) +insert-raw) (dolist (pair entry) (pcase (car pair) (:titlenil) (:type nil) - (:key (org-bibtex-put org-bibtex-key-property (cdr pair) 'insert)) + (:key (org-bibtex-put org-bibtex-key-property (cdr pair) insert-raw)) (:keywords (if org-bibtex-tags-are-keywords (dolist (kw (split-string (cdr pair) ", *")) (funcall @@ -752,25 +754,28 @@ drawer." (replace-regexp-in-string "[^[:alnum:]_@#%]" "" (replace-regexp-in-string "[ \t]+" "_" kw - (org-bibtex-put (car pair) (cdr pair) 'insert))) - (_ (org-bibtex-put (car pair) (cdr pair) 'insert -(insert ":END:\n") + (org-bibtex-put (car pair) (cdr pair) insert-raw))) + (_ (org-bibtex-put (car pair) (cdr pair) insert-raw +(unless nonew + (insert ":END:\n")) (mapc togtag org-bibtex-tags) (unless noindent (org-indent-region (save-excursion (org-back-to-heading t) (point)) (point) -(defun org-bibtex-yank () - "If kill ring holds a bibtex entry yank it as an Org headline." - (interactive) - (let (entry) +(defun org-bibtex-yank (&optional nonew) + "If kill ring holds a bibtex entry yank it as an Org headline. +If nonew is t, add data to the headline of the entry at point." + (interactive "P") + (let (entry +(noindent nonew)) (with-temp-buffer (yank 1) (bibtex-mode) (setf entry (org-bibtex-read))) (if entry - (org-bibtex-write) + (org-bibtex-write noindent nonew) (error "Yanked text does not appear to contain a BibTeX entry" (defun org-bibtex-import-from-file (file) -- 2.43.0
Re: Bug: Incorrect done TODO keywords highlighting in column view
Hi Kyle, You are right, I completely forgot about columns view under the "regular" buffers. Updated patch below. BR, Martin >From 288c157ea95e00de4b508e0fd257b51857e097b9 Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Mon, 19 Oct 2020 07:22:57 +0200 Subject: [PATCH] org-colview: Fix done keywords highlighting in agenda buffers * lisp/org-colview.el (org-agenda-columns): Populate org-done-keywords from org-done-keywords-for-agenda or the done keywords will use the same face as those not-done. --- lisp/org-colview.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index e50a4d7c8..565bdb2dd 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -1586,6 +1586,7 @@ PARAMS is a property list of parameters: (move-marker org-columns-begin-marker (point)) (setq org-columns-begin-marker (point-marker))) (let* ((org-columns--time (float-time)) +(org-done-keywords org-done-keywords-for-agenda) (fmt (cond ((bound-and-true-p org-overriding-columns-format)) -- 2.28.0
Bug: Incorrect done TODO keywords highlighting in column view
Hi,
In columns view, all TODO keywords except those with face set explicitly with
org-todo-
keyword-faces are red. Done keywords should be green.
Patch below.
BR,
Martin
>From a4df0da1057afbe90ea0e457158082b15386a164 Mon Sep 17 00:00:00 2001
From: Martin Kampas
Date: Fri, 9 Oct 2020 07:43:17 +0200
Subject: [PATCH] org-colview: Fix done TODO keywords highlighting
* lisp/org-colview.el (org-columns--overlay-text): Populate
org-done-keywords from org-done-keywords-for-agenda or the done keywords
will use the same face as not-done keywords.
---
lisp/org-colview.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index e50a4d7c8..827f57e5e 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -365,7 +365,9 @@ ORIGINAL is the real string, i.e., before it is modified by
org-tags-special-faces-re
(lambda (m) (propertize m 'face (org-get-tag-face m)))
v nil nil 1)))
- ("TODO" (propertize v 'face (org-get-todo-face original)))
+ ("TODO"
+ (let ((org-done-keywords org-done-keywords-for-agenda))
+ (propertize v 'face (org-get-todo-face original
(_ v)
(defvar org-columns-header-line-remap nil
--
2.28.0
[O] Bug: org-collector evaluates headlines starting with hyperlink as lisp code
Hi, With headlines like * [[http://example.com]] Example org-collector writes just "http://example.com"; in the table, omitting the rest of the headline. Patch below. BR, Martin >From 1228efc453d38bc090511f21fafa750e416e8b7a Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Mon, 23 Apr 2018 19:27:18 +0200 Subject: [PATCH] org-collector.el: Inhibit lisp evaluation of headlines * contrib/lisp/org-collector.el (org-propview-collect): Inhibit lisp evaluation of headlines This fixes org-collector usage for items starting with a hyperlink, which would be incorrectly treated as lisp code. --- contrib/lisp/org-collector.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el index 1d2351923..833ecbf51 100644 --- a/contrib/lisp/org-collector.el +++ b/contrib/lisp/org-collector.el @@ -186,7 +186,8 @@ variables and values specified in props" (header-props (mapcar (lambda (props) (mapcar (lambda (pair) - (cons (car pair) (org-babel-read (cdr pair + (let ((inhibit-lisp-eval (string= (car pair) "ITEM"))) + (cons (car pair) (org-babel-read (cdr pair) inhibit-lisp-eval props)) header-props)) ;; collect all property names -- 2.16.2
Re: [O] Bug: Matching tags: results incomplete when mixing group tags and their ancestors [9.1.7 (9.1.7-12-g74f6ed-elpaplus @ /home/martin/.emacs.d/elpa/org-plus-contrib-20180305/)]
Hi Bastien,
> If you have time to add tests, that'd be great, as Nicolas suggested.
Here you are.
Best Regards,
Martin
>From bd8059e18fa3bd2977415449139fc626d03817a3 Mon Sep 17 00:00:00 2001
From: Martin Kampas
Date: Thu, 22 Mar 2018 06:20:31 +0100
Subject: [PATCH] Extend match-sparse-tree test for tag hierarchies
* test-org.el (test-org/match-sparse-tree): Extend test after commit
894ec00 (org.el: Fix recursion stop condition when expanding tags).
---
testing/lisp/test-org.el | 9 +
1 file changed, 9 insertions(+)
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index e97dfe775..8d8b36f86 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -5765,6 +5765,15 @@ Paragraph"
(org-match-sparse-tree nil "Lev_1")
(search-forward "H4")
(org-invisible-p2)))
+ (should-not
+ (org-test-with-temp-text
+ "#+TAGS: [ Lev_1 : Lev_2 ]\n
+#+TAGS: [ Lev_2 : Lev_3 ]\n
+#+TAGS: { Lev_3 : Lev_4 }\n
+* H\n** H1 :Lev_1:\n** H2 :Lev_2:\n** H3 :Lev_3:\n** H4 :Lev_4:"
+ (org-match-sparse-tree nil "Lev_1+Lev_3")
+ (search-forward "H4")
+ (org-invisible-p2)))
;; Match regular expressions in tags
(should-not
(org-test-with-temp-text
--
2.16.2
Re: [O] Bug: Matching tags: results incomplete when mixing group tags and their ancestors [9.1.7 (9.1.7-12-g74f6ed-elpaplus @ /home/martin/.emacs.d/elpa/org-plus-contrib-20180305/)]
Hi, This seems to fix the bug. Best Regards, Martin >From fef860e356a4ca75366f69ec9c2d52252c9d7d3f Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Thu, 15 Mar 2018 15:41:53 +0100 Subject: [PATCH] Fix matching tags when mixing group tags and their ancestors * lisp/org.el (org-expand-tags): Fix recursion stop condition See http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00228.html --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 76bc60c88..7bf013390 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13960,7 +13960,7 @@ When DOWNCASE is non-nil, expand downcased TAGS." (tag (match-string 2 return-match)) (tag (if downcased (downcase tag) tag))) (unless (or (get-text-property 0 'grouptag (match-string 2 return- match)) - (member tag work-already-expanded)) + (member tag tags-already-expanded)) (setq tags-in-group (assoc tag taggroups)) (push tag work-already-expanded) ;; Recursively expand each tag in the group, if the tag hasn't -- 2.16.2
[O] Bug: Matching tags: results incomplete when mixing group tags and their ancestors [9.1.7 (9.1.7-12-g74f6ed-elpaplus @ /home/martin/.emacs.d/elpa/org-plus-contrib-20180305/)]
Hi,
Here is an example Org file:
#+TAGS: [ tag1 : tag2 ] [ tag2 : tag3 ] [ tag3 : tag4 ]
* Tag1 :tag1:
* Tag2 :tag2:
* Tag3 :tag3:
* Tag4 :tag4:
Searching headlines by tags works well unless you combine a group tag together
with some of its ancestor tags in the query.
1) GOOD - Searching for "tag1" marks all four headlines.
2) GOOD - Searching for "tag3" marks headlines "Tag3" and "Tag4".
3) BAD - Searching for "tag1+tag3" marks just headline "Tag3" providing an
incomplete result. Expected result: headlines "Tag3" and "Tag4" are marked.
With more complex tag set it may happen quite easily that such a search is done.
The bug seems to be in org-tags-expand.
(org-tags-expand "tag1")
#("{\\<\\(?:tag[1-4]\\)\\>}" 0 20 (grouptag t))
(org-tags-expand "tag3")
#("{\\<\\(?:tag[34]\\)\\>}" 0 19 (grouptag t))
(org-tags-expand "tag1+tag3")
#("{\\<\\(?:tag[1-4]\\)\\>}+tag3" 0 20 (grouptag t))
In the third invocation "tag3" was left unexpanded.
Best regards,
Martin
Emacs : GNU Emacs 25.3.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.26)
of 2018-02-09
Package: Org mode version 9.1.7 (9.1.7-12-g74f6ed-elpaplus @
/home/martin/.emacs.d/elpa/org-plus-contrib-20180305/)
[O] Bug: Broken TODO keywords highlighting after unbalanced quotes/parens [8.3.6 (8.3.6-7-g4d7d52-elpa @ /home/martin/.spacemacs.home/.emacs.d/elpa/org-20161017/)]
Hi,
With the minimal example pasted below, the second TODO keyword gets highlighted
with a noticeably lighter red color than the first one. In my big org file it
made a full rainbow with the other TODO keywords, making it completely
unusable. Note that only the length of the padding is significant, not the
characters used.
test.org begin
rrr
rrr
rrr
rrr
rrr
rr
* TODO foo
: "rrr 'rrr (rrr 'rrr)'
* TODO baz
- test.org end -
Regards,
Martin
Emacs : GNU Emacs 25.1.1 (x86_64-unknown-linux-gnu, GTK+ Version 3.20.9)
of 2016-09-18
Package: Org-mode version 8.3.6 (8.3.6-7-g4d7d52-elpa @
/home/martin/.spacemacs.home/.emacs.d/elpa/org-20161017/)
current state:
==
(setq
org-id-locations-file
"/home/martin/.spacemacs.home/.emacs.d/.cache/.org-id-locations"
org-clock-clocked-in-display 'frame-title
org-clocktable-defaults '(:maxlevel 2 :lang "en" :scope file :block nil
:wstart 1 :mstart 1
:tstart nil :tend nil :step nil :stepskip0 nil
:fileskip0 nil :tags
nil :emphasize nil :link nil :narrow 80! :indent t
:formula nil
:timestamp nil :level nil :tcolumns nil :formatter
nil)
org-tab-first-hook '(org-hide-block-toggle-maybe
org-babel-hide-result-toggle-maybe
org-babel-header-arg-expand)
org-clock-persist-file
"/home/martin/.spacemacs.home/.emacs.d/.cache/org-clock-save.el"
org-speed-command-hook '(org-speed-command-default-hook
org-babel-speed-command-hook)
org-time-clocksum-format '(:hours "%d" :require-hours t :minutes ":%02d"
:require-minutes t)
org-occur-hook '(org-first-headline-recenter)
org-imenu-depth 8
org-metaup-hook '(org-babel-load-in-session-maybe)
org-html-format-drawer-function '(lambda (name contents) contents)
org-log-done t
org-latex-format-inlinetask-function
'org-latex-format-inlinetask-default-function
org-confirm-shell-link-function 'yes-or-no-p
org-image-actual-width nil
org-ascii-format-inlinetask-function 'org-ascii-format-inlinetask-default
org-link-translation-function 'toc-org-unhrefify
org-time-stamp-custom-formats '("<%m/%d %a>" . "<%m/%d %a %H:%M>")
org-present-mode-hook '(spacemacs//org-present-start)
org-agenda-restore-windows-after-quit t
org-display-internal-link-with-indirect-buffer t
org-latex-format-headline-function 'org-latex-format-headline-default-function
org-default-notes-file "notes.org"
org-todo-keyword-faces '(("PROG" . "orange") ("WAIT" . "OrangeRed") ("RESO" .
"YellowGreen"))
org-after-todo-state-change-hook '(org-clock-out-if-current)
org-latex-format-drawer-function '(lambda (name contents) contents)
org-src-mode-hook '(org-src-babel-configure-edit-buffer
org-src-mode-configure-edit-buffer)
org-agenda-before-write-hook '(org-agenda-add-entry-text)
org-babel-pre-tangle-hook '(save-buffer)
org-mode-hook '(#[nil "\300\301\302\303\304$\207"
[org-add-hook change-major-mode-hook org-show-block-all
append local] 5]
#[nil "\300\301\302\303\304$\207"
[org-add-hook change-major-mode-hook
org-babel-show-result-all append local]
5]
org-babel-result-hide-spec org-babel-hide-all-hashes
spacemacs/load-yasnippet
toc-org-enable org-download-enable org-bullets-mode
spacemacs//org-babel-do-load-languages
spacemacs/add-org-surrounds
evil-org-mode org-eldoc-load spacemacs//init-company-org-mode
company-mode)
org-archive-hook '(org-attach-archive-delete-maybe)
org-ascii-format-drawer-function '(lambda (name contents width) contents)
org-ctrl-c-ctrl-c-hook '(org-babel-hash-at-point
org-babel-execute-safely-maybe)
org-cycle-hook '(org-cycle-hide-archived-subtrees org-cycle-hide-drawers
org-cycle-show-empty-lines
org-optimize-window-after-visibility-change)
org-publish-timestamp-directory
"/home/martin/.spacemacs.home/.emacs.d/.cache/.org-timestamps/"
org-present-mode-quit-hook '(spacemacs//org-present-end)
org-export-async-init-file
"/home/martin/.spacemacs.home/.emacs.d/layers/+emacs/org/local/org-async-init.el"
org-cycle-include-plain-lists 'integrate
org-download-annotate-function 'org-download-annotate-default
org-clock-frame-title-format '(:eval org-mode-line-string)
org-hide-emphasis-markers t
org-confirm-elisp-link-function 'yes-or-no-p
org-startup-with-inline-images t
org-metadown-hook '(org-babel-pop-to-session-maybe)
org-babel-after-execute-hook '(spac
