Revert to the explicit completing-read-multiple calls

This function abstracted almost nothing, no use to pretend it's
anything but a completing-read-multiple call with two arguments
hardcoded and the others reordered.

Author: vifon

tmsu-dired.el

@@ -79,9 +79,11 @@ If no files are marked, uses the file at point."
   (interactive nil dired-mode)
   (unless (tmsu-database-p)
     (error "No TMSU database"))
-  (let ((tags-to-add (tmsu-read-tags
+  (let ((tags-to-add (completing-read-multiple
                       "Tags to add: "
-                      nil 'tmsu-dired-tags-history)))
+                      (tmsu-completion-table-assignment)
+                      nil nil nil
+                      'tmsu-dired-tags-history)))
     (dolist (file (dired-get-marked-files))
       (apply #'tmsu-tags-add file tags-to-add))))
 
@@ -97,10 +99,11 @@ The completing read offers the sum of tags of all the marked files."
     (error "No TMSU database"))
   (let* ((files (dired-get-marked-files))
          (tags-in-files (mapcan #'cdr (tmsu-get-tags-for-files files)))
-         (tags-to-remove (tmsu-read-tags
+         (tags-to-remove (completing-read-multiple
                           "Tags to remove: "
-                          nil 'tmsu-dired-tags-history nil t
-                          tags-in-files)))
+                          tags-in-files
+                          nil t nil
+                          'tmsu-dired-tags-history)))
     (dolist (file files)
       (apply #'tmsu-tags-remove file tags-to-remove))))
 

tmsu.el

@@ -272,22 +272,6 @@ TMSU commands."
          "untag" "--" (file-local-name file)
          tags))
 
-(defun tmsu-read-tags
-    (prompt &optional initial-input hist def require-match table)
-  "Read multiple tags with completion.
-
-PROMPT, INITIAL-INPUT, HIST, DEF, REQUIRE-MATCH and TABLE are
-passed to `completing-read-multiple', see its documentation for
-the details.
-
-TABLE can be passed to use instead of a call to
-`tmsu-completion-table-assignment'."
-  (completing-read-multiple
-   prompt
-   (or table (tmsu-completion-table-assignment))
-   nil
-   require-match initial-input hist def))
-
 ;;;###autoload
 (defun tmsu-edit (file)
   "Interactively edit the TMSU tags of FILE."
@@ -299,8 +283,10 @@ TABLE can be passed to use instead of a call to
          (tags-old (let ((tags (tmsu-get-tags file)))
                      (dolist (func tmsu-tag-list-preprocess-functions tags)
                        (setq tags (funcall func tags)))))
-         (tags-new (tmsu-read-tags
+         (tags-new (completing-read-multiple
                     (format-message "Tag `%s': " file-name)
+                    (tmsu-completion-table-assignment)
+                    nil nil
                     (string-join tags-old ",")
                     'tmsu-edit-history
                     (string-join (append tags-old