Skip to content

Display single result in same window #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schouleu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display single result in same window #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rscope.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ The first hook returning non nil wins."
(setq file-name (nth 0 l))
(setq line-number (nth 1 l))
(if (and file-name line-number)
(rscope-select-entry-other-window)
(rscope-select-entry-current-window)
(error "No cscope unique entry found, that's abnormal")))))

(defun rscope-handle-query (query)
Expand All @@ -643,7 +643,7 @@ The first hook returning non nil wins."
result-buf 'rscope-results-organize-filename)
(when (>= nb-results 1)
(ring-insert rscope-marker-ring (point-marker)))
(rscope-finish-result-buffer result-buf)
(rscope-finish-result-buffer result-buf (= 1 nb-results))
(when (= 1 nb-results) (rscope-select-unique-result))))))

(defun rscope-handle-query-call-hierarchy (function-name levels)
Expand Down Expand Up @@ -904,12 +904,12 @@ call organizer to handle them within resultbuf."
(insert rscope-separator-line "\n"))
result-buf))

(defun rscope-finish-result-buffer (result-buf)
(defun rscope-finish-result-buffer (result-buf &optional nodisplay)
(with-current-buffer result-buf
(goto-char (point-max))
(insert rscope-separator-line "\n")
(insert "Search complete.")
(pop-to-buffer result-buf)
(unless nodisplay (pop-to-buffer result-buf))
(goto-char (point-min))
(rscope-get-relative-entry (current-buffer) +1)
(rscope-list-entry-mode)))
Expand Down