[elpa] externals/exwm updated (1c8101a -> 575162b)

2016-10-01 Thread Chris Feng 
ch11ng pushed a change to branch externals/exwm.

  from  1c8101a   Fix a frame resizing problem for Lucid build
   new  7d732d7   Use read-buffer-to-switch in 
exwm-workspace-switch-to-buffer
   new  9a262e8   Merge branch 'fjl/read-buffer-to-switch' into 
externals/exwm
   new  575162b   Bump version to 0.11


Summary of changes:
 exwm-workspace.el |2 +-
 exwm.el   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[elpa] externals/exwm 7d732d7 1/3: Use read-buffer-to-switch in exwm-workspace-switch-to-buffer

2016-10-01 Thread Chris Feng 
branch: externals/exwm
commit 7d732d78f5b3eec89cbbde65596c19a691052625
Author: Felix Lange 
Commit: Felix Lange 

Use read-buffer-to-switch in exwm-workspace-switch-to-buffer

read-buffer-to-switch elides the current buffer from the list of
completions and selects a sane default.
---
 exwm-workspace.el |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exwm-workspace.el b/exwm-workspace.el
index 9034c11..12f0be7 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -783,7 +783,7 @@ INDEX must not exceed the current number of workspaces."
  (rename-buffer (substring (buffer-name) 1))
  (prog1
  (with-local-quit
-   (list (get-buffer (read-buffer "Switch to buffer: " nil t
+   (list (get-buffer (read-buffer-to-switch "Switch to buffer: "
;; Hide buffers on other workspaces
(unless exwm-workspace-show-all-buffers
  (dolist (pair exwm--id-buffer-alist)

[elpa] externals/exwm 575162b 3/3: Bump version to 0.11

2016-10-01 Thread Chris Feng 
branch: externals/exwm
commit 575162b6b66a794ea3fc027ddcd72096e30276ab
Author: Chris Feng 
Commit: Chris Feng 

Bump version to 0.11
---
 exwm.el |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exwm.el b/exwm.el
index 850becf..eff9bac 100644
--- a/exwm.el
+++ b/exwm.el
@@ -4,7 +4,7 @@
 
 ;; Author: Chris Feng 
 ;; Maintainer: Chris Feng 
-;; Version: 0.10
+;; Version: 0.11
 ;; Package-Requires: ((xelb "0.11"))
 ;; Keywords: unix
 ;; URL: https://github.com/ch11ng/exwm

[elpa] externals/exwm 9a262e8 2/3: Merge branch 'fjl/read-buffer-to-switch' into externals/exwm

2016-10-01 Thread Chris Feng 
branch: externals/exwm
commit 9a262e8221970850756de46149abd8014d01d89c
Merge: 1c8101a 7d732d7
Author: Chris Feng 
Commit: Chris Feng 

Merge branch 'fjl/read-buffer-to-switch' into externals/exwm
---
 exwm-workspace.el |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exwm-workspace.el b/exwm-workspace.el
index 9034c11..12f0be7 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -783,7 +783,7 @@ INDEX must not exceed the current number of workspaces."
  (rename-buffer (substring (buffer-name) 1))
  (prog1
  (with-local-quit
-   (list (get-buffer (read-buffer "Switch to buffer: " nil t
+   (list (get-buffer (read-buffer-to-switch "Switch to buffer: "
;; Hide buffers on other workspaces
(unless exwm-workspace-show-all-buffers
  (dolist (pair exwm--id-buffer-alist)

[elpa] master c697c1d 2/7: Fix #127: Improve ggtags-make-project in finding tag files

2016-10-01 Thread Leo Liu 
branch: master
commit c697c1d55a95daa5bbe214153c8bbc71ba5b9ba9
Author: Leo Liu 
Commit: Leo Liu 

Fix #127: Improve ggtags-make-project in finding tag files
---
 README.rst |4 +++-
 ggtags.el  |   56 ++--
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/README.rst b/README.rst
index 819ae1e..5bb0eb2 100644
--- a/README.rst
+++ b/README.rst
@@ -319,6 +319,8 @@ NEWS
 
 #. ``ggtags-navigation-mode`` is more discreet in displaying lighter
when ``ggtags-enable-navigation-keys`` is set to nil.
+#. ``ggtags-make-project`` tries harder to find TAG files respecting
+   ``GTAGSDBPATH``.
 
 [2015-12-15 Tue] 0.8.11
 +++
@@ -385,7 +387,7 @@ NEWS
 [2014-04-12 Sat] 0.8.3
 ++
 
-#. Tweak mode-line ligter in ``ggtags-navigation-mode``.
+#. Tweak mode-line lighter in ``ggtags-navigation-mode``.
 
 [2014-04-05 Sat] 0.8.2
 ++
diff --git a/ggtags.el b/ggtags.el
index 1c72845..58b15d4 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -465,32 +465,36 @@ Set to `nil' to disable tag highlighting."
 
 (defun ggtags-make-project (root)
   (cl-check-type root string)
-  (pcase (nthcdr 5 (file-attributes (expand-file-name "GTAGS" root)))
-(`(,mtime ,_ ,tag-size . ,_)
- (let* ((default-directory (file-name-as-directory root))
-(rtags-size (nth 7 (file-attributes "GRTAGS")))
-(has-refs
- (when rtags-size
-   (and (or (> rtags-size (* 32 1024))
-(with-demoted-errors "ggtags-make-project: %S"
-  (not (equal "" (ggtags-process-string "global" 
"-crs")
-'has-refs)))
-;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1518
-(has-path-style
- (and (ggtags-process-succeed-p "global" "--path-style" "shorter" 
"--help")
-  'has-path-style))
-;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1542
-(has-color (and (ggtags-process-succeed-p "global" "--color" 
"--help")
-'has-color)))
-   (puthash default-directory
-(ggtags-project--make :root default-directory
-  :tag-size tag-size
-  :has-refs has-refs
-  :has-path-style has-path-style
-  :has-color has-color
-  :mtime (float-time mtime)
-  :timestamp (float-time))
-ggtags-projects)
+  (let* ((default-directory (file-name-as-directory root))
+ ;; NOTE: use of GTAGSDBPATH is not recommended. -- GLOBAL(1)
+ ;; ROOT and DB can be different directories due to GTAGSDBPATH.
+ (dbdir (concat (file-remote-p root)
+(ggtags-process-string "global" "-p"
+(pcase (nthcdr 5 (file-attributes (expand-file-name "GTAGS" dbdir)))
+  (`(,mtime ,_ ,tag-size . ,_)
+   (let* ((rtags-size (nth 7 (file-attributes (expand-file-name "GRTAGS" 
dbdir
+  (has-refs
+   (when rtags-size
+ (and (or (> rtags-size (* 32 1024))
+  (with-demoted-errors "ggtags-make-project: %S"
+(not (equal "" (ggtags-process-string "global" 
"-crs")
+  'has-refs)))
+  ;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1518
+  (has-path-style
+   (and (ggtags-process-succeed-p "global" "--path-style" 
"shorter" "--help")
+'has-path-style))
+  ;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1542
+  (has-color (and (ggtags-process-succeed-p "global" "--color" 
"--help")
+  'has-color)))
+ (puthash default-directory
+  (ggtags-project--make :root default-directory
+:tag-size tag-size
+:has-refs has-refs
+:has-path-style has-path-style
+:has-color has-color
+:mtime (float-time mtime)
+:timestamp (float-time))
+  ggtags-projects))
 
 (defun ggtags-project-expired-p (project)
   (or (< (ggtags-project-timestamp project) 0)

[elpa] master updated (3d0eb58 -> 378f13a)

2016-10-01 Thread Leo Liu 
leoliu pushed a change to branch master.

  from  3d0eb58   Adjust for NOAA server changes.
   new  b4ee572   Fix #124: Fix lighter for ggtags-navigation-mode
   new  c697c1d   Fix #127: Improve ggtags-make-project in finding tag files
   new  811f2e1   Fix #88 and #130: Adapt to changes in Emacs 25.1
   new  cf17576   Fix #89: Make sure compilation-auto-jump run before 
cleanup
   new  08ed052   Apply changes from GNU ELPA
   new  7a7ee76   Doc fix
   new  378f13a   Merge branch 'master' of github.com:leoliu/ggtags


Summary of changes:
 packages/ggtags/README.rst |   36 +++
 packages/ggtags/ggtags.el  |  145 ++--
 2 files changed, 111 insertions(+), 70 deletions(-)

[elpa] master 378f13a 7/7: Merge branch 'master' of github.com:leoliu/ggtags

2016-10-01 Thread Leo Liu 
branch: master
commit 378f13a8c9e02f10a68f32466893da3b01a4c5ec
Merge: 3d0eb58 7a7ee76
Author: Leo Liu 
Commit: Leo Liu 

Merge branch 'master' of github.com:leoliu/ggtags
---
 packages/ggtags/README.rst |   36 +++
 packages/ggtags/ggtags.el  |  145 ++--
 2 files changed, 111 insertions(+), 70 deletions(-)

diff --git a/packages/ggtags/README.rst b/packages/ggtags/README.rst
index eda0427..2f5d982 100644
--- a/packages/ggtags/README.rst
+++ b/packages/ggtags/README.rst
@@ -8,9 +8,8 @@ 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,
-24.4 and trunk. Patches, feature requests and bug reports are welcome.
-Thanks.
+emacs packages. ``ggtags.el`` is tested in Emacs 24 and 25. Patches,
+feature requests and bug reports are welcome. Thanks.
 
 Features
 
@@ -30,7 +29,8 @@ Features
 #. Highlight (definition) tag at point.
 #. Abbreviated display of file names.
 #. Support all Global search backends: ``grep``, ``idutils`` etc.
-#. Support `exuberant ctags `_ backend.
+#. Support `exuberant ctags `_ and
+   ``pygments`` backend.
 #. Support all Global's output formats: ``grep``, ``ctags-x``,
``cscope`` etc.
 #. Support projects on remote hosts (e.g. via ``tramp``).
@@ -114,8 +114,8 @@ directory. The mode line will display the directory name 
next to the
 buffer name. If point is at a valid definition tag, it is underlined.
 
 ``ggtags`` is similar to the standard ``etags`` package. For example
-these keys ``M-.``, ``M-,``, ``M-*`` and ``C-M-.`` should work as
-expected in ``ggtags-mode``.
+these keys ``M-.``, ``M-,`` and ``C-M-.`` should work as expected in
+``ggtags-mode``.
 
 The following search commands are available:
 
@@ -213,10 +213,10 @@ turned on to facilitate locating the right match.
 
 ``RET``
 
-   Found the right match so exit navigation mode. Resumable by ``M-,``
-   (``tags-loop-continue``).
+   Found the right match so exit navigation mode. Resumable by
+   ``M-x tags-loop-continue``.
 
-``M-*``
+``M-,`` (``M-*`` if Emacs < 25)
 
Abort and go back to the location where the search was started.
 
@@ -227,8 +227,9 @@ Commands are available from the ``Ggtags`` menu in 
``ggtags-mode``.
 
 ggtags-prev-mark
 
-   Move to the previously (older) visited location. Unlike ``M-*``
-   this doesn't delete the location from the tag ring.
+   Move to the previously (older) visited location. Unlike ``M-,``
+   (``M-*`` if Emacs < 25) this doesn't delete the location from the
+   tag ring.
 
 ggtags-next-mark
 
@@ -313,6 +314,17 @@ Integration with other packages
 NEWS
 
 
+[2016-10-02 Sun] 0.8.12

+
+#. Work with Emacs 25.
+#. ``ggtags-navigation-mode`` is more discreet in displaying lighter
+   when ``ggtags-enable-navigation-keys`` is set to nil.
+#. ``ggtags-make-project`` tries harder to find TAG files respecting
+   ``GTAGSDBPATH``.
+#. Fix error "Selecting deleted buffer"
+   (`#89 `_).
+   
 [2015-12-15 Tue] 0.8.11
 +++
 
@@ -378,7 +390,7 @@ NEWS
 [2014-04-12 Sat] 0.8.3
 ++
 
-#. Tweak mode-line ligter in ``ggtags-navigation-mode``.
+#. Tweak mode-line lighter in ``ggtags-navigation-mode``.
 
 [2014-04-05 Sat] 0.8.2
 ++
diff --git a/packages/ggtags/ggtags.el b/packages/ggtags/ggtags.el
index aefe3af..b3172fb 100644
--- a/packages/ggtags/ggtags.el
+++ b/packages/ggtags/ggtags.el
@@ -1,9 +1,9 @@
 ;;; ggtags.el --- emacs frontend to GNU Global source code tagging system  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2016  Free Software Foundation, Inc.
 
 ;; Author: Leo Liu 
-;; Version: 0.8.11
+;; Version: 0.8.12
 ;; Keywords: tools, convenience
 ;; Created: 2013-01-29
 ;; URL: https://github.com/leoliu/ggtags
@@ -30,17 +30,21 @@
 ;; Usage:
 ;;
 ;; `ggtags' is similar to the standard `etags' package. These keys
-;; `M-.', `M-,', `M-*' and `C-M-.' should work as expected in
-;; `ggtags-mode'. See the README in https://github.com/leoliu/ggtags
-;; for more details.
+;; `M-.', `M-,' and `C-M-.' should work as expected in `ggtags-mode'.
+;; See the README in https://github.com/leoliu/ggtags for more
+;; details.
 ;;
 ;; All commands are available from the `Ggtags' menu in `ggtags-mode'.
 
-;;; NEWS 0.8.11 (2015-12-15):
+;;; NEWS 0.8.12 (2016-10-02):
 
-;; - `ggtags-highlight-tag-delay' is renamed to `ggtags-highlight-tag'
-;; - Tag highlighting can be disabled by setting
-;;   `ggtags-highlight-tag' to nil.
+;; - Work with Emacs 25
+;; - `ggtags-navigation-mode' is more discreet in displaying lighter
+;;   when `ggtags-enable-navigation-keys' is set to nil
+;; - `ggtags-make-project' t

[elpa] master cf17576 4/7: Fix #89: Make sure compilation-auto-jump run before cleanup

2016-10-01 Thread Leo Liu 
branch: master
commit cf17576ef095af77e17e959b8289be3d0a878a5e
Author: Leo Liu 
Commit: Leo Liu 

Fix #89: Make sure compilation-auto-jump run before cleanup
---
 ggtags.el |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ggtags.el b/ggtags.el
index 98addc2..c16f99d 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -1687,11 +1687,18 @@ ggtags: history match invalid, jump to first match 
instead")
 'compilation-message)))
 ;; There are multiple matches so pop up the buffer.
 (and ggtags-navigation-mode (ggtags-global--display-buffer))
-  ;; For the `compilation-auto-jump' in idle timer to run.
-  ;; See also: http://debbugs.gnu.org/13829
-  (sit-for 0)
+  ;; Manually run the `compilation-auto-jump' timer. Hackish but
+  ;; everything else seems unreliable. See:
+  ;;
+  ;; - http://debbugs.gnu.org/13829
+  ;; - http://debbugs.gnu.org/23987
+  ;; - https://github.com/leoliu/ggtags/issues/89
+  ;;
+  (pcase (cl-find 'compilation-auto-jump timer-list :key #'timer--function)
+(`nil )
+(timer (timer-event-handler timer)))
   (ggtags-navigation-mode -1)
-  (ggtags-navigation-mode-cleanup buf 0)
+  (ggtags-navigation-mode-cleanup buf t)
 
 (defvar ggtags-global-mode-font-lock-keywords
   '(("^Global \\(exited 
abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code 
\\([0-9]+\\)\\)?.*"
@@ -1815,7 +1822,7 @@ ggtags: history match invalid, jump to first match 
instead")
 (goto-char (match-beginning 0))
   (goto-char orig))
 
-(defun ggtags-navigation-mode-cleanup (&optional buf time)
+(defun ggtags-navigation-mode-cleanup (&optional buf kill)
   (let ((buf (or buf ggtags-global-last-buffer)))
 (and (buffer-live-p buf)
  (with-current-buffer buf
@@ -1824,7 +1831,7 @@ ggtags: history match invalid, jump to first match 
instead")
(when (and (derived-mode-p 'ggtags-global-mode)
   (get-buffer-window))
  (quit-windows-on (current-buffer)))
-   (and time (run-with-idle-timer time nil #'kill-buffer buf))
+   (and kill (kill-buffer buf))
 
 (defun ggtags-navigation-mode-done ()
   (interactive)
@@ -1837,7 +1844,7 @@ ggtags: history match invalid, jump to first match 
instead")
   "Abort navigation and return to where the search was started."
   (interactive)
   (ggtags-navigation-mode -1)
-  (ggtags-navigation-mode-cleanup nil 0)
+  (ggtags-navigation-mode-cleanup nil t)
   ;; Run after (ggtags-navigation-mode -1) or
   ;; ggtags-global-start-marker might not have been saved.
   (when (and ggtags-global-start-marker

[elpa] master 7a7ee76 6/7: Doc fix

2016-10-01 Thread Leo Liu 
branch: master
commit 7a7ee76a8055531482927e6abf7e0ef676165dd2
Author: Leo Liu 
Commit: Leo Liu 

Doc fix
---
 README.rst |   15 ---
 ggtags.el  |   14 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/README.rst b/README.rst
index 1bb2010..2f5d982 100644
--- a/README.rst
+++ b/README.rst
@@ -8,9 +8,8 @@ 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,
-24.4 and trunk. Patches, feature requests and bug reports are welcome.
-Thanks.
+emacs packages. ``ggtags.el`` is tested in Emacs 24 and 25. Patches,
+feature requests and bug reports are welcome. Thanks.
 
 Features
 
@@ -315,15 +314,17 @@ Integration with other packages
 NEWS
 
 
-(devel) 0.8.12
-++
+[2016-10-02 Sun] 0.8.12

 
+#. Work with Emacs 25.
 #. ``ggtags-navigation-mode`` is more discreet in displaying lighter
when ``ggtags-enable-navigation-keys`` is set to nil.
 #. ``ggtags-make-project`` tries harder to find TAG files respecting
``GTAGSDBPATH``.
-#. Work with Emacs 25
-
+#. Fix error "Selecting deleted buffer"
+   (`#89 `_).
+   
 [2015-12-15 Tue] 0.8.11
 +++
 
diff --git a/ggtags.el b/ggtags.el
index 164c6a1..b3172fb 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -36,11 +36,15 @@
 ;;
 ;; All commands are available from the `Ggtags' menu in `ggtags-mode'.
 
-;;; NEWS 0.8.11 (2015-12-15):
-
-;; - `ggtags-highlight-tag-delay' is renamed to `ggtags-highlight-tag'
-;; - Tag highlighting can be disabled by setting
-;;   `ggtags-highlight-tag' to nil.
+;;; NEWS 0.8.12 (2016-10-02):
+
+;; - Work with Emacs 25
+;; - `ggtags-navigation-mode' is more discreet in displaying lighter
+;;   when `ggtags-enable-navigation-keys' is set to nil
+;; - `ggtags-make-project' tries harder to find TAG files respecting
+;;   `GTAGSDBPATH'
+;; - Fix error "Selecting deleted buffer"
+;;   https://github.com/leoliu/ggtags/issues/89
 ;;
 ;; See full NEWS on https://github.com/leoliu/ggtags#news

[elpa] master b4ee572 1/7: Fix #124: Fix lighter for ggtags-navigation-mode

2016-10-01 Thread Leo Liu 
branch: master
commit b4ee572a6b2e70d3db6ce11f73e6f87b73a13273
Author: Leo Liu 
Commit: Leo Liu 

Fix #124: Fix lighter for ggtags-navigation-mode
---
 README.rst |9 -
 ggtags.el  |   11 ---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index eda0427..819ae1e 100644
--- a/README.rst
+++ b/README.rst
@@ -30,7 +30,8 @@ Features
 #. Highlight (definition) tag at point.
 #. Abbreviated display of file names.
 #. Support all Global search backends: ``grep``, ``idutils`` etc.
-#. Support `exuberant ctags `_ backend.
+#. Support `exuberant ctags `_ and
+   ``pygments`` backend.
 #. Support all Global's output formats: ``grep``, ``ctags-x``,
``cscope`` etc.
 #. Support projects on remote hosts (e.g. via ``tramp``).
@@ -313,6 +314,12 @@ Integration with other packages
 NEWS
 
 
+(devel) 0.8.12
+++
+
+#. ``ggtags-navigation-mode`` is more discreet in displaying lighter
+   when ``ggtags-enable-navigation-keys`` is set to nil.
+
 [2015-12-15 Tue] 0.8.11
 +++
 
diff --git a/ggtags.el b/ggtags.el
index 08fb4c8..1c72845 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -1,9 +1,9 @@
 ;;; ggtags.el --- emacs frontend to GNU Global source code tagging system  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2016  Free Software Foundation, Inc.
 
 ;; Author: Leo Liu 
-;; Version: 0.8.11
+;; Version: 0.8.12
 ;; Keywords: tools, convenience
 ;; Created: 2013-01-29
 ;; URL: https://github.com/leoliu/ggtags
@@ -1941,7 +1941,12 @@ ggtags: history match invalid, jump to first match 
instead")
   "Ligher for `ggtags-navigation-mode'; set to nil to disable it.")
 
 (define-minor-mode ggtags-navigation-mode nil
-  :lighter ggtags-navigation-mode-lighter
+  ;; If `ggtags-enable-navigation-keys' is set to nil only display the
+  ;; lighter in `ggtags-mode' buffers.
+  ;; See https://github.com/leoliu/ggtags/issues/124
+  :lighter (:eval (and (or ggtags-enable-navigation-keys
+   ggtags-mode)
+   ggtags-navigation-mode-lighter))
   :global t
   (if ggtags-navigation-mode
   (progn

[elpa] master 811f2e1 3/7: Fix #88 and #130: Adapt to changes in Emacs 25.1

2016-10-01 Thread Leo Liu 
branch: master
commit 811f2e182b958ab9fd377121dbdff239a935bcab
Author: Leo Liu 
Commit: Leo Liu 

Fix #88 and #130: Adapt to changes in Emacs 25.1
---
 README.rst |   16 +---
 ggtags.el  |   45 +++--
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/README.rst b/README.rst
index 5bb0eb2..1bb2010 100644
--- a/README.rst
+++ b/README.rst
@@ -115,8 +115,8 @@ directory. The mode line will display the directory name 
next to the
 buffer name. If point is at a valid definition tag, it is underlined.
 
 ``ggtags`` is similar to the standard ``etags`` package. For example
-these keys ``M-.``, ``M-,``, ``M-*`` and ``C-M-.`` should work as
-expected in ``ggtags-mode``.
+these keys ``M-.``, ``M-,`` and ``C-M-.`` should work as expected in
+``ggtags-mode``.
 
 The following search commands are available:
 
@@ -214,10 +214,10 @@ turned on to facilitate locating the right match.
 
 ``RET``
 
-   Found the right match so exit navigation mode. Resumable by ``M-,``
-   (``tags-loop-continue``).
+   Found the right match so exit navigation mode. Resumable by
+   ``M-x tags-loop-continue``.
 
-``M-*``
+``M-,`` (``M-*`` if Emacs < 25)
 
Abort and go back to the location where the search was started.
 
@@ -228,8 +228,9 @@ Commands are available from the ``Ggtags`` menu in 
``ggtags-mode``.
 
 ggtags-prev-mark
 
-   Move to the previously (older) visited location. Unlike ``M-*``
-   this doesn't delete the location from the tag ring.
+   Move to the previously (older) visited location. Unlike ``M-,``
+   (``M-*`` if Emacs < 25) this doesn't delete the location from the
+   tag ring.
 
 ggtags-next-mark
 
@@ -321,6 +322,7 @@ NEWS
when ``ggtags-enable-navigation-keys`` is set to nil.
 #. ``ggtags-make-project`` tries harder to find TAG files respecting
``GTAGSDBPATH``.
+#. Work with Emacs 25
 
 [2015-12-15 Tue] 0.8.11
 +++
diff --git a/ggtags.el b/ggtags.el
index 58b15d4..98addc2 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -30,9 +30,9 @@
 ;; Usage:
 ;;
 ;; `ggtags' is similar to the standard `etags' package. These keys
-;; `M-.', `M-,', `M-*' and `C-M-.' should work as expected in
-;; `ggtags-mode'. See the README in https://github.com/leoliu/ggtags
-;; for more details.
+;; `M-.', `M-,' and `C-M-.' should work as expected in `ggtags-mode'.
+;; See the README in https://github.com/leoliu/ggtags for more
+;; details.
 ;;
 ;; All commands are available from the `Ggtags' menu in `ggtags-mode'.
 
@@ -91,7 +91,14 @@
   (or (fboundp 'read-only-mode) ;24.3
   (defalias 'read-only-mode 'toggle-read-only))
   (or (fboundp 'register-read-with-preview) ;24.4
-  (defalias 'register-read-with-preview 'read-char)))
+  (defalias 'register-read-with-preview 'read-char))
+  (or (boundp 'xref--marker-ring)   ;25.1
+  (defvaralias 'xref--marker-ring 'find-tag-marker-ring))
+  (or (fboundp 'xref-push-marker-stack) ;25.1
+  (defun xref-push-marker-stack (&optional m)
+(ring-insert xref--marker-ring (or m (point-marker)
+  (or (fboundp 'xref-pop-marker-stack)
+  (defalias 'xref-pop-marker-stack 'pop-tag-mark)))
 
 (defgroup ggtags nil
   "GNU Global source code tagging system."
@@ -928,7 +935,7 @@ blocking emacs."
 (defun ggtags-global-save-start-marker ()
   (when (markerp ggtags-global-start-marker)
 (setq ggtags-tag-ring-index nil)
-(ring-insert find-tag-marker-ring ggtags-global-start-marker)
+(xref-push-marker-stack ggtags-global-start-marker)
 (setq ggtags-global-start-marker t)))
 
 (defun ggtags-global-start (command &optional directory)
@@ -1366,17 +1373,16 @@ Use \\[jump-to-register] to restore the search session."
 (defun ggtags-next-mark (&optional arg)
   "Move to the next (newer) mark in the tag marker ring."
   (interactive)
-  (and (ring-empty-p find-tag-marker-ring) (user-error "Tag ring empty"))
+  (and (ring-empty-p xref--marker-ring) (user-error "Tag ring empty"))
   (setq ggtags-tag-ring-index
 ;; Note `ring-minus1' gets newer item.
 (funcall (if arg #'ring-plus1 #'ring-minus1)
  (or ggtags-tag-ring-index
- (progn
-   (ring-insert find-tag-marker-ring (point-marker))
-   0))
- (ring-length find-tag-marker-ring)))
-  (let ((m (ring-ref find-tag-marker-ring ggtags-tag-ring-index))
-(i (- (ring-length find-tag-marker-ring) ggtags-tag-ring-index)))
+ (progn (xref-push-marker-stack)
+0))
+ (ring-length xref--marker-ring)))
+  (let ((m (ring-ref xref--marker-ring ggtags-tag-ring-index))
+(i (- (ring-length xref--marker-ring) ggtags-tag-ring-index)))
 (ggtags-echo "%d%s marker%s" i (pcase (mod i 10)
  ;; ` required for 24.1 and 24.2
  (`1 "st")
@@ -1411,7 +1417,7 @@ commands `next-error' and `previous-error'.
 
 \\{

[elpa] master 08ed052 5/7: Apply changes from GNU ELPA

2016-10-01 Thread Leo Liu 
branch: master
commit 08ed0528163be72c6ce86a56b360cd945016dbaf
Author: Leo Liu 
Commit: Leo Liu 

Apply changes from GNU ELPA

See GNU ELPA commit f10533854f4c7bb54247a11981191bf37b70cb36 "Fix
some quoting problems in doc strings".
---
 ggtags.el |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ggtags.el b/ggtags.el
index c16f99d..164c6a1 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -341,7 +341,7 @@ Nil means using the value of `completing-read-function'."
 
 (defcustom ggtags-highlight-tag 0.25
   "If non-nil time in seconds before highlighting tag at point.
-Set to `nil' to disable tag highlighting."
+Set to nil to disable tag highlighting."
   :set (lambda (sym value)
  (when (fboundp 'ggtags-setup-highlight-tag-at-point)
(ggtags-setup-highlight-tag-at-point value))