2 files changed, 36 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ecec50e930d..cc928f5c57f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-21  Leo Liu  <sdl.web@gmail.com>
+
+        Add completion for command `ag'.
+        * pcmpl-x.el (pcomplete/ag, pcmpl-x-ag-options): New functions.
+        (pcmpl-x-ag-options): New variable.
+
 2013-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/byte-run.el (eval-when-compile): Fix edebug spec
diff --git a/lisp/pcmpl-x.el b/lisp/pcmpl-x.el
index 86d8dc652c3..b52a692a291 100644
--- a/lisp/pcmpl-x.el
+++ b/lisp/pcmpl-x.el
@@ -247,5 +247,35 @@ long options."
 ;;;###autoload
 (defalias 'pcomplete/ack-grep 'pcomplete/ack)
 
+
+;;;; the_silver_search - https://github.com/ggreer/the_silver_searcher
+
+(defvar pcmpl-x-ag-options nil)
+
+(defun pcmpl-x-ag-options ()
+  (or pcmpl-x-ag-options
+      (setq pcmpl-x-ag-options
+            (with-temp-buffer
+              (when (zerop (call-process "ag" nil t nil "--help"))
+                (let (so lo)
+                  (goto-char (point-min))
+                  (while (re-search-forward "^ +\\(-[a-zA-Z]\\) " nil t)
+                    (push (match-string 1) so))
+                  (goto-char (point-min))
+                  (while (re-search-forward
+                          "^ +\\(?:-[a-zA-Z] \\)?\\(--[^ \t\n]+\\) " nil t)
+                    (push (match-string 1) lo))
+                  (list (cons 'short (nreverse so))
+                        (cons 'long  (nreverse lo)))))))))
+
+;;;###autoload
+(defun pcomplete/ag ()
+  "Completion for the `ag' command."
+  (while t
+    (if (pcomplete-match "^-" 0)
+        (pcomplete-here* (cdr (assq (if (pcomplete-match "^--" 0) 'long 'short)
+                                    (pcmpl-x-ag-options))))
+      (pcomplete-here* (pcomplete-dirs-or-entries)))))
+
 (provide 'pcmpl-x)
 ;;; pcmpl-x.el ends here