[ELPA-diffs] ELPA branch, master, updated. 3aaa9f3043c962c5b2a2473e86fec23cf0d01c20

[Stefan Monnier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ELPA".

The branch, master has been updated
       via  3aaa9f3043c962c5b2a2473e86fec23cf0d01c20 (commit)
       via  0fa6f89f0be5805bf1502b5c2359a1b3122d3d11 (commit)
       via  a2d12bc48f8fb8b281dcca38639e1397494ec63b (commit)
      from  7a47daeb4e9c229c332bf6d270576726b9188367 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3aaa9f3043c962c5b2a2473e86fec23cf0d01c20
Merge: 7a47dae 0fa6f89
Author: Stefan Monnier <address@hidden>
Date:   Wed Aug 21 15:03:39 2013 -0400

    Sync from ack/master


commit 0fa6f89f0be5805bf1502b5c2359a1b3122d3d11
Author: Leo Liu <address@hidden>
Date:   Sat Jun 8 12:44:14 2013 +0800

    Small tweak to last change

diff --git a/ack.el b/ack.el
index 3e95706..41b6d22 100644
--- a/ack.el
+++ b/ack.el
@@ -215,7 +215,7 @@ This gets tacked on the end of the generated expressions.")
     ;; 'Ack started at Thu Jun 6 12:27:53'.
     
("^\\(.+?\\)\\(:\\|-\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)\\|[^0-9\n]\\|[0-9][^0-9\n]\\|...\\)"
      1 3 (ack--column-start . ack--column-end)
-     nil nil (4 compilation-column-face nil t))
+     nil 1 (4 compilation-column-face nil t))
     ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))
   "Ack version of `compilation-error-regexp-alist' (which see).")
 

commit a2d12bc48f8fb8b281dcca38639e1397494ec63b
Author: Leo Liu <address@hidden>
Date:   Thu Jun 6 12:30:33 2013 +0800

    Tweak ack-mode-font-lock-keywords and error regexps

diff --git a/ack.el b/ack.el
index 01529d7..3e95706 100644
--- a/ack.el
+++ b/ack.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012-2013  Free Software Foundation, Inc.
 
 ;; Author: Leo Liu <address@hidden>
-;; Version: 1.01
+;; Version: 1.3
 ;; Keywords: tools, processes, convenience
 ;; Created: 2012-03-24
 ;; URL: https://github.com/leoliu/ack-el
@@ -156,11 +156,7 @@ This function is called from `compilation-filter-hook'."
     ;; Command output lines.
     (": \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or 
directory\\|device or address\\)\\)$"
      1 'compilation-error)
-    ;; Remove match from ack-error-regexp-alist before fontifying
-    ("^Ack \\(?:started\\|finished\\) at.*"
-     (0 '(face nil compilation-message nil message nil help-echo nil 
mouse-face nil) t))
     ("^Ack \\(exited 
abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code 
\\([0-9]+\\)\\)?.*"
-     (0 '(face nil compilation-message nil message nil help-echo nil 
mouse-face nil) t)
      (1 'compilation-error)
      (2 'compilation-error nil t)))
   "Additional things to highlight in ack output.
@@ -211,12 +207,13 @@ This gets tacked on the end of the generated 
expressions.")
 ;;; in the regexp alist has already been applied in a region.
 
 (defconst ack-error-regexp-alist
-  `(;; grouping line (--group or --heading)
+  `(;; Grouping line (--group or --heading).
     ("^\\([1-9][0-9]*\\)\\(:\\|-\\)\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)?"
      ack--file 1 (ack--column-start . ack--column-end)
      nil nil (4 compilation-column-face nil t))
-    ;; none grouping line (--nogroup or --noheading)
-    
("^\\(.+?\\)\\(:\\|-\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)?"
+    ;; None grouping line (--nogroup or --noheading). Avoid matching
+    ;; 'Ack started at Thu Jun 6 12:27:53'.
+    
("^\\(.+?\\)\\(:\\|-\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)\\|[^0-9\n]\\|[0-9][^0-9\n]\\|...\\)"
      1 3 (ack--column-start . ack--column-end)
      nil nil (4 compilation-column-face nil t))
     ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))

-----------------------------------------------------------------------

Summary of changes:
 packages/ack/ack.el |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
ELPA