From 802b4584ed975f90ecdfab0416615235ca3b64e4 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Fri, 23 Sep 2016 13:52:39 +0200 Subject: [PATCH] Update packages --- .../helm-core-autoloads.el | 4 ++-- .../helm-core-pkg.el | 2 +- .../helm-lib.el | 0 .../helm-multi-match.el | 0 .../helm-source.el | 0 .../helm.el | 17 ++++++++------ .../helm-projectile-pkg.el | 1 - .../helm-projectile-autoloads.el | 4 ++-- .../helm-projectile-pkg.el | 1 + .../helm-projectile.el | 23 +++++++++++-------- elpa/s-20160711.525/s-pkg.el | 1 - .../s-autoloads.el | 2 +- elpa/s-20160922.443/s-pkg.el | 1 + elpa/{s-20160711.525 => s-20160922.443}/s.el | 6 ++++- 14 files changed, 37 insertions(+), 25 deletions(-) rename elpa/{helm-core-20160913.219 => helm-core-20160922.2327}/helm-core-autoloads.el (98%) rename elpa/{helm-core-20160913.219 => helm-core-20160922.2327}/helm-core-pkg.el (64%) rename elpa/{helm-core-20160913.219 => helm-core-20160922.2327}/helm-lib.el (100%) rename elpa/{helm-core-20160913.219 => helm-core-20160922.2327}/helm-multi-match.el (100%) rename elpa/{helm-core-20160913.219 => helm-core-20160922.2327}/helm-source.el (100%) rename elpa/{helm-core-20160913.219 => helm-core-20160922.2327}/helm.el (99%) delete mode 100644 elpa/helm-projectile-20160902.2236/helm-projectile-pkg.el rename elpa/{helm-projectile-20160902.2236 => helm-projectile-20160922.4}/helm-projectile-autoloads.el (98%) create mode 100644 elpa/helm-projectile-20160922.4/helm-projectile-pkg.el rename elpa/{helm-projectile-20160902.2236 => helm-projectile-20160922.4}/helm-projectile.el (98%) delete mode 100644 elpa/s-20160711.525/s-pkg.el rename elpa/{s-20160711.525 => s-20160922.443}/s-autoloads.el (81%) create mode 100644 elpa/s-20160922.443/s-pkg.el rename elpa/{s-20160711.525 => s-20160922.443}/s.el (99%) diff --git a/elpa/helm-core-20160913.219/helm-core-autoloads.el b/elpa/helm-core-20160922.2327/helm-core-autoloads.el similarity index 98% rename from elpa/helm-core-20160913.219/helm-core-autoloads.el rename to elpa/helm-core-20160922.2327/helm-core-autoloads.el index 948a69c..aa1a4ea 100644 --- a/elpa/helm-core-20160913.219/helm-core-autoloads.el +++ b/elpa/helm-core-20160922.2327/helm-core-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "helm" "helm.el" (22490 24934 255411 690000)) +;;;### (autoloads nil "helm" "helm.el" (22501 3218 180164 860000)) ;;; Generated autoloads from helm.el (autoload 'helm-define-multi-key "helm" "\ @@ -188,7 +188,7 @@ Enable/disable helm debugging from outside of helm session. ;;;*** ;;;### (autoloads nil nil ("helm-core-pkg.el" "helm-lib.el" "helm-multi-match.el" -;;;;;; "helm-source.el") (22490 24934 280627 285000)) +;;;;;; "helm-source.el") (22501 3218 218183 514000)) ;;;*** diff --git a/elpa/helm-core-20160913.219/helm-core-pkg.el b/elpa/helm-core-20160922.2327/helm-core-pkg.el similarity index 64% rename from elpa/helm-core-20160913.219/helm-core-pkg.el rename to elpa/helm-core-20160922.2327/helm-core-pkg.el index 3d9946d..af21da2 100644 --- a/elpa/helm-core-20160913.219/helm-core-pkg.el +++ b/elpa/helm-core-20160922.2327/helm-core-pkg.el @@ -1,4 +1,4 @@ -(define-package "helm-core" "20160913.219" "Development files for Helm" +(define-package "helm-core" "20160922.2327" "Development files for Helm" '((emacs "24.4") (async "1.9")) :url "https://emacs-helm.github.io/helm/") diff --git a/elpa/helm-core-20160913.219/helm-lib.el b/elpa/helm-core-20160922.2327/helm-lib.el similarity index 100% rename from elpa/helm-core-20160913.219/helm-lib.el rename to elpa/helm-core-20160922.2327/helm-lib.el diff --git a/elpa/helm-core-20160913.219/helm-multi-match.el b/elpa/helm-core-20160922.2327/helm-multi-match.el similarity index 100% rename from elpa/helm-core-20160913.219/helm-multi-match.el rename to elpa/helm-core-20160922.2327/helm-multi-match.el diff --git a/elpa/helm-core-20160913.219/helm-source.el b/elpa/helm-core-20160922.2327/helm-source.el similarity index 100% rename from elpa/helm-core-20160913.219/helm-source.el rename to elpa/helm-core-20160922.2327/helm-source.el diff --git a/elpa/helm-core-20160913.219/helm.el b/elpa/helm-core-20160922.2327/helm.el similarity index 99% rename from elpa/helm-core-20160913.219/helm.el rename to elpa/helm-core-20160922.2327/helm.el index aa64094..f5968cb 100644 --- a/elpa/helm-core-20160913.219/helm.el +++ b/elpa/helm-core-20160922.2327/helm.el @@ -2740,14 +2740,17 @@ Cache the candidates if there is no cached value yet." candidates)) (defmacro helm--maybe-process-filter-one-by-one-candidate (candidate source) - "Execute `filter-one-by-one' function(s) on CANDIDATE in SOURCE." + "Execute `filter-one-by-one' function(s) on real value of CANDIDATE in SOURCE." `(helm-aif (assoc-default 'filter-one-by-one ,source) - (if (and (listp it) - (not (functionp it))) ;; Don't treat lambda's as list. - (cl-loop for f in it - do (setq ,candidate (funcall f ,candidate)) - finally return ,candidate) - (setq ,candidate (funcall it ,candidate))) + (let ((real (if (consp ,candidate) + (cdr ,candidate) + ,candidate))) + (if (and (listp it) + (not (functionp it))) ;; Don't treat lambda's as list. + (cl-loop for f in it + do (setq ,candidate (funcall f real)) + finally return ,candidate) + (setq ,candidate (funcall it real)))) ,candidate)) (defun helm--initialize-one-by-one-candidates (candidates source) diff --git a/elpa/helm-projectile-20160902.2236/helm-projectile-pkg.el b/elpa/helm-projectile-20160902.2236/helm-projectile-pkg.el deleted file mode 100644 index dcdb9d4..0000000 --- a/elpa/helm-projectile-20160902.2236/helm-projectile-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "helm-projectile" "20160902.2236" "Helm integration for Projectile" '((helm "1.7.7") (projectile "0.14.0") (cl-lib "0.3")) :url "https://github.com/bbatsov/helm-projectile" :keywords '("project" "convenience")) diff --git a/elpa/helm-projectile-20160902.2236/helm-projectile-autoloads.el b/elpa/helm-projectile-20160922.4/helm-projectile-autoloads.el similarity index 98% rename from elpa/helm-projectile-20160902.2236/helm-projectile-autoloads.el rename to elpa/helm-projectile-20160922.4/helm-projectile-autoloads.el index d381090..582b251 100644 --- a/elpa/helm-projectile-20160902.2236/helm-projectile-autoloads.el +++ b/elpa/helm-projectile-20160922.4/helm-projectile-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "helm-projectile" "helm-projectile.el" (22490 -;;;;;; 46093 331336 211000)) +;;;### (autoloads nil "helm-projectile" "helm-projectile.el" (22501 +;;;;;; 3214 979961 347000)) ;;; Generated autoloads from helm-projectile.el (defvar helm-projectile-fuzzy-match t "\ diff --git a/elpa/helm-projectile-20160922.4/helm-projectile-pkg.el b/elpa/helm-projectile-20160922.4/helm-projectile-pkg.el new file mode 100644 index 0000000..1ec4c3d --- /dev/null +++ b/elpa/helm-projectile-20160922.4/helm-projectile-pkg.el @@ -0,0 +1 @@ +(define-package "helm-projectile" "20160922.4" "Helm integration for Projectile" '((helm "1.7.7") (projectile "0.14.0") (cl-lib "0.3")) :url "https://github.com/bbatsov/helm-projectile" :keywords '("project" "convenience")) diff --git a/elpa/helm-projectile-20160902.2236/helm-projectile.el b/elpa/helm-projectile-20160922.4/helm-projectile.el similarity index 98% rename from elpa/helm-projectile-20160902.2236/helm-projectile.el rename to elpa/helm-projectile-20160922.4/helm-projectile.el index 1b574b7..31a65e0 100644 --- a/elpa/helm-projectile-20160902.2236/helm-projectile.el +++ b/elpa/helm-projectile-20160922.4/helm-projectile.el @@ -4,7 +4,7 @@ ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/helm-projectile -;; Package-Version: 20160902.2236 +;; Package-Version: 20160922.4 ;; Created: 2011-31-07 ;; Keywords: project, convenience ;; Version: 0.14.0 @@ -658,6 +658,18 @@ Other file extensions can be customized with the variable `projectile-other-file :prompt (projectile-prepend-project-name "Find other file: "))))) (error "No other file found")))) +(defcustom helm-projectile-grep-or-ack-actions + '("Find file" helm-grep-action + "Find file other frame" helm-grep-other-frame + (lambda () (and (locate-library "elscreen") + "Find file in Elscreen")) + helm-grep-jump-elscreen + "Save results in grep buffer" helm-grep-save-results + "Find file other window" helm-grep-other-window) + "Available actions for `helm-projectile-grep-or-ack'. +The contents of this list are passed as the arguments to `helm-make-actions'." + :group 'helm-projectile) + (defun helm-projectile-grep-or-ack (&optional dir use-ack-p ack-ignored-pattern ack-executable) "Perform helm-grep at project root. DIR directory where to search @@ -698,14 +710,7 @@ If it is nil, or ack/ack-grep not found then use default grep command." ;; to make it available in further resuming. :keymap helm-grep-map :history 'helm-grep-history - :action (helm-make-actions - "Find file" 'helm-grep-action - "Find file other frame" 'helm-grep-other-frame - (lambda () (and (locate-library "elscreen") - "Find file in Elscreen")) - 'helm-grep-jump-elscreen - "Save results in grep buffer" 'helm-grep-save-results - "Find file other window" 'helm-grep-other-window) + :action (apply #'helm-make-actions helm-projectile-grep-or-ack-actions) :persistent-action 'helm-grep-persistent-action :persistent-help "Jump to line (`C-u' Record in mark ring)" :requires-pattern 2)) diff --git a/elpa/s-20160711.525/s-pkg.el b/elpa/s-20160711.525/s-pkg.el deleted file mode 100644 index 25f48d7..0000000 --- a/elpa/s-20160711.525/s-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "s" "20160711.525" "The long lost Emacs string manipulation library." 'nil :keywords '("strings")) diff --git a/elpa/s-20160711.525/s-autoloads.el b/elpa/s-20160922.443/s-autoloads.el similarity index 81% rename from elpa/s-20160711.525/s-autoloads.el rename to elpa/s-20160922.443/s-autoloads.el index 425571d..764aba4 100644 --- a/elpa/s-20160711.525/s-autoloads.el +++ b/elpa/s-20160922.443/s-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil nil ("s.el") (22404 60193 104225 718000)) +;;;### (autoloads nil nil ("s.el") (22501 3213 968694 183000)) ;;;*** diff --git a/elpa/s-20160922.443/s-pkg.el b/elpa/s-20160922.443/s-pkg.el new file mode 100644 index 0000000..806d229 --- /dev/null +++ b/elpa/s-20160922.443/s-pkg.el @@ -0,0 +1 @@ +(define-package "s" "20160922.443" "The long lost Emacs string manipulation library." 'nil :keywords '("strings")) diff --git a/elpa/s-20160711.525/s.el b/elpa/s-20160922.443/s.el similarity index 99% rename from elpa/s-20160711.525/s.el rename to elpa/s-20160922.443/s.el index 5b6c6d7..7c586cd 100644 --- a/elpa/s-20160711.525/s.el +++ b/elpa/s-20160922.443/s.el @@ -4,7 +4,7 @@ ;; Author: Magnar Sveen ;; Version: 1.10.0 -;; Package-Version: 20160711.525 +;; Package-Version: 20160922.443 ;; Keywords: strings ;; This program is free software; you can redistribute it and/or modify @@ -293,6 +293,10 @@ This is a simple wrapper around the built-in `string-match-p'." "Is S nil or the empty string?" (or (null s) (string= "" s))) +(defun s-blank-str? (s) + "Is S nil or the empty string or string only contains whitespace?" + (or (s-blank? s) (s-blank? (s-trim s)))) + (defun s-present? (s) "Is S anything but nil or the empty string?" (not (s-blank? s)))