[elpa] 02/06: Small fix to ggtags-include-pattern
leoliu pushed a commit to branch master
in repository elpa.
commit d48aa3fb04ebca21009b8aeff96b294f96b8f5c9
Author: Leo Liu
Date: Wed Aug 13 11:36:05 2014 +0800
Small fix to ggtags-include-pattern
---
ggtags.el |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ggtags.el b/ggtags.el
index 2b95daa..4ba68ab 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -114,7 +114,7 @@ limit, only files edited in Ggtags mode are updated (via
`global
:group 'ggtags)
(defcustom ggtags-include-pattern
- '("^\\s-*#\\(?:include\\|import\\)\\s-*[\"<]\\(?:[./]*\\)?\\(.*?\\)[\">]" .
1)
+
'("^\\s-*#\\s-*\\(?:include\\|import\\)\\s-*[\"<]\\(?:[./]*\\)?\\(.*?\\)[\">]"
. 1)
"Pattern used to detect #include files.
Value can be (REGEXP . SUB) or a function with no arguments.
REGEXP should match from the beginning of line."
[elpa] 05/06: Update doc for installing pygments plugin
leoliu pushed a commit to branch master in repository elpa. commit e83bd66e2bca26a5695914c413b5e76e871768db Author: Leo Liu Date: Fri Sep 12 08:05:48 2014 +0800 Update doc for installing pygments plugin --- README.rst | 48 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/README.rst b/README.rst index e211394..fc0b9bb 100644 --- a/README.rst +++ b/README.rst @@ -40,9 +40,9 @@ Features Screenshot ~~ -.. figure:: http://i.imgur.com/LX7PVc3.png +.. figure:: http://i.imgur.com/wx8ZPGe.png :width: 500px - :target: http://i.imgur.com/LX7PVc3.png + :target: http://i.imgur.com/wx8ZPGe.png :alt: ggtags.png Why GNU Global @@ -56,28 +56,36 @@ Install Global and plugins ~~ 1. Compile and install Global with ``exuberant-ctags`` -:: + :: - ./configure --prefix= --with-exuberant-ctags=/usr/local/bin/ctags - make && make install + ./configure --prefix= --with-exuberant-ctags=/usr/local/bin/ctags + make && make install -The executable ``ctags`` is unfortunately named because ``emacs`` also -includes a command of the same name. So make sure it is from -http://ctags.sourceforge.net. See ``plugin-factory/README`` in GNU -Global source for further information. + The executable ``ctags`` is unfortunately named because ``emacs`` also + includes a command of the same name. So make sure it is from + http://ctags.sourceforge.net. See ``plugin-factory/README`` in GNU + Global source for further information. 2. Install ``pygments`` plugin -:: - pip install pygments - git clone https://github.com/yoshizow/global-pygments-plugin.git - cd global-pygments-plugin/ - sh reconf.sh - ./configure --prefix= --with-exuberant-ctags=/usr/local/bin/ctags - make && make install - cp sample.globalrc $HOME/.globalrc + The ``pygments`` plugin has been included in ``global`` since + version ``6.3.2``. ``pip install pygments`` is the only step + required. Note the plugin is not activated by the default + ``gtags.conf`` or ``.globalrc``. See + ``global/plugin-factory/PLUGIN_HOWTO.pygments`` for details. -Make sure the value of agree with step 1. + The following instructions are for older ``global``. + :: + + pip install pygments + git clone https://github.com/yoshizow/global-pygments-plugin.git + cd global-pygments-plugin/ + sh reconf.sh + ./configure --prefix= --with-exuberant-ctags=/usr/local/bin/ctags + make && make install + cp sample.globalrc $HOME/.globalrc + + Make sure the value of agree with step 1. Config ~~ @@ -296,8 +304,8 @@ Integration with other packages NEWS -[devel] -~~~ +[2014-09-12 Fri] 0.8.6 +++ #. ``ggtags-show-definition`` shows definition with font locking.
[elpa] 03/06: pygments plugin install instructions tweak
leoliu pushed a commit to branch master in repository elpa. commit 1a0c1ba88b812495f7424de39e84ed0d1c72e6d3 Author: John Feltz Date: Sat Sep 6 12:02:00 2014 -0600 pygments plugin install instructions tweak --- README.rst |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README.rst b/README.rst index 70c797c..e211394 100644 --- a/README.rst +++ b/README.rst @@ -71,6 +71,7 @@ Global source for further information. pip install pygments git clone https://github.com/yoshizow/global-pygments-plugin.git + cd global-pygments-plugin/ sh reconf.sh ./configure --prefix= --with-exuberant-ctags=/usr/local/bin/ctags make && make install
[elpa] 01/06: New function ggtags-fontify-code
leoliu pushed a commit to branch master in repository elpa. commit 6411b9472058b6524942930611b10698b8fcf136 Author: Leo Liu Date: Thu Aug 7 21:53:10 2014 +0800 New function ggtags-fontify-code --- README.rst | 11 +-- ggtags.el | 24 ++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index f00d69b..70c797c 100644 --- a/README.rst +++ b/README.rst @@ -8,8 +8,9 @@ list-packages``) and is also available on `MELPA The goal is to make working with GNU Global in Emacs as effortlessly and intuitively as possible and to integrate tightly with standard -emacs packages. ``ggtags.el`` is tested in emacs 24.1, 24.2, 24.3 and -trunk. Patches, feature requests and bug reports are welcome. Thanks. +emacs packages. ``ggtags.el`` is tested in emacs 24.1, 24.2, 24.3, +24.4 and trunk. Patches, feature requests and bug reports are welcome. +Thanks. Features @@ -294,6 +295,12 @@ Integration with other packages NEWS +[devel] +~~~ + +#. ``ggtags-show-definition`` shows definition with font locking. + + [2014-06-22 Sun] 0.8.5 ++ diff --git a/ggtags.el b/ggtags.el index 09e3af7..2b95daa 100644 --- a/ggtags.el +++ b/ggtags.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2013-2014 Free Software Foundation, Inc. ;; Author: Leo Liu -;; Version: 0.8.5 +;; Version: 0.8.6 ;; Keywords: tools, convenience ;; Created: 2013-01-29 ;; URL: https://github.com/leoliu/ggtags @@ -1897,9 +1897,29 @@ When finished invoke CALLBACK in BUFFER with process exit status." (set-process-sentinel proc sentinel) proc)) +(cl-defun ggtags-fontify-code (code &optional (mode major-mode)) + (cl-check-type mode function) + (cl-typecase code +((not string) code) +(string (cl-labels ((prepare-buffer () + (with-current-buffer + (get-buffer-create " *Code-Fontify*") +(delay-mode-hooks (funcall mode)) +(setq font-lock-mode t) +(funcall font-lock-function font-lock-mode) +(current-buffer + (with-current-buffer (prepare-buffer) +(let ((inhibit-read-only t)) + (erase-buffer) + (insert code) + (font-lock-default-fontify-region + (point-min) (point-max) nil)) +(buffer-string)) + (defun ggtags-get-definition-default (defs) (and (caar defs) - (concat (caar defs) (and (cdr defs) " [guess]" + (concat (ggtags-fontify-code (caar defs)) + (and (cdr defs) " [guess]" (defun ggtags-show-definition (name) (interactive (list (ggtags-read-tag 'definition current-prefix-arg)))
[elpa] 06/06: Merge branch 'master' of github.com:leoliu/ggtags
leoliu pushed a commit to branch master in repository elpa. commit 2ee393efc75af116d8679ea37f6f5176429695cc Merge: 59c5c32 e83bd66 Author: Leo Liu Date: Fri Sep 12 08:23:53 2014 +0800 Merge branch 'master' of github.com:leoliu/ggtags packages/ggtags/README.rst | 54 --- packages/ggtags/ggtags.el | 26 ++-- 2 files changed, 58 insertions(+), 22 deletions(-)
[elpa] 04/06: Merge pull request #69 from jfeltz/patch-1
leoliu pushed a commit to branch master in repository elpa. commit 593486401dc44110514e6c4822acb798397651ea Merge: d48aa3f 1a0c1ba Author: Leo Liu Date: Sun Sep 7 08:38:52 2014 +0800 Merge pull request #69 from jfeltz/patch-1 pygments plugin install instructions tweak README.rst |1 + 1 files changed, 1 insertions(+), 0 deletions(-)
[elpa] branch master updated (59c5c32 -> 2ee393e)
leoliu pushed a change to branch master in repository elpa. from 59c5c32 rainbow-mode: support float in CSS and limit to 100% new 6411b94 New function ggtags-fontify-code new d48aa3f Small fix to ggtags-include-pattern new 1a0c1ba pygments plugin install instructions tweak new 5934864 Merge pull request #69 from jfeltz/patch-1 new e83bd66 Update doc for installing pygments plugin new 2ee393e Merge branch 'master' of github.com:leoliu/ggtags The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: packages/ggtags/README.rst | 54 --- packages/ggtags/ggtags.el | 26 ++-- 2 files changed, 58 insertions(+), 22 deletions(-)
