[elpa] master updated (3be3486 -> 88e11d2)

[Jo�o T�vora]

capitaomorte pushed a change to branch master.

  from  3be3486   * externals-list: Add pspp-mode
   new  a53e021   * ack.el (ack-quickgrep-defaults): Auto-confirm iff 
symbol at point
   new  35c1152   Don't auto-confirm M-x ack if no symbol actually yanked
   new  eb0217d   Add quotes around pattern of all ack commands
   new  d813aae   Add "rg" as an option for ack-command
   new  f8cc007   README.rst: Rewrite a bit
   new  b2c449c   Release 1.1.0 and make ack-quickgrep-defaults the default
   new  88e11d2   Merge commit 'b2c449c0d5aad679857e7fd7710f985084ec'


Summary of changes:
 packages/ack/README.rst | 33 ++---
 packages/ack/ack.el | 38 --
 2 files changed, 42 insertions(+), 29 deletions(-)

[elpa] master 88e11d2 7/7: Merge commit 'b2c449c0d5aad67eeee9857e7fd7710f985084ec'

[Jo�o T�vora]

branch: master
commit 88e11d2b1813328aac6e09a1778f648e74eac9e3
Merge: 3be3486 b2c449c
Author: João Távora 
Commit: João Távora 

Merge commit 'b2c449c0d5aad679857e7fd7710f985084ec'
---
 packages/ack/README.rst | 33 ++---
 packages/ack/ack.el | 38 --
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/packages/ack/README.rst b/packages/ack/README.rst
index 5caa477..c0a0ba0 100644
--- a/packages/ack/README.rst
+++ b/packages/ack/README.rst
@@ -1,26 +1,29 @@
 ==
- Emacs Interface to `Ack `_-like Tools
+ The Simple Emacs Interface to `Ack `_-like Tools
 ==
  
