[ELPA-diffs] ELPA branch, master, updated. 3aaa9f3043c962c5b2a2473e86fec23cf0d01c20
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 monn...@iro.umontreal.ca Date: Wed Aug 21 15:03:39 2013 -0400 Sync from ack/master commit 0fa6f89f0be5805bf1502b5c2359a1b3122d3d11 Author: Leo Liu sdl@gmail.com 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 sdl@gmail.com 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 sdl@gmail.com -;; 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
[ELPA-diffs] ELPA branch, master, updated. 7ee028f7e9bb11a80501ed23714cd4aeb7116756
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 7ee028f7e9bb11a80501ed23714cd4aeb7116756 (commit) via b9e64ec07adfd8afbaf3fbc6d89a069b012f7ad2 (commit) via 85d0fa41222af8413daf4bd2c54d64c8abc2a2f6 (commit) via fac24aa671caabe804a85f00f2030c3b56bec722 (commit) via 5726e141d1c2a5c9993cb05561d8358ae7246e30 (commit) via 66e9b043b82dc18bf66399812af573375b058cd8 (commit) via b9840a3cd477063193ab89dd807acffb3b2df171 (commit) via 15a5062a17805a8d3a7a6b31ce3f3f805ad9b724 (commit) via f23e059ac1dbc663aa03b764bbdbce6b4e8e9cbc (commit) via 35e64f3ae391715d9344265c7afc0ac798239f85 (commit) via 7c76330fceee2b6901e61ce3bedb5b76b253d828 (commit) via 5ad905a6aaf79c4f2a0018cd954e1414e542fff4 (commit) via f6e5180bb1ac5c873885149325e1c63202a26f45 (commit) from d4a3c58f4a518fd11d3d6846d8be14104ee4eeab (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 7ee028f7e9bb11a80501ed23714cd4aeb7116756 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed Aug 21 15:38:05 2013 -0400 * packages/company/company-cmake.el: Fix up copyright. Require CL. * packages/company/company-template.el (company-template--buffer-templates): Declare before first use. * packages/company/company-eclim.el (json-array-type): Declare json-array-type. (company-eclim--candidates): Remove unused var `project-name'. diff --git a/packages/company/company-cmake.el b/packages/company/company-cmake.el index 0c96eb6..34359dc 100644 --- a/packages/company/company-cmake.el +++ b/packages/company/company-cmake.el @@ -1,24 +1,22 @@ ;;; company-cmake.el --- company-mode completion back-end for CMake -;; Copyright (C) 2013 Chen Bin +;; Copyright (C) 2013 Free Software Foundation, Inc. ;; Author: Chen Bin chenbin DOT sh AT gmail ;; Version: 0.1 -;; This file is NOT part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify +;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; GNU Emacs is distributed in the hope that it will be useful, +;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see http://www.gnu.org/licenses/. +;; along with this program. If not, see http://www.gnu.org/licenses/. ;;; Commentary: ;; @@ -26,6 +24,8 @@ ;; commands used by CMake. And their descriptions. ;;; Code: + +(eval-when-compile (require 'cl)) (require 'company) (defgroup company-cmake nil diff --git a/packages/company/company-eclim.el b/packages/company/company-eclim.el index 05e609c..70db7c3 100644 --- a/packages/company/company-eclim.el +++ b/packages/company/company-eclim.el @@ -70,6 +70,7 @@ eclim can only complete correctly when the buffer has been saved. (make-variable-buffer-local 'company-eclim--doc) (declare-function json-read json) +(defvar json-array-type) (defun company-eclim--call-process (rest args) (let ((coding-system-for-read 'utf-8) @@ -109,8 +110,7 @@ eclim can only complete correctly when the buffer has been saved. (defun company-eclim--candidates (prefix) (interactive d) (let ((project-file (file-relative-name buffer-file-name - (company-eclim--project-dir))) -(project-name (company-eclim--project-name))) + (company-eclim--project-dir (when company-eclim-auto-save (when (buffer-modified-p) (basic-save-buffer)) diff --git a/packages/company/company-template.el b/packages/company/company-template.el index 5c72ac8..ea1db86 100644 --- a/packages/company/company-template.el +++ b/packages/company/company-template.el @@ -1,6 +1,6 @@ ;;; company-template.el -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009, 2010, 2013 Free Software Foundation, Inc. ;; Author: Nikolaj Schumacher @@ -34,6 +34,9 @@ (define-key keymap [tab] 'company-template-forward-field) keymap)) +(defvar company-template--buffer-templates nil) +(make-variable-buffer-local 'company-template--buffer-templates) + ;; interactive
[ELPA-diffs] ELPA branch, master, updated. fcca4e12b3376d19c55d3290fd976ab342faa238
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 fcca4e12b3376d19c55d3290fd976ab342faa238 (commit)
via 26d31f98bb529d036b7235de89c2af2a21a8da48 (commit)
via 4a05529a6d9721805732538db8c41790dd96d7a0 (commit)
via f1409ce5e97e6a0391cc2efe7ba257ec76113930 (commit)
via c4cc459f97ea70ab3fb4a1a89dd16964c931f275 (commit)
via 0baa24510c48e21e014cd252f5ca724d6386434f (commit)
via 7b801add8ae0da34a78960739be36aab703867b7 (commit)
via b32c985e677a5408476333481c2a2bedd4856b6a (commit)
via b5ad48df54975e3857b150456bb8b313be899da1 (commit)
from 7ee028f7e9bb11a80501ed23714cd4aeb7116756 (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 fcca4e12b3376d19c55d3290fd976ab342faa238
Merge: 7ee028f 26d31f9
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Wed Aug 21 15:39:31 2013 -0400
Sync from ggtags/master
commit 26d31f98bb529d036b7235de89c2af2a21a8da48
Author: Leo Liu sdl@gmail.com
Date: Mon Jul 29 11:00:16 2013 +0800
Fix #14: Override key [return] in ggtags-navigation-mode-map
diff --git a/ggtags.el b/ggtags.el
index b344555..3f77656 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -532,6 +532,7 @@ s: symbols (-s)
(define-key map \M-} 'ggtags-navigation-next-file)
(define-key map \M-{ 'ggtags-navigation-previous-file)
(define-key map \M-o 'ggtags-navigation-visible-mode)
+(define-key map [return] 'ggtags-navigation-mode-done)
(define-key map \r 'ggtags-navigation-mode-done)
;; Intercept M-. and M-* keys
(define-key map [remap pop-tag-mark] 'ggtags-navigation-mode-abort)
commit 4a05529a6d9721805732538db8c41790dd96d7a0
Author: Leo Liu sdl@gmail.com
Date: Fri Jul 5 09:07:30 2013 +0800
Make use of --color if available
diff --git a/ggtags.el b/ggtags.el
index a422f4a..b344555 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -133,11 +133,15 @@ If nil, use Emacs default.
;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1518
(defvar ggtags-global-has-path-style; introduced in global 6.2.8
(with-demoted-errors ; in case `global' not found
-(and (string-match-p ^--path-style
- (shell-command-to-string global --help))
- t))
+(zerop (call-process global nil nil nil
+ --path-style shorter --help)))
Non-nil if `global' supports --path-style switch.)
+;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1542
+(defvar ggtags-global-has-color ; introduced in global 6.2.9
+ (with-demoted-errors
+(zerop (call-process global nil nil nil --color --help
+
(defmacro ggtags-ensure-global-buffer (rest body)
(declare (indent 0))
`(progn
@@ -264,6 +268,7 @@ Return -1 if it does not exist.
(defun ggtags-global-options ()
(concat -v --result=
(symbol-name ggtags-global-output-format)
+ (and ggtags-global-has-color --color)
(and ggtags-global-has-path-style --path-style=shorter)))
;;;###autoload
@@ -475,6 +480,10 @@ s: symbols (-s)
(get-text-property (match-beginning sub)
'compilation-message))
(ggtags-abbreviate-file (match-beginning sub) (match-end sub)))
+(defun ggtags-global-filter ()
+ Called from `compilation-filter-hook' (which see).
+ (ansi-color-apply-on-region compilation-filter-start (point)))
+
(defun ggtags-handle-single-match (buf _how)
(when (and ggtags-auto-jump-to-first-match
;; If exit abnormally keep the window for inspection.
@@ -512,6 +521,7 @@ s: symbols (-s)
'ggtags-global-exit-message-function)
(setq-local truncate-lines t)
(jit-lock-register #'ggtags-abbreviate-files)
+ (add-hook 'compilation-filter-hook 'ggtags-global-filter nil 'local)
(add-hook 'compilation-finish-functions 'ggtags-handle-single-match nil t)
(define-key ggtags-global-mode-map o 'visible-mode))
commit f1409ce5e97e6a0391cc2efe7ba257ec76113930
Author: Leo Liu sdl@gmail.com
Date: Wed Jun 12 13:31:58 2013 +0800
Improve ggtags-next-mark
diff --git a/ggtags.el b/ggtags.el
index a9b5b46..a422f4a 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -390,14 +390,15 @@ s: symbols (-s)
(defun ggtags-next-mark (optional arg)
Move to the next mark in the tag marker ring.
(interactive)
- (or (= (ring-length find-tag-marker-ring) 1)
+ (or ( (ring-length find-tag-marker-ring) 1)
(user-error No %s mark (if arg previous next)))
(let ((mark (or (and ggtags-current-mark
+ (marker-buffer ggtags-current-mark)
(funcall (if arg
Re: [ELPA-diffs] ELPA branch, master, updated. 5f9f173d7488db2922a697debaa1579175ef9808
Thanks Merged. -- Thierry Get my Gnupg key: gpg --keyserver pgp.mit.edu --recv-keys 59F29997
