diff options
| author | Bozhidar Batsov | 2018-06-16 22:58:33 +0300 |
|---|---|---|
| committer | Bozhidar Batsov | 2018-06-16 22:58:33 +0300 |
| commit | a7350d09eebfe256c3c84413637f6b7371fb2106 (patch) | |
| tree | f3115b947a4dbd52fed8bafa0569e22ca3ff7692 | |
| parent | 9740768a757141a3f0bd95ed3970cbd24111e7bd (diff) | |
| download | emacs-a7350d09eebfe256c3c84413637f6b7371fb2106.tar.gz emacs-a7350d09eebfe256c3c84413637f6b7371fb2106.zip | |
Fix references to RuboCop in ruby-mode.el
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 1f5d8865a73..bed88036eed 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -2313,8 +2313,8 @@ See `font-lock-syntax-table'.") | |||
| 2313 | (process-send-eof ruby--flymake-proc)))) | 2313 | (process-send-eof ruby--flymake-proc)))) |
| 2314 | 2314 | ||
| 2315 | (defcustom ruby-flymake-use-rubocop-if-available t | 2315 | (defcustom ruby-flymake-use-rubocop-if-available t |
| 2316 | "Non-nil to use the Rubocop Flymake backend. | 2316 | "Non-nil to use the RuboCop Flymake backend. |
| 2317 | Only takes effect if Rubocop is installed." | 2317 | Only takes effect if RuboCop is installed." |
| 2318 | :version "26.1" | 2318 | :version "26.1" |
| 2319 | :type 'boolean | 2319 | :type 'boolean |
| 2320 | :group 'ruby | 2320 | :group 'ruby |
| @@ -2328,7 +2328,7 @@ Only takes effect if Rubocop is installed." | |||
| 2328 | :safe 'stringp) | 2328 | :safe 'stringp) |
| 2329 | 2329 | ||
| 2330 | (defun ruby-flymake-rubocop (report-fn &rest _args) | 2330 | (defun ruby-flymake-rubocop (report-fn &rest _args) |
| 2331 | "Rubocop backend for Flymake." | 2331 | "RuboCop backend for Flymake." |
| 2332 | (unless (executable-find "rubocop") | 2332 | (unless (executable-find "rubocop") |
| 2333 | (error "Cannot find the rubocop executable")) | 2333 | (error "Cannot find the rubocop executable")) |
| 2334 | 2334 | ||
| @@ -2354,7 +2354,7 @@ Only takes effect if Rubocop is installed." | |||
| 2354 | (when (eq (process-exit-status proc) 127) | 2354 | (when (eq (process-exit-status proc) 127) |
| 2355 | ;; Not sure what to do in this case. Maybe ideally we'd | 2355 | ;; Not sure what to do in this case. Maybe ideally we'd |
| 2356 | ;; switch back to ruby-flymake-simple. | 2356 | ;; switch back to ruby-flymake-simple. |
| 2357 | (flymake-log :warning "Rubocop returned status 127: %s" | 2357 | (flymake-log :warning "RuboCop returned status 127: %s" |
| 2358 | (buffer-string))) | 2358 | (buffer-string))) |
| 2359 | (goto-char (point-min)) | 2359 | (goto-char (point-min)) |
| 2360 | (cl-loop | 2360 | (cl-loop |