Merge branch 'main' into feature/org-element-cache-new

etc/ORG-NEWS

@@ -183,6 +183,15 @@ latest stable version of Org should be compatible with Emacs 28.x,
 
 See [[https://orgmode.org/worg/org-maintenance.html#emacs-compatibility][this note on Worg]] and [[git::519947e508e081e71bf67db99e27b1c171ba4dfe][this commit]].
 
+*** The keybinding for ~org-table-blank-field~ has been removed
+
+If you prefer to keep the keybinding, you can add it back to
+~org-mode-map~ like so:
+
+#+begin_src emacs-lisp
+(define-key org-mode-map (kbd "C-c SPC") #'org-table-blank-field)
+#+end_src
+
 ** New features
 
 *** New citation engine

lisp/oc-basic.el

@@ -69,7 +69,6 @@
 (require 'bibtex)
 (require 'json)
 (require 'oc)
-(require 'org)
 (require 'seq)
 
 (declare-function org-open-at-point "org" (&optional arg))

lisp/org-goto.el

@@ -203,40 +203,39 @@ When nil, you can use these keybindings to navigate the buffer:
   "Let the user select a location in current buffer.
 This function uses a recursive edit.  It returns the selected
 position or nil."
-  (org-no-popups
+  (let ((isearch-mode-map org-goto-local-auto-isearch-map)
-   (let ((isearch-mode-map org-goto-local-auto-isearch-map)
+	(isearch-hide-immediately nil)
-	 (isearch-hide-immediately nil)
+	(isearch-search-fun-function
-	 (isearch-search-fun-function
+	 (lambda () #'org-goto--local-search-headings))
-	  (lambda () #'org-goto--local-search-headings))
+	(help (or help org-goto-help)))
-	 (help (or help org-goto-help)))
+    (save-excursion
-     (save-excursion
+      (save-window-excursion
-       (save-window-excursion
+	(delete-other-windows)
-	 (delete-other-windows)
+	(and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
-	 (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
+	(pop-to-buffer-same-window
-	 (pop-to-buffer-same-window
+	 (condition-case nil
-	  (condition-case nil
+	     (make-indirect-buffer (current-buffer) "*org-goto*" t)
-	      (make-indirect-buffer (current-buffer) "*org-goto*" t)
+	   (error (make-indirect-buffer (current-buffer) "*org-goto*" t))))
-	    (error (make-indirect-buffer (current-buffer) "*org-goto*" t))))
+	(let (temp-buffer-show-function temp-buffer-show-hook)
-	 (let (temp-buffer-show-function temp-buffer-show-hook)
+	  (with-output-to-temp-buffer "*Org Help*"
-	   (with-output-to-temp-buffer "*Org Help*"
+	    (princ (format help (if org-goto-auto-isearch
-	     (princ (format help (if org-goto-auto-isearch
+				    "  Just type for auto-isearch."
-				     "  Just type for auto-isearch."
+				  "  n/p/f/b/u to navigate, q to quit.")))))
-				   "  n/p/f/b/u to navigate, q to quit.")))))
+	(org-fit-window-to-buffer (get-buffer-window "*Org Help*"))
-	 (org-fit-window-to-buffer (get-buffer-window "*Org Help*"))
+	(org-overview)
-	 (org-overview)
+	(setq buffer-read-only t)
-	 (setq buffer-read-only t)
+	(if (and (boundp 'org-goto-start-pos)
-	 (if (and (boundp 'org-goto-start-pos)
+		 (integer-or-marker-p org-goto-start-pos))
-		  (integer-or-marker-p org-goto-start-pos))
+	    (progn (goto-char org-goto-start-pos)
-	     (progn (goto-char org-goto-start-pos)
+		   (when (org-invisible-p)
-		    (when (org-invisible-p)
+		     (org-show-set-visibility 'lineage)))
-		      (org-show-set-visibility 'lineage)))
+	  (goto-char (point-min)))
-	   (goto-char (point-min)))
+	(let (org-special-ctrl-a/e) (org-beginning-of-line))
-	 (let (org-special-ctrl-a/e) (org-beginning-of-line))
+	(message "Select location and press RET")
-	 (message "Select location and press RET")
+	(use-local-map org-goto-map)
-	 (use-local-map org-goto-map)
+	(recursive-edit)))
-	 (recursive-edit)))
+    (kill-buffer "*org-goto*")
-     (kill-buffer "*org-goto*")
+    (cons org-goto-selected-point org-goto-exit-command)))
-     (cons org-goto-selected-point org-goto-exit-command))))
 
 ;;;###autoload
 (defun org-goto (&optional alternative-interface)

lisp/org.el

@@ -95,6 +95,7 @@
 (require 'org-keys)
 (require 'ol)
 (require 'oc)
+(require 'oc-basic)
 (require 'org-table)
 
 ;; `org-outline-regexp' ought to be a defconst but is let-bound in