[elpa] 12/14: Fix ggtags-navigation-mode-abort when pop-tag-mark errs

[Leo Liu]

leoliu pushed a commit to branch master
in repository elpa.

commit 03271b36ded275a27f9f0f3caf25b3f8564e3c4d
Author: Leo Liu <address@hidden>
Date:   Sat Mar 29 22:46:27 2014 +0800

    Fix ggtags-navigation-mode-abort when pop-tag-mark errs
---
 ggtags.el |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ggtags.el b/ggtags.el
index b0efaa8..98c1212 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -143,8 +143,8 @@ directory local variables is not enabled by default per
 (defcustom ggtags-auto-jump-to-match 'first
   "Strategy on how to jump to match: nil, first or history.
 
-  nil:   never automatically jump to any match;
-first:   jump to the first match;
+    nil: never automatically jump to any match;
+  first: jump to the first match;
 history: jump to the match stored in search history."
   :type '(choice (const :tag "First match" first)
                  (const :tag "Search History" history)
@@ -1467,13 +1467,13 @@ commands `next-error' and `previous-error'.
 (defun ggtags-navigation-mode-abort ()
   (interactive)
   (ggtags-navigation-mode -1)
+  (ggtags-navigation-mode-cleanup nil 0)
   ;; Run after (ggtags-navigation-mode -1) or
   ;; ggtags-global-start-marker might not have been saved.
   (when (and ggtags-global-start-marker
              (not (markerp ggtags-global-start-marker)))
     (setq ggtags-global-start-marker nil)
-    (pop-tag-mark))
-  (ggtags-navigation-mode-cleanup nil 0))
+    (pop-tag-mark)))
 
 (defun ggtags-navigation-next-file (n)
   (interactive "p")