[gnu] externals/org 1cc7569001: ; org-colview: Simplify summary type completion

[ELPA Syncer]

branch: externals/org
commit 1cc75690018f35ad06a9d759c6605ea7d1e1ea88
Author: Slawomir Grochowski <slawomir.grochow...@gmail.com>
Commit: Slawomir Grochowski <slawomir.grochow...@gmail.com>

    ; org-colview: Simplify summary type completion
    
    * lisp/org-colview.el (org-columns--summary-types-completion-function):
    Add a docstring and bind summary type data, completion candidates,
    and annotation function locally.
    
    Refactoring: Extract Variable.
    
    No behavior change.
---
 lisp/org-colview.el | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 2378aa85dd..5218412b70 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -1030,26 +1030,24 @@ When COLUMNS-FORMAT is non-nil, use it as the column 
format."
 ;;;; Column definition editing
 
 (defun org-columns--summary-types-completion-function (string pred flag)
-  (let ((completion-table
-         (org-completion-table-with-metadata
-          (lambda (str pred comp)
-            (complete-with-action comp
-                                  (delete-dups
-                                   (cons '("" "")
-                                         (mapcar #'car
-                                                 (append 
org-columns-summary-types
-                                                         
org-columns-summary-types-default))))
-                                  str pred))
-          `(metadata
-            . ((annotation-function
-                . ,(lambda (string)
-                     (let* ((doc (ignore-errors
-                                   (documentation
-                                    (cdr (assoc string
-                                                (append 
org-columns-summary-types
-                                                        
org-columns-summary-types-default))))))
-                            (doc (and doc (substring doc 0 (string-search "\n" 
doc)))))
-                       (if doc (format " -- %s" doc) "")))))))))
+  "Complete column summary type operators.
+STRING, PRED, and FLAG are the usual arguments for completion
+table functions."
+  (let* ((summary-types (append org-columns-summary-types
+                               org-columns-summary-types-default))
+        (candidates (delete-dups
+                     (cons '("" "") (mapcar #'car summary-types))))
+        (annotation-function
+         (lambda (string)
+           (let* ((doc (ignore-errors
+                         (documentation (cdr (assoc string summary-types)))))
+                  (doc (and doc (substring doc 0 (string-search "\n" doc)))))
+             (if doc (format " -- %s" doc) ""))))
+        (completion-table
+         (org-completion-table-with-metadata
+          (lambda (str predicate action)
+            (complete-with-action action candidates str predicate))
+          `(metadata . ((annotation-function . ,annotation-function))))))
     (complete-with-action flag completion-table string pred)))
 
 (defun org-columns-new (&optional spec &rest attributes)