diff options
42 files changed, 78 insertions, 19 deletions
diff --git a/helm-adaptative.el b/helm-adaptative.el index 7f86298f..651c0259 100644 --- a/helm-adaptative.el +++ b/helm-adaptative.el @@ -241,6 +241,7 @@ candidate can be in (DISPLAY . REAL) format." (provide 'helm-adaptative) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-apt.el b/helm-apt.el index dc8b9443..aa0d29bd 100644 --- a/helm-apt.el +++ b/helm-apt.el @@ -189,6 +189,7 @@ With a prefix arg reload cache." (provide 'helm-apt) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-bbdb.el b/helm-bbdb.el index 3ad1fe40..70c11cf2 100644 --- a/helm-bbdb.el +++ b/helm-bbdb.el @@ -178,6 +178,7 @@ http://bbdb.sourceforge.net/" (provide 'helm-bbdb) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-bmkext.el b/helm-bmkext.el index 11ea8d70..5c22a054 100644 --- a/helm-bmkext.el +++ b/helm-bmkext.el @@ -301,6 +301,7 @@ Contain also `helm-c-source-google-suggest'." (provide 'helm-bmkext) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-bookmark.el b/helm-bookmark.el index 44557799..b3161a36 100644 --- a/helm-bookmark.el +++ b/helm-bookmark.el @@ -272,6 +272,7 @@ Return nil if bmk is not a valid bookmark." (provide 'helm-bookmark) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-buffers.el b/helm-buffers.el index ab6e459f..836d8300 100644 --- a/helm-buffers.el +++ b/helm-buffers.el @@ -520,6 +520,7 @@ It is an enhanced version of `helm-for-buffers'." (provide 'helm-buffers) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-call-tree.el b/helm-call-tree.el index d446ec7f..7b13dc9d 100644 --- a/helm-call-tree.el +++ b/helm-call-tree.el @@ -120,6 +120,7 @@ http://www.emacswiki.org/cgi-bin/wiki/download/simple-call-tree.el" (provide 'helm-call-tree) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-color.el b/helm-color.el index 3bfc57f1..09e53081 100644 --- a/helm-color.el +++ b/helm-color.el @@ -99,6 +99,7 @@ (provide 'helm-color) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-command.el b/helm-command.el index ed12d5ca..5d20374f 100644 --- a/helm-command.el +++ b/helm-command.el @@ -162,6 +162,7 @@ It is `helm' replacement of regular `M-x' `execute-extended-command'." (provide 'helm-command) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-config.el b/helm-config.el index c5af5e65..c94f51c7 100644 --- a/helm-config.el +++ b/helm-config.el @@ -1751,6 +1751,7 @@ http://www.emacswiki.org/emacs/download/yaoddmuse.el (provide 'helm-config) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-elisp.el b/helm-elisp.el index 7c2cd3a0..a5b97858 100644 --- a/helm-elisp.el +++ b/helm-elisp.el @@ -573,6 +573,7 @@ STRING is string to match." (provide 'helm-elisp) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-elscreen.el b/helm-elscreen.el index 7287585c..00308638 100644 --- a/helm-elscreen.el +++ b/helm-elscreen.el @@ -71,6 +71,7 @@ (provide 'helm-elscreen) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-emms.el b/helm-emms.el index d6007042..5b31f497 100644 --- a/helm-emms.el +++ b/helm-emms.el @@ -179,6 +179,7 @@ (provide 'helm-emms) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-eshell.el b/helm-eshell.el index 17ac27b8..1de14102 100644 --- a/helm-eshell.el +++ b/helm-eshell.el @@ -178,6 +178,7 @@ The function that call this should set `helm-ec-target' to thing at point." (provide 'helm-eshell) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-eval.el b/helm-eval.el index 145c9fd0..2a9b4ac6 100644 --- a/helm-eval.el +++ b/helm-eval.el @@ -172,6 +172,7 @@ Should take one arg: the string to display." (provide 'helm-eval) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-external.el b/helm-external.el index 5d4ae2f7..a1771924 100644 --- a/helm-external.el +++ b/helm-external.el @@ -207,6 +207,7 @@ You can set your own list of commands with (provide 'helm-external) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-files.el b/helm-files.el index f8541319..224b8ee2 100644 --- a/helm-files.el +++ b/helm-files.el @@ -2619,6 +2619,7 @@ Run all sources defined in `helm-for-files-preferred-list'." (provide 'helm-files) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-firefox.el b/helm-firefox.el index f9c73a3f..5b837ebd 100644 --- a/helm-firefox.el +++ b/helm-firefox.el @@ -103,6 +103,7 @@ After closing firefox, you will be able to browse you bookmarks. (provide 'helm-firefox) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-font.el b/helm-font.el index 13eb7d94..a903f3f5 100644 --- a/helm-font.el +++ b/helm-font.el @@ -165,6 +165,7 @@ Only math* symbols are collected." (provide 'helm-font) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-gentoo.el b/helm-gentoo.el index 0d334d8a..c0a247df 100644 --- a/helm-gentoo.el +++ b/helm-gentoo.el @@ -252,6 +252,7 @@ (provide 'helm-gentoo) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-grep.el b/helm-grep.el index 82f2b03a..1dafbe83 100644 --- a/helm-grep.el +++ b/helm-grep.el @@ -942,6 +942,7 @@ See also `helm-do-grep-1'." (provide 'helm-grep) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-help.el b/helm-help.el index d13858a9..ab4b7a77 100644 --- a/helm-help.el +++ b/helm-help.el @@ -974,6 +974,7 @@ i.e (history . ,'history-var).") (provide 'helm-help) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-imenu.el b/helm-imenu.el index 845c3e6e..c82270a2 100644 --- a/helm-imenu.el +++ b/helm-imenu.el @@ -106,6 +106,7 @@ (provide 'helm-imenu) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-info.el b/helm-info.el index 3318ab7d..b9f22b6b 100644 --- a/helm-info.el +++ b/helm-info.el @@ -131,6 +131,7 @@ With a prefix-arg insert symbol at point." (provide 'helm-info) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-locate.el b/helm-locate.el index 85e4d0d7..5727968f 100644 --- a/helm-locate.el +++ b/helm-locate.el @@ -256,6 +256,7 @@ Where db_path is a filename matched by (provide 'helm-locate) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-man.el b/helm-man.el index 2150dee9..553fa4a6 100644 --- a/helm-man.el +++ b/helm-man.el @@ -73,6 +73,7 @@ source.") (provide 'helm-man) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-match-plugin.el b/helm-match-plugin.el index d5d870ff..a6ad0998 100644 --- a/helm-match-plugin.el +++ b/helm-match-plugin.el @@ -409,6 +409,7 @@ e.g \"bar foo\" will match \"barfoo\" but not \"foobar\" contrarily to ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-misc.el b/helm-misc.el index 6951f2cd..528243b5 100644 --- a/helm-misc.el +++ b/helm-misc.el @@ -388,6 +388,7 @@ It is added to `extended-command-history'. (provide 'helm-misc) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-mode.el b/helm-mode.el index 31ceeb0f..c824b0c6 100644 --- a/helm-mode.el +++ b/helm-mode.el @@ -807,6 +807,7 @@ Note: This mode will work only partially on Emacs23." (provide 'helm-mode) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-net.el b/helm-net.el index 3aed37c8..2a5bb188 100644 --- a/helm-net.el +++ b/helm-net.el @@ -366,6 +366,7 @@ Return an alist with elements like (data . number_results)." (provide 'helm-net) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-org.el b/helm-org.el index b6b12e4a..ad25457b 100644 --- a/helm-org.el +++ b/helm-org.el @@ -174,6 +174,7 @@ See http://orgmode.org for the latest version.") (provide 'helm-org) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-pkg.el b/helm-pkg.el index 5d40a567..ffd03497 100644 --- a/helm-pkg.el +++ b/helm-pkg.el @@ -4,5 +4,6 @@ "Helm is an Emacs incremental and narrowing framework") ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; no-byte-compile: t ;; End: diff --git a/helm-plugin.el b/helm-plugin.el index 177fd9f5..cbb4d387 100644 --- a/helm-plugin.el +++ b/helm-plugin.el @@ -328,6 +328,7 @@ with original attribute value. (provide 'helm-plugin) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-regexp.el b/helm-regexp.el index 2912bfac..9b58ef49 100644 --- a/helm-regexp.el +++ b/helm-regexp.el @@ -299,6 +299,7 @@ otherwise search in whole buffer." (provide 'helm-regexp) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-ring.el b/helm-ring.el index 3a5fdd02..9d4a9d32 100644 --- a/helm-ring.el +++ b/helm-ring.el @@ -344,14 +344,14 @@ It is drop-in replacement of `yank-pop'. First call open the kill-ring browser, next calls move to next line." (interactive) - (let ((plist '(:sources helm-c-source-kill-ring - :buffer "*helm kill-ring*")) - (fn (if (get-buffer-window helm-buffer) #'helm-nest #'helm))) - (apply fn plist))) + (helm :sources helm-c-source-kill-ring + :buffer "*helm kill-ring*" + :allow-nest t)) (provide 'helm-ring) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-semantic.el b/helm-semantic.el index 7f898df4..ffeb7b39 100644 --- a/helm-semantic.el +++ b/helm-semantic.el @@ -99,6 +99,7 @@ Fill in the symbol at point by default." (provide 'helm-semantic) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-sys.el b/helm-sys.el index 4677d004..ec006752 100644 --- a/helm-sys.el +++ b/helm-sys.el @@ -145,6 +145,7 @@ (provide 'helm-sys) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-tags.el b/helm-tags.el index 73fe4555..54fde47b 100644 --- a/helm-tags.el +++ b/helm-tags.el @@ -252,6 +252,7 @@ If tag file have been modified reinitialize cache." (provide 'helm-tags) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-utils.el b/helm-utils.el index ffb33554..2df18398 100644 --- a/helm-utils.el +++ b/helm-utils.el @@ -819,6 +819,7 @@ the entire symbol. (provide 'helm-utils) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-w3m.el b/helm-w3m.el index 81e8eac2..effb1824 100644 --- a/helm-w3m.el +++ b/helm-w3m.el @@ -141,6 +141,7 @@ http://emacs-w3m.namazu.org/" (provide 'helm-w3m) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t diff --git a/helm-yaoddmuse.el b/helm-yaoddmuse.el index f633ce01..75e7cfc2 100644 --- a/helm-yaoddmuse.el +++ b/helm-yaoddmuse.el @@ -164,6 +164,7 @@ http://www.emacswiki.org/emacs/download/yaoddmuse.el" (provide 'helm-yaoddmuse) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t @@ -1048,11 +1048,10 @@ This is used in transformers to modify candidates list." "Main function to execute helm sources. Keywords supported: -:sources :input :prompt :resume :preselect :buffer :keymap :default :history -Extra keywords are supported and can be added, see below. +:sources :input :prompt :resume :preselect +:buffer :keymap :default :history :allow-nest -When call interactively with no arguments deprecated `helm-sources' -will be used if non--nil. +Extra keywords are supported and can be added, see below. PLIST is a list like \(:key1 val1 :key2 val2 ...\) or \(&optional sources input prompt resume @@ -1104,30 +1103,49 @@ By default all minibuffer input is pushed to `minibuffer-history', if an argument HISTORY is provided, input will be pushed to HISTORY. History element should be a symbol. +\:allow-nest + +Allow running this helm command within a running helm session. + Of course, conventional arguments are supported, the two are same. \(helm :sources sources :input input :prompt prompt :resume resume - :preselect preselect :buffer buffer :keymap keymap :default default - :history history\) + :preselect preselect :buffer buffer :keymap keymap :default default + :history history\) + +and + \(helm sources input prompt resume preselect buffer keymap default history\) +are the same. + +However the use of non keyword args is deprecated and should not be used. + Other keywords are interpreted as local variables of this helm session. The `helm-' prefix can be omitted. For example, \(helm :sources 'helm-c-source-buffers-list - :buffer \"*buffers*\" :candidate-number-limit 10\) + :buffer \"*buffers*\" :candidate-number-limit 10\) means starting helm session with `helm-c-source-buffers' source in *buffers* buffer and set variable `helm-candidate-number-limit' to 10 as session local variable." - (if (keywordp (car plist)) - (helm-let-internal - (helm-parse-keys plist) - (lambda () - (apply 'helm - (mapcar (lambda (key) (plist-get plist key)) - helm-argument-keys)))) - (apply 'helm-internal plist))) + (let ((fn (cond ((or (and helm-alive-p (plist-get plist :allow-nest)) + (and helm-alive-p (memq 'allow-nest plist))) + #'helm-nest) + ((keywordp (car plist)) + #'helm) + (t #'helm-internal)))) + (if (and helm-alive-p (eq fn #'helm)) + (error "Error: Trying to run helm within a running helm session") + (if (keywordp (car plist)) + (helm-let-internal + (helm-parse-keys plist) + (lambda () + (apply fn + (mapcar (lambda (key) (plist-get plist key)) + helm-argument-keys)))) + (apply fn plist))))) (defun helm-parse-keys (keys) "Parse the KEYS arguments of `helm'. @@ -3436,6 +3454,7 @@ How to send a bug report: (provide 'helm) ;; Local Variables: +;; byte-compile-warnings: (not cl-functions obsolete) ;; coding: utf-8 ;; indent-tabs-mode: nil ;; byte-compile-dynamic: t |