Commits

Anonymous committed ee165cc

not switching to *rope-occurrences* buffer after next-error

Comments (0)

Files changed (1)

ropemacs/__init__.py

                                         location.note, location.offset)
             text.append(line)
         text = '\n'.join(text) + '\n'
-        buffer = self._make_buffer('*rope-occurrences*', text, switch=True)
+        buffer = self._make_buffer('*rope-occurrences*', text, switch=False)
         lisp.set_buffer(buffer)
         lisp.toggle_read_only(1)
         lisp.set(lisp["next-error-function"], lisp.rope_occurrences_next)
 def message(message):
     lisp.message(message.replace('%', '%%'))
 
-def occurrences_goto_occurrence():
+def occurrences_goto_occurrence(other=True):
     lisp.end_of_line()
     end = lisp.point()
     lisp.beginning_of_line()
         filename = tokens[0]
         offset = int(tokens[-1])
         resource = _interface._get_resource(filename)
-        LispUtils().find_file(resource.real_path, other=True)
+        LispUtils().find_file(resource.real_path, other=other)
         lisp.goto_char(offset + 1)
 occurrences_goto_occurrence.interaction = ''
 
 def occurrences_next(arg, reset):
-    lisp.switch_to_buffer_other_window('*rope-occurrences*')
+    lisp.display_buffer('*rope-occurrences*')
+    lisp.set_buffer('*rope-occurrences*')
     if reset:
         lisp.goto_char(lisp.point_min())
     lisp.forward_line(arg)
     if lisp.eobp():
         lisp.message("Cycling rope occurences")
         lisp.goto_char(lisp.point_min())
-    occurrences_goto_occurrence()
+    occurrences_goto_occurrence(other=False)
 occurrences_next.interaction = ''
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.