-This package brings the full power of `ack `_
-to `emacs `_ by allowing you to run
-it seamlessly with its large set of options. Ack-like tools such as
-`the silver searcher `_
-and ``git/hg/bzr grep`` are well supported too.
+This package integrates `ack `_ and its large
+set of options with `emacs `_.  The
+resulting ``*ack*`` buffer is just like vanilla ``*grep*`` buffer but
+the results come from your tool of choice.
+
+Ack-like tools such as `the silver searcher (ag)
+`_, `ripgrep (rg)
+`_ are well supported, as are
+``git grep``, ``hg grep``.
+
+The program guesses good defaults, but lets you give ``C-u`` to
+customize directory to search in, as well as the give special commands
+and switches.
+
+Just ``M-x ack`` or do something like ``(global-set-key (kbd "C-c
+C-g") 'ack)``.
 
 It is part of `GNU ELPA `_ - the official package
 archive for `emacs `_. Patches,
 feature requests and bug reports are welcome.
 
-Features
-
-
-- Keep all features of `ack `_ and more
-- Handle colors using the standard library ``ansi-color.el``
-- Completion for ack options while reading from the minibuffer
-- Support `the silver search (ag)
-  `_
-- Support ``git grep``, ``hg grep`` and ``bzr grep``
+Colors are handled using the standard library ``ansi-color.el``
 
 Install
 ---
diff --git a/packages/ack/ack.el b/packages/ack/ack.el
index 40c068d..6d8a651 100644
--- a/packages/ack/ack.el
+++ b/packages/ack/ack.el
@@ -4,7 +4,7 @@
 
 ;; Author: Leo Liu 
 ;; Maintainer: João Távora 
-;; Version: 1.8
+;; Version: 1.10
 ;; Keywords: tools, processes, convenience
 ;; Created: 2012-03-24
 ;; URL: https://github.com/leoliu/ack-el
@@ -82,6 +82,7 @@
 (require 'compile)
 (require 'pcase)
 (require 'ansi-color)
+(require 'thingatpt)
 (autoload 'shell-completion-vars "shell")
 
 (eval-when-compile
@@ -102,10 +103,14 @@
 
 (defcustom ack-command
   ;; Note: on GNU/Linux ack may be renamed to ack-grep
-  (concat (file-name-nondirectory (or (executable-find "ack-grep")
-  (executable-find "ack")
-  (executable-find "ag")
-  "ack")) " ")
+  (concat (file-name-nondirectory (or
+   (executable-find "ack-grep")
+   (executable-find "ack")
+   (executable-find "ag")
+   (concat
+(executable-find "rg")
+" -n -H -S --no-heading --color always -e")
+   "ack")) " ")
   "The default command for \\[ack].
 
 Note also options to ack can be specified in ACK_OPTIONS
@@ -139,7 +144,7 @@ Each element is of the form (VC_DIR . CMD)."
 (define-obsolete-function-alias 'ack-default-directory
   'ack-legacy-defaults "1.7")
 
-(defcustom ack-defaults-function 'ack-legacy-defaults
+(defcustom ack-defaults-function 'ack-quickgrep-defaults
   "A function to return a default parametrization for `ack'.
 It is called with one arg, the prefix arg to `ack'.  It may
 return a single element, a string, which is the directory under
@@ -313,9 +318,12 @@ This gets tacked on the end of the generated expressions.")
   (interactive)
   (delete-minibuffer-contents)
   (let ((ack (or (car (split-string ack-command nil t)) "ack")))
-(if (equal ack "ag")
-(skeleton-insert `(nil ,ack " -ig '" _ "'"))
-  (skeleton-insert `(nil ,ack " -g '(?i:" _ ")'")
+(cond ((equal ack "ag")
+   (skeleton-insert `(nil ,ack " -ig '" _ "'")))
+  ((equal ack "rg")
+   (skeleton-insert
+`(nil ,ack " --color always --files --iglob '*" _ "*'")))
+  (t (skeleton-insert `(nil ,ack " -g '(?i:" _ ")'"))
 
 ;; Work around 

[elpa] master eb0217d 3/7: Add quotes around pattern of all ack commands

[Jo�o T�vora]

branch: master
commit eb0217df76395593a9dd2446c5a3d0628fa94c0f
Author: Simon Lang 
Commit: João Távora 

Add quotes around pattern of all ack commands

* ack.el (ack): added quotes to pattern.
---
 ack.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ack.el b/ack.el
index 6a8a382..f44ab8f 100644
--- a/ack.el
+++ b/ack.el
@@ -503,7 +503,8 @@ minibuffer:
  (list (minibuffer-with-setup-hook 'ack-minibuffer-setup-function
  (catch 'ack--auto-confirm
(read-from-minibuffer "Ack: "
- ack-command
+`(,(concat ack-command "''")
+  . ,(+ (length ack-command) 2))
  ack-minibuffer-local-map
  nil 'ack-history)))
ack--project-root)))

[elpa] master 35c1152 2/7: Don't auto-confirm M-x ack if no symbol actually yanked

[Jo�o T�vora]

branch: master
commit 35c115204ca999816a07768ef29bfecf245fdea7
Author: João Távora 
Commit: João Távora 

Don't auto-confirm M-x ack if no symbol actually yanked

* ack.el (Version): Bump to 1.9
(ack--auto-confirm): Only auto-confirm if symbol was
actually yanked.
---
 ack.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ack.el b/ack.el
index f52e9b3..6a8a382 100644
--- a/ack.el
+++ b/ack.el
@@ -4,7 +4,7 @@
 
 ;; Author: Leo Liu 
 ;; Maintainer: João Távora 
-;; Version: 1.8
+;; Version: 1.9
 ;; Keywords: tools, processes, convenience
 ;; Created: 2012-03-24
 ;; URL: https://github.com/leoliu/ack-el
@@ -468,9 +468,10 @@ automatically attempted."
   (run-hooks 'ack-minibuffer-setup-hook))
 
 (defun ack--auto-confirm ()
-  (throw 'ack--auto-confirm
- (buffer-substring-no-properties
-  (minibuffer-prompt-end) (point-max
+  (when ack--yanked-symbol
+(throw 'ack--auto-confirm
+   (buffer-substring-no-properties
+(minibuffer-prompt-end) (point-max)
 
 ;;;###autoload
 (defun ack (command-args  directory)

[elpa] master f8cc007 5/7: README.rst: Rewrite a bit

[Jo�o T�vora]

branch: master
commit f8cc007ca6fb8cb2c3ff3b7f71d9ddff2fb8f639
Author: João Távora 
Commit: João Távora 

README.rst: Rewrite a bit
---
 README.rst | 33 ++---
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/README.rst b/README.rst
index 5caa477..c0a0ba0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,26 +1,29 @@
 ==
- Emacs Interface to `Ack `_-like Tools
+ The Simple Emacs Interface to `Ack `_-like Tools
 ==
  
-This package brings the full power of `ack `_
-to `emacs `_ by allowing you to run
-it seamlessly with its large set of options. Ack-like tools such as
-`the silver searcher `_
-and ``git/hg/bzr grep`` are well supported too.
+This package integrates `ack `_ and its large
+set of options with `emacs `_.  The
+resulting ``*ack*`` buffer is just like vanilla ``*grep*`` buffer but
+the results come from your tool of choice.
+
+Ack-like tools such as `the silver searcher (ag)
+`_, `ripgrep (rg)
+`_ are well supported, as are
+``git grep``, ``hg grep``.
+
+The program guesses good defaults, but lets you give ``C-u`` to
+customize directory to search in, as well as the give special commands
+and switches.
+
+Just ``M-x ack`` or do something like ``(global-set-key (kbd "C-c
+C-g") 'ack)``.
 
 It is part of `GNU ELPA `_ - the official package
 archive for `emacs `_. Patches,
 feature requests and bug reports are welcome.
 
-Features
-
-
-- Keep all features of `ack `_ and more
-- Handle colors using the standard library ``ansi-color.el``
-- Completion for ack options while reading from the minibuffer
-- Support `the silver search (ag)
-  `_
-- Support ``git grep``, ``hg grep`` and ``bzr grep``
+Colors are handled using the standard library ``ansi-color.el``
 
 Install
 ---

[elpa] master d813aae 4/7: Add "rg" as an option for ack-command

[Jo�o T�vora]

branch: master
commit d813aaef5e357c67f17ea9f990774e6fe3f1a418
Author: Waah 
Commit: João Távora 

Add "rg" as an option for ack-command

Copyright-paperwork-exempt: yes

* ack.el (ack-command): Add rg.
(ack-skel-file): Consider rg.
---
 ack.el | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ack.el b/ack.el
index f44ab8f..10fb97b 100644
--- a/ack.el
+++ b/ack.el
@@ -103,10 +103,14 @@
 
 (defcustom ack-command
   ;; Note: on GNU/Linux ack may be renamed to ack-grep
-  (concat (file-name-nondirectory (or (executable-find "ack-grep")
-  (executable-find "ack")
-  (executable-find "ag")
-  "ack")) " ")
+  (concat (file-name-nondirectory (or
+   (executable-find "ack-grep")
+   (executable-find "ack")
+   (executable-find "ag")
+   (concat
+(executable-find "rg")
+" -n -H -S --no-heading --color always -e")
+   "ack")) " ")
   "The default command for \\[ack].
 
 Note also options to ack can be specified in ACK_OPTIONS
@@ -314,9 +318,12 @@ This gets tacked on the end of the generated expressions.")
   (interactive)
   (delete-minibuffer-contents)
   (let ((ack (or (car (split-string ack-command nil t)) "ack")))
-(if (equal ack "ag")
-(skeleton-insert `(nil ,ack " -ig '" _ "'"))
-  (skeleton-insert `(nil ,ack " -g '(?i:" _ ")'")
+(cond ((equal ack "ag")
+   (skeleton-insert `(nil ,ack " -ig '" _ "'")))
+  ((equal ack "rg")
+   (skeleton-insert
+`(nil ,ack " --color always --files --iglob '*" _ "*'")))
+  (t (skeleton-insert `(nil ,ack " -g '(?i:" _ ")'"))
 
 ;; Work around bug http://debbugs.gnu.org/13811
 (defvar ack--project-root nil)  ; dynamically bound in `ack'

[elpa] master a53e021 1/7: * ack.el (ack-quickgrep-defaults): Auto-confirm iff symbol at point

[Jo�o T�vora]

branch: master
commit a53e02161dba5d52b66d4f9b27b27dfd21b7f312
Author: João Távora 
Commit: João Távora 

* ack.el (ack-quickgrep-defaults): Auto-confirm iff symbol at point
---
 ack.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ack.el b/ack.el
index 40c068d..f52e9b3 100644
--- a/ack.el
+++ b/ack.el
@@ -82,6 +82,7 @@
 (require 'compile)
 (require 'pcase)
 (require 'ansi-color)
+(require 'thingatpt)
 (autoload 'shell-completion-vars "shell")
 
 (eval-when-compile
@@ -437,7 +438,7 @@ automatically attempted."
 (append (list (if (> numeric 4)
   (read-directory-name "In directory: " nil nil t)
 (ack-guess-project-root default-directory))
-  (= numeric 1))
+  (and (thing-at-point 'symbol) (= numeric 1)))
 (if (> numeric 4)
 (list 'ack-yank-symbol-at-point)
   (list 'ack-skel-vc-grep 'ack-yank-symbol-at-point)

[elpa] externals/pspp-mode f087280: * pspp-mode.el: Simplify pspp--updown-list

[Mattias Engdeg�rd]

branch: externals/pspp-mode
commit f0872801dab7b5bedb1fe71252ebc59864a87e8c
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

* pspp-mode.el: Simplify pspp--updown-list

(pspp--updown-list): Use mapcar instead of recursion.
(pspp--downcase-list, pspp--upcase-list): Remove.
---
 pspp-mode.el | 16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pspp-mode.el b/pspp-mode.el
index 401d517..74ff594 100644
--- a/pspp-mode.el
+++ b/pspp-mode.el
@@ -60,24 +60,10 @@
   "Size of indent.")
 
 
-(defun pspp--downcase-list (l)
-  "Takes a list of strings and returns that list with all elements downcased"
-  (if l
-  (cons (downcase (car l)) (pspp--downcase-list (cdr l)))
-nil))
-
-
-(defun pspp--upcase-list (l)
-  "Takes a list of strings and returns that list with all elements upcased"
-  (if l
-  (cons (upcase (car l)) (pspp--upcase-list (cdr l)))
-nil))
-
-
 (defun pspp--updown-list (l)
   "Takes a list of strings and returns that list with all elements upcased
 and downcased"
-  (append (pspp--upcase-list l) (pspp--downcase-list l)))
+  (append (mapcar #'upcase l) (mapcar #'downcase l)))
 
 
 (defconst pspp-indenters