optionalg
diff --git a/‎Changelog.rst‎
Lines changed: 1 addition & 1 deletion b/‎Changelog.rst‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎autoload/pymode/lint.vim‎
Lines changed: 1 addition & 0 deletions b/‎autoload/pymode/lint.vim‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎autoload/pymode/rope.vim‎
Lines changed: 3 additions & 8 deletions b/‎autoload/pymode/rope.vim‎
Lines changed: 3 additions & 8 deletions
diff --git a/‎autoload/pymode/tools/loclist.vim‎
Lines changed: 1 addition & 1 deletion b/‎autoload/pymode/tools/loclist.vim‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎doc/pymode.txt‎
Lines changed: 18 additions & 18 deletions b/‎doc/pymode.txt‎
Lines changed: 18 additions & 18 deletions
diff --git a/‎plugin/pymode.vim‎
Lines changed: 1 addition & 1 deletion b/‎plugin/pymode.vim‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pymode/environment.py‎
Lines changed: 242 additions & 0 deletions b/‎pymode/environment.py‎
Lines changed: 242 additions & 0 deletions
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2013-12-02 0.7.3b
+## 2013-12-02 0.7.4b
 --------------------
     * Update indentation support;
     * Python3 support;
 
@@ -11,6 +11,7 @@ fun! pymode#lint#auto() "{{{
     PymodePython from pymode import auto
     PymodePython auto()
     cclose
+    call g:PymodeSigns.clear()
     edit
     call pymode#wide_message("AutoPep8 done.")
 endfunction "}}}
 
@@ -53,16 +53,11 @@ endfunction
 
 
 fun! pymode#rope#find_it()
-    let l:output = []
+    let loclist = g:PymodeLocList.current()
+    let loclist._title = "Occurrences"
     call pymode#wide_message('Finding Occurrences ...')
     PymodePython rope.find_it()
-    call pymode#wide_message('')
-    if !empty(l:output)
-        let loclist = g:PymodeLocList.current()
-        let loclist._loclist = l:output
-        let loclist._title = "Occurrences"
-        call loclist.show()
-    end
+    call loclist.show()
 endfunction
 
 
 
@@ -74,7 +74,7 @@ fun! g:PymodeLocList.show() "{{{
         execute max([min([line("$"), g:pymode_quickfix_maxheight]), g:pymode_quickfix_minheight]) . "wincmd _"
         if num != winnr()
             call setwinvar(winnr(), 'quickfix_title', self._title . ' <' . self._name . '>')
-            wincmd p
+            exe num . "wincmd w"
         endif
     end
 endfunction "}}}
