* helm-source.el: Rename helm--make* to helm-make.

* helm-bookmark.el: same.
* helm-buffers.el: same.
* helm-regexp.el: same.

4 files changed, 12 insertions, 11 deletions

diff --git a/helm-bookmark.el b/helm-bookmark.el
index c9b63f48..1bf44912 100644
--- a/helm-bookmark.el
+++ b/helm-bookmark.el
@@ -93,7 +93,7 @@
     (search :initform 'helm-bookmark-search-fn)))
 
 (defvar helm-source-bookmarks
-  (helm--make-source "Bookmarks" 'helm-source-basic-bookmarks)
+  (helm-make-source "Bookmarks" 'helm-source-basic-bookmarks)
   "See (info \"(emacs)Bookmarks\").")
 
 (defun helm-bookmark-transformer (candidates _source)
diff --git a/helm-buffers.el b/helm-buffers.el
index c39e5b4c..bb76774d 100644
--- a/helm-buffers.el
+++ b/helm-buffers.el
@@ -169,7 +169,7 @@ Only buffer names are fuzzy matched when this is enabled,
     :initform
     "Show this buffer / C-u \\[helm-execute-persistent-action]: Kill this buffer")))
 
-(defvar helm-source-buffers-list (helm--make-source "Buffers" 'helm-source-buffers))
+(defvar helm-source-buffers-list (helm-make-source "Buffers" 'helm-source-buffers))
 
 (defvar helm-source-buffer-not-found
   (helm-build-dummy-source
diff --git a/helm-regexp.el b/helm-regexp.el
index bb43be1c..97a9020b 100644
--- a/helm-regexp.el
+++ b/helm-regexp.el
@@ -166,7 +166,7 @@ i.e Don't replace inside a word, regexp is surrounded with \\bregexp\\b."
 (defun helm-occur-init-source ()
   (unless helm-source-occur
     (setq helm-source-occur
-          (helm--make-source "Occur" 'helm-source-multi-occur))))
+          (helm-make-source "Occur" 'helm-source-multi-occur))))
 
 
 ;;; Multi occur
@@ -381,7 +381,7 @@ Same as `helm-moccur-goto-line' but go in new frame."
                   buffers)))
     (unless helm-source-moccur
       (setq helm-source-moccur
-            (helm--make-source "Moccur" 'helm-source-multi-occur)))
+            (helm-make-source "Moccur" 'helm-source-multi-occur)))
     (helm-attrset 'moccur-buffers bufs helm-source-moccur)
     (helm-set-local-variable 'helm-multi-occur-buffer-list bufs)
     (helm-set-local-variable
diff --git a/helm-source.el b/helm-source.el
index 6fb9f9ca..fc515413 100644
--- a/helm-source.el
+++ b/helm-source.el
@@ -753,7 +753,7 @@ i.e After the creation of `helm-buffer'."))
            when slot-val
            collect (cons s (unless (eq t slot-val) slot-val))))
 
-(defun helm--make-source (name class &rest args)
+(defun helm-make-source (name class &rest args)
   "Build a `helm' source named NAME with ARGS for CLASS.
 Argument NAME is a string which define the source name, so no need to use
 the keyword :name in your source, NAME will be used instead.
@@ -764,8 +764,9 @@ Arguments ARGS are keyword value pairs as defined in CLASS."
     (helm--setup-source source)
     (helm--create-source source (object-class source))))
 
-(defun helm--make-type (class &rest args)
+(defun helm-make-type (class &rest args)
   (let ((source (apply #'make-instance class args)))
+    (oset source :name nil)
     (helm--setup-source source)
     (helm--create-source source (object-class source))))
 
@@ -857,22 +858,22 @@ Arguments ARGS are keyword value pairs as defined in CLASS."
 (defmacro helm-build-sync-source (name &rest args)
   "Build a synchronous helm source with name NAME.
 Args ARGS are keywords provided by `helm-source-sync'."
-  `(helm--make-source ,name 'helm-source-sync ,@args))
+  `(helm-make-source ,name 'helm-source-sync ,@args))
 
 (defmacro helm-build-async-source (name &rest args)
   "Build a asynchronous helm source with name NAME.
 Args ARGS are keywords provided by `helm-source-async'."
-  `(helm--make-source ,name 'helm-source-async ,@args))
+  `(helm-make-source ,name 'helm-source-async ,@args))
 
 (defmacro helm-build-in-buffer-source (name &rest args)
   "Build a helm source with name NAME using `candidates-in-buffer' method.
 Args ARGS are keywords provided by `helm-source-in-buffer'."
-  `(helm--make-source ,name 'helm-source-in-buffer ,@args))
+  `(helm-make-source ,name 'helm-source-in-buffer ,@args))
 
 (defmacro helm-build-dummy-source (name &rest args)
   "Build a helm source with name NAME using `dummy' method.
 Args ARGS are keywords provided by `helm-source-dummy'."
-  `(helm--make-source ,name 'helm-source-dummy ,@args))
+  `(helm-make-source ,name 'helm-source-dummy ,@args))
 
 ;; Types
 (defun helm-actions-from-type-file ()
@@ -881,7 +882,7 @@ Args ARGS are keywords provided by `helm-source-dummy'."
     (helm-source-get-action-from-type source)))
 
 (defun helm-build-type-file ()
-  (helm--make-type 'helm-type-file))
+  (helm-make-type 'helm-type-file))
 
 (provide 'helm-source)