From 990290e245d01c94c5785219b2946ff89b9666a6 Mon Sep 17 00:00:00 2001 From: Sergey Litovchuk <16259553+slitovchuk@users.noreply.github.com> Date: Sun, 30 Dec 2018 23:10:02 +0200 Subject: [PATCH] Fix spacemacs/c-c++-tags-find-references-at-point Rename the spacemacs/c-c++-tags-find-references-at-point and rtags-find-references-at-point to fix the c-c++-modes key binding: "g," 'spacemacs/c-c++-tags-find-references-at-point when c-c++-backend is set to 'rtags. This changeset reverts some of the changes introduced by the commit 445f6af93f6d5555bbda7608713bd4838c9b8274. --- CHANGELOG.develop | 2 +- layers/+lang/c-c++/funcs.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 64f1b616e..16c970d6f 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -922,7 +922,7 @@ Benner and Paweł Siudak): - Fix issue with =c++-enable-clang-format-on-save= not taking effect when set (thanks to Silver Chan) - Added lsp support using either cquery or ccls backends (thanks to Cormac - Cannon and Fangrui Song) + Cannon, Sergey Litovchuk and Fangrui Song) **** Cfengine - Fix publish in README (thanks to Eugene Yaremenko) - Add =ob-cfengine3= (thanks to Nick Anderson) diff --git a/layers/+lang/c-c++/funcs.el b/layers/+lang/c-c++/funcs.el index f5c5f0d16..e8f2c7d77 100644 --- a/layers/+lang/c-c++/funcs.el +++ b/layers/+lang/c-c++/funcs.el @@ -160,9 +160,9 @@ and the arguments for flyckeck-clang based on a project-specific text file." rtags-last-request-not-indexed) (gtags-find-tag))) -(defun spacemacs/c-c++-tags-find-refs-at-point (&optional prefix) +(defun spacemacs/c-c++-tags-find-references-at-point (&optional prefix) (interactive "P") - (if (and (not (rtags-find-refs-at-point prefix)) + (if (and (not (rtags-find-references-at-point prefix)) rtags-last-request-not-indexed) (gtags-find-rtag)))