Skip to content

Commit a526ea6

Browse files
committed
Fix compiler warnings
* lisp/oc-basic.el (org-cite-basic--set-keymap): Do not use `buffer-substring' generalized variable. It is obsolete in Emacs 29. Explicitly call `delete-region' + `insert'. * lisp/org-agenda.el (org-element-lineage): Declare function. * lisp/org.el (org--align-node-property): Use `delete-region' instead of `buffer-substring' generalized variable.
1 parent be2246a commit a526ea6

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

lisp/oc-basic.el

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -502,12 +502,15 @@ substitutes for the unknown key. Finally, it may be the symbol
502502
(_
503503
(lambda ()
504504
(interactive)
505-
(setf (buffer-substring beg end)
506-
(concat "@"
507-
(if (= 1 (length suggestions))
508-
(car suggestions)
509-
(completing-read "Did you mean: "
510-
suggestions nil t))))))))
505+
(save-excursion
506+
(goto-char beg)
507+
(delete-region beg end)
508+
(insert
509+
"@"
510+
(if (= 1 (length suggestions))
511+
(car suggestions)
512+
(completing-read "Did you mean: "
513+
suggestions nil t))))))))
511514
(put-text-property beg end 'keymap km)))
512515

513516
(defun org-cite-basic-activate (citation)

lisp/org-agenda.el

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
(declare-function org-element-property "org-element" (property element))
8484
(declare-function org-element--cache-active-p "org-element"
8585
(&optional called-from-cache-change-func-p))
86+
(declare-function org-element-lineage "org-element"
87+
(datum &optional types with-self))
8688
(declare-function org-habit-insert-consistency-graphs
8789
"org-habit" (&optional line))
8890
(declare-function org-is-habit-p "org-habit" (&optional pom))

lisp/org.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18695,7 +18695,7 @@ Alignment is done according to `org-property-format', which see."
1869518695
(format org-property-format (match-string 1) (match-string 3))))))
1869618696
;; Do not use `replace-match' here as we want to inherit folding
1869718697
;; properties if inside fold.
18698-
(setf (buffer-substring (match-beginning 0) (match-end 0)) "")
18698+
(delete-region (match-beginning 0) (match-end 0))
1869918699
(insert-and-inherit newtext)))))
1870018700

1870118701
(defun org-indent-line ()

0 commit comments

Comments
 (0)