[nongnu] elpa/inf-ruby 6d7f1dc10a 085/265: Merge remote-tracking branch 'bbatsov/style'

[ELPA Syncer]

branch: elpa/inf-ruby
commit 6d7f1dc10a09f83aaeb85b38e3777ef7491db04b
Merge: 96c48e0270 27143433e4
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Merge remote-tracking branch 'bbatsov/style'
---
 inf-ruby.el | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/inf-ruby.el b/inf-ruby.el
index 2f8ebca462..2f63413d1e 100755
--- a/inf-ruby.el
+++ b/inf-ruby.el
@@ -12,6 +12,21 @@
 ;; Keywords: languages ruby
 ;; Version: 2.3.1
 
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
 ;;; Commentary:
 ;;
 ;; inf-ruby provides a REPL buffer connected to a Ruby subprocess.
@@ -37,9 +52,12 @@
 ;; to your init file to easily switch from common Ruby compilation
 ;; modes to interact with a debugger.
 
+;;; Code:
+
 (require 'comint)
 (require 'compile)
 (require 'ruby-mode)
+(require 'thingatpt)
 
 (defvar inf-ruby-default-implementation "ruby"
   "Which Ruby implementation to use if none is specified.")
@@ -77,7 +95,7 @@ graphical char in all other prompts.")
     (define-key map (kbd "TAB") 'inf-ruby-complete)
     (define-key map (kbd "C-x C-q") 'inf-ruby-maybe-switch-to-compilation)
     map)
-  "Mode map for inf-ruby-mode")
+  "Mode map for inf-ruby-mode.")
 
 (defvar inf-ruby-implementations
   '(("ruby"     . "irb --prompt default -r irb/completion")
@@ -145,8 +163,10 @@ The following commands are available:
 
 A simple IRB process can be fired up with <kbd>M-x inf-ruby</kbd>.
 
-To launch a REPL with project-specific console instead, type <kbd>M-x 
inf-ruby-console-auto</kbd>.
-It recognizes several project types, including Rails, gems and anything with 
`racksh` in their Gemfile.
+To launch a REPL with project-specific console instead, type
+<kbd>M-x inf-ruby-console-auto</kbd>.  It recognizes several
+project types, including Rails, gems and anything with `racksh`
+in their Gemfile.
 
 Customization: When entered, this mode runs `comint-mode-hook' and
 `inf-ruby-mode-hook' (in that order).
@@ -213,7 +233,7 @@ The following commands are available:
     (concat rtn-str (substring str start))))
 
 (defun inf-ruby-get-old-input ()
-  "Snarf the sexp ending at point"
+  "Snarf the sexp ending at point."
   (save-excursion
     (let ((end (point)))
       (re-search-backward inf-ruby-first-prompt-pattern)
@@ -224,7 +244,7 @@ The following commands are available:
 (defun inf-ruby (&optional impl)
   "Run an inferior Ruby process in a buffer.
 With prefix argument, prompts for which Ruby implementation
-\(from the list `inf-ruby-implementations') to use. Runs the
+\(from the list `inf-ruby-implementations') to use.  Runs the
 hooks `inf-ruby-mode-hook' \(after the `comint-mode-hook' is
 run)."
 
@@ -259,7 +279,9 @@ of `ruby-program-name').  Runs the hooks 
`inferior-ruby-mode-hook'
   (pop-to-buffer (setq inf-ruby-buffer (format "*%s*" name))))
 
 (defun inf-ruby-proc ()
-  "Returns the current IRB process. See variable inf-ruby-buffer."
+  "Returns the current IRB process.
+
+See variable `inf-ruby-buffer'."
   (or (get-buffer-process (if (eq major-mode 'inf-ruby-mode)
                               (current-buffer)
                             inf-ruby-buffer))
@@ -542,7 +564,7 @@ and the directory to run it from."
 ;;;###autoload
 (defun inf-ruby-console-gem (dir)
   "Run IRB console for the gem in DIR.
-The main module should be loaded automatically. If DIR contains a
+The main module should be loaded automatically.  If DIR contains a
 Gemfile, it should use the `gemspec' instruction."
   (interactive "D")
   (let* ((default-directory dir)