@@ -6,7 +6,7 @@
     (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.7.3b
+                          Version: 0.7.4b
 
 ==============================================================================
 CONTENTS                                                       *pymode-contents*
@@ -358,25 +358,25 @@ Turn on the rope script                                        *'g:pymode_rope'*
 *:PymodeRopeRegenerate* -- Regenerate the project cache
 
 Rope uses a folder inside projects for holding project configuration and data.
-Its default name is `.ropeproject` If the folder doesnt exists in current
-working directory, parent folders will be checked.
+Its default name is `.ropeproject`.
 
 Currently it is used for things such as:
 
-* There is a config.py file in this folder in which you can change project
-    configurations. Have look at the default config.py file (s created when it
+* The config.py file in this folder contains project configuration. Have
+    a look at the default config.py file (which is created when it
     does not exist) for more information.
 * It can be used for saving project history, so that the next time you open the
     project you can undo past changes.
-* It can be used for saving object information to help rope object inference.
-* It can be used for saving global names cache which is used in auto-import.
+* It can be used to save information about object inferences.
+* It can be used to save a global name cache, which is used for auto-import.
 
-If ``.ropeproject`` is not found in the current directory, rope will walk
-upwards looking for a ``.ropeproject`` in every dir of the parent path. If
-rope finds ``.ropeproject`` in a parent dir, it sets the project for all child
-dirs and the scan may be slow for so many dirs and files.
+If `.ropeproject` is not found in the current directory, rope will look
+recursively for it in parent folders.
+Warning: If rope finds `.ropeproject` in a parent dir, it will use it with
+all its child directories, which may slow scanning down (because of many,
+possibly unrelated, files)
 
-Enable search |.ropeproject| in parent's directories
+Enable searching for |.ropeproject| in parent directories
                                                   *'g:pymode_rope_lookup_project'*
 >
     let g:pymode_rope_lookup_project = 1
@@ -385,7 +385,7 @@ Enable search |.ropeproject| in parent's directories
 Show documentation for element under cursor ~
 
 Show documentation for object under cursor.      *'g:pymode_rope_show_doc_bind'*
-Leave empty for disable key binding.
+Leave empty to disable the key binding.
 >
     let g:pymode_rope_show_doc_bind = '<C-c>d'
 
@@ -397,18 +397,18 @@ Regenerate project cache on every save (if file has been modified)
 4.1 Completion ~
                                                              *pymode-completion*
 
-By default you could typing <Ctrl-Space> for autocompletion. Will be
+By default you can use <Ctrl-Space> for autocompletion. Will be
 automatically selected first entry and you can press <Return> to insert in
 your code. <C-X><C-O> and <C-P>/<C-N> works too.
 
-Autocompletion is also called by typing a period in |Insert| mode.
+Autocompletion is also called by typing a period in |Insert| mode by default.
 
 
 Turn on code completion support in the plugin       *'g:pymode_rope_completion'*
 >
     let g:pymode_rope_completion = 1
 
-Turn on autocompletion when you typing a period
+Turn on autocompletion when typing a period
                                                *'g:pymode_rope_complete_on_dot'*
 >
     let g:pymode_rope_complete_on_dot = 1
@@ -417,8 +417,8 @@ Keymap for autocomplete                        *'g:pymode_rope_completion_bind'*
 >
     let g:pymode_rope_completion_bind = '<C-Space>'
 
-Extended autocompletion (rope could complete objects wich hasnt be imported)
-from project                                        *'g:pymode_rope_autoimport'*
+Extended autocompletion (rope could complete objects which have not been
+imported) from project                              *'g:pymode_rope_autoimport'*
 >
     let g:pymode_rope_autoimport = 1
 
 
@@ -1,5 +1,5 @@
 " vi: fdl=1 
-let g:pymode_version = "0.7.3b"
+let g:pymode_version = "0.7.4b"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 com! PymodeTroubleshooting call pymode#troubleshooting#test()
 
@@ -0,0 +1,242 @@
+""" Define interfaces. """
+
+from __future__ import print_function
+
+import vim
+import json
+import time
+import os.path
+
+from .utils import PY2
+
+
+class VimPymodeEnviroment(object):
+
+    """ Vim User interface. """
+
+    prefix = '[Pymode]'
+
+    def __init__(self):
+        self.current = vim.current
+        self.options = dict(encoding=vim.eval('&enc'))
+        self.options['debug'] = self.var('g:pymode_debug', True)
+
+    @property
+    def curdir(self):
+        """ Return current working directory. """
+
+        return self.var('getcwd()')
+
+    @property
+    def curbuf(self):
+        """ Return current buffer. """
+
+        return self.current.buffer
+
+    @property
+    def cursor(self):
+        """ Return current window position.
+
+        :return tuple: (row, col)
+
+        """
+        return self.current.window.cursor
+
+    @property
+    def source(self):
+        """ Return source of current buffer. """
+
+        return "\n".join(self.lines)
+
+    @property
+    def lines(self):
+        """ Iterate by lines in current file.
+
+        :return list:
+
+        """
+        if not PY2:
+            return self.curbuf
+
+        return [l.decode(self.options.get('encoding')) for l in self.curbuf]
+
+    def var(self, name, to_bool=False):
+        """ Get vim variable.
+
+        :return vimobj:
+
+        """
+
+        value = vim.eval(name)
+
+        if to_bool:
+            try:
+                value = bool(int(value))
+            except ValueError:
+                value = value
+        return value
+
+    def message(self, msg, history=False):
+        """ Show message to user. """
+
+        if history:
+            return vim.command('echom "%s"' % str(msg))
+
+        return vim.command('call pymode#wide_message("%s")' % str(msg))
+
+    def user_input(self, msg, default=''):
+        """ Return user input or default.
+
+        :return str:
+
+        """
+        msg = '%s %s ' % (self.prefix, msg)
+
+        if default != '':
+            msg += '[%s] ' % default
+
+        try:
+            vim.command('echohl Debug')
+            input_str = vim.eval('input("%s> ")' % msg)
+            vim.command('echohl none')
+        except KeyboardInterrupt:
+            input_str = ''
+
+        return input_str or default
+
+    def user_confirm(self, msg, yes=False):
+        """ Get user confirmation.
+
+        :return bool:
+
+        """
+        default = 'yes' if yes else 'no'
+        action = self.user_input(msg, default)
+        return action and 'yes'.startswith(action)
+
+    def user_input_choices(self, msg, *options):
+        """ Get one of many options.
+
+        :return str: A choosen option
+
+        """
+        choices = ['%s %s' % (self.prefix, msg)]
+        choices += [
+            "%s. %s" % (num, opt) for num, opt in enumerate(options, 1)]
+        try:
+            input_str = int(
+                vim.eval('inputlist(%s)' % self.prepare_value(choices)))
+        except (KeyboardInterrupt, ValueError):
+            input_str = 0
+
+        if not input_str:
+            self.message('Cancelled!')
+            return False
+
+        try:
+            return options[input_str - 1]
+        except (IndexError, ValueError):
+            self.error('Invalid option: %s' % input_str)
+            return self.user_input_choices(msg, *options)
+
+    def error(self, msg):
+        """ Show error to user. """
+        vim.command('call pymode#error("%s")' % str(msg))
+
+    def debug(self, msg, *args):
+        """ Print debug information. """
+
+        if self.options.get('debug'):
+            print("%s %s [%s]" % (
+                int(time.time()), msg, ', '.join([str(a) for a in args])))
+
+    def stop(self, value=None):
+        """ Break Vim function. """
+
+        cmd = 'return'
+        if value:
+            cmd += ' ' + self.prepare_value(value)
+        vim.command(cmd)
+
+    def catch_exceptions(self, func):
+        """ Decorator. Make execution more silence.
+
+        :return func:
+
+        """
+
+        def _wrapper(*args, **kwargs):
+            try:
+                return func(*args, **kwargs)
+            except (Exception, vim.error) as e: # noqa
+                if self.options.get('debug'):
+                    raise
+                self.error(e)
+                return None
+        return _wrapper
+
+    def run(self, name, *args):
+        """ Run vim function. """
+
+        vim.command('call %s(%s)' % (name, ", ".join([
+            self.prepare_value(a) for a in args
+        ])))
+
+    def let(self, name, value):
+        """ Set variable. """
+        cmd = 'let %s = %s' % (name, self.prepare_value(value))
+        self.debug(cmd)
+        vim.command(cmd)
+
+    def prepare_value(self, value):
+        """ Decode bstr to vim encoding.
+
+        :return unicode string:
+
+        """
+
+        value = json.dumps(value)
+        if PY2:
+            value = value.decode('utf-8').encode(self.options.get('encoding'))
+
+        return value
+
+    def get_offset_params(self, cursor=None, base=""):
+        """ Calculate current offset.
+
+        :return tuple: (source, offset)
+
+        """
+        row, col = cursor or env.cursor
+        source = ""
+        offset = 0
+        for i, line in enumerate(self.lines, 1):
+            if i == row:
+                source += line[:col] + base
+                offset = len(source)
+                source += line[col:]
+            else:
+                source += line
+            source += '\n'
+        env.debug('Get offset', base or None, row, col, offset)
+        return source, offset
+
+    def goto_line(self, line):
+        """ Go to line. """
+
+        vim.command('normal %sggzz' % line)
+
+    def goto_file(self, path, cmd='e', force=False):
+        """ Function description. """
+
+        if force or os.path.abspath(path) != self.curbuf.name:
+            self.debug('read', path)
+            vim.command("%s %s" % (cmd, path))
+
+    def goto_buffer(self, bufnr):
+        """ Open buffer. """
+        if str(bufnr) != '-1':
+            vim.command('buffer %s' % bufnr)
+
+
+env = VimPymodeEnviroment()