[ELPA-diffs] ELPA branch, master, updated. e6d6161e4c498a2ed420323181a4b425baca981b

[Leo Liu]

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  e6d6161e4c498a2ed420323181a4b425baca981b (commit)
       via  dd78ede9488948e8a55a2473a8e2863e689616d2 (commit)
       via  d2b689c218d5e28b333c0353e9da1162c0ad6474 (commit)
       via  3ee703b4ec93494b5a27c63abeeceb19fa84d567 (commit)
      from  bf2657fc3752d09361f343b5a7447c2e54765bd9 (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 e6d6161e4c498a2ed420323181a4b425baca981b
Merge: bf2657f dd78ede
Author: Leo Liu <address@hidden>
Date:   Tue Nov 5 17:45:06 2013 +0800

    Merge branch 'master' of github.com:leoliu/ggtags


commit dd78ede9488948e8a55a2473a8e2863e689616d2
Author: Leo Liu <address@hidden>
Date:   Tue Nov 5 17:40:14 2013 +0800

    Remove dependency on 'head' in ggtags-make-project

diff --git a/ggtags.el b/ggtags.el
index d8b69c1..c047d95 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -270,22 +270,23 @@ properly update `ggtags-mode-map'."
 
 (defun ggtags-make-project (root)
   (check-type root string)
-  (let* ((root (file-truename (file-name-as-directory root)))
-         (has-rtags (> (length
-                        (split-string (let ((default-directory root))
-                                        (shell-command-to-string
-                                         "gtags -d GRTAGS | head -10"))
-                                      "\n" t))
-                       4))
+  (let* ((default-directory (file-truename (file-name-as-directory root)))
+         (rtags-size (nth 7 (file-attributes "GRTAGS")))
+         (has-rtags (when (and rtags-size (< rtags-size (* 32 1024 1024)))
+                      (with-demoted-errors
+                        (> (length
+                            (split-string
+                             (ggtags-process-string "gtags" "-d" "GRTAGS")
+                             "\n" t))
+                           4))))
          (oversize-p (pcase ggtags-oversize-limit
                        (`nil nil)
                        (`t t)
-                       (t (> (or (nth 7 (file-attributes
-                                         (expand-file-name "GTAGS" root)))
-                                 0)
+                       (t (> (or (nth 7 (file-attributes "GTAGS")) 0)
                              ggtags-oversize-limit)))))
-    (puthash root (ggtags-project--make
-                   :root root :has-rtags has-rtags :oversize-p oversize-p)
+    (puthash default-directory (ggtags-project--make
+                                :root default-directory :has-rtags has-rtags
+                                :oversize-p oversize-p)
              ggtags-projects)))
 
 (defvar-local ggtags-project nil)

commit d2b689c218d5e28b333c0353e9da1162c0ad6474
Author: Leo Liu <address@hidden>
Date:   Tue Nov 5 17:22:22 2013 +0800

    Remove unused macro ggtags-with-ctags-maybe

diff --git a/ggtags.el b/ggtags.el
index 5d2161a..d8b69c1 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -232,14 +232,6 @@ properly update `ggtags-mode-map'."
                        (list "GTAGSLABEL=ctags")))))
      ,@body))
 
-(defmacro ggtags-with-ctags-maybe (&rest body) ; XXX: remove
-  `(let ((process-environment
-          (if (and (ggtags-find-project)
-                   (ggtags-project-ctags-p (ggtags-find-project)))
-              (cons "GTAGSLABEL=ctags" process-environment)
-            process-environment)))
-     ,@body))
-
 (defun ggtags-list-of-string-p (xs)
   "Return non-nil if XS is a list of strings."
   (if (null xs)
@@ -321,7 +313,7 @@ properly update `ggtags-mode-map'."
   (let* ((default-directory (ggtags-current-project-root))
          ;; Not using `ggtags-with-process-environment' to preserve
          ;; environment variables that may be present in
-         ;; ggtags-process-environment.
+         ;; `ggtags-process-environment'.
          (process-environment
           (append ggtags-process-environment
                   process-environment
@@ -466,9 +458,9 @@ If point is at a definition tag, find references, and vice 
versa.
 With a prefix arg (non-nil DEFINITION) always find defintions."
   (interactive (list (ggtags-read-tag) current-prefix-arg))
   (if (or definition
+          (not buffer-file-name)
           (and (ggtags-find-project)
-               (not (ggtags-project-has-rtags (ggtags-find-project))))
-          (not buffer-file-name))
+               (not (ggtags-project-has-rtags (ggtags-find-project)))))
       (ggtags-find-tag 'definition name)
     (ggtags-find-tag (format "--from-here=%d:%s"
                              (line-number-at-pos)

commit 3ee703b4ec93494b5a27c63abeeceb19fa84d567
Author: Leo Liu <address@hidden>
Date:   Tue Nov 5 16:45:33 2013 +0800

    New variable ggtags-global-treat-text

diff --git a/ggtags.el b/ggtags.el
index 96e1780..5d2161a 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -150,6 +150,12 @@ If an integer abbreviate only names longer than that 
number."
   :type 'boolean
   :group 'ggtags)
 
+(defcustom ggtags-global-treat-text nil
+  "Non-nil if Global should include matches from text files."
+  :safe 'booleanp
+  :type 'boolean
+  :group 'ggtags)
+
 (defcustom ggtags-mode-prefix-key "\C-c"
   "Key binding used for `ggtags-mode-prefix-map'.
 Users should change the value using `customize-variable' to
@@ -407,6 +413,7 @@ properly update `ggtags-mode-map'."
                           (and ggtags-global-has-color "--color")
                           (and ggtags-global-has-path-style
                                "--path-style=shorter")
+                          (and ggtags-global-treat-text "--other")
                           (pcase cmd
                             ((pred stringp) cmd)
                             (`definition "-d")

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

Summary of changes:
 packages/ggtags/ggtags.el |   46 ++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
ELPA