Permalink
Browse files

upgrade clojure-mode, inf-ruby, and rainbow-mode

  • Loading branch information...
bleything committed Jan 2, 2013
1 parent 526c984 commit 571a8f847ebbf474da8b16d40eeec2576ac3da5b
@@ -1 +0,0 @@
-(define-package "clojure-mode" "1.11.5" "Major mode for Clojure code" (quote nil))
@@ -3,8 +3,8 @@
;;; Code:
-;;;### (autoloads (clojure-enable-slime-on-existing-buffers clojure-jack-in
-;;;;;; clojure-mode) "clojure-mode" "clojure-mode.el" (20322 55315))
+;;;### (autoloads (clojure-mode) "clojure-mode" "clojure-mode.el"
+;;;;;; (20708 51037 0 0))
;;; Generated autoloads from clojure-mode.el
(autoload 'clojure-mode "clojure-mode" "\
@@ -21,23 +21,20 @@ if that value is non-nil.
\(fn)" t nil)
-(autoload 'clojure-jack-in "clojure-mode" "\
+(put 'clojure-test-ns-segment-position 'safe-local-variable 'integerp)
+(put 'clojure-mode-load-command 'safe-local-variable 'stringp)
-\(fn)" t nil)
-
-(autoload 'clojure-enable-slime-on-existing-buffers "clojure-mode" "\
-
-
-\(fn)" t nil)
+(add-to-list 'auto-mode-alist '("\\.clj\\'" . clojure-mode))
-(add-hook 'slime-connected-hook 'clojure-enable-slime-on-existing-buffers)
+(add-to-list 'interpreter-mode-alist '("jark" . clojure-mode))
-(add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode))
+(add-to-list 'interpreter-mode-alist '("cake" . clojure-mode))
;;;***
-;;;### (autoloads nil nil ("clojure-mode-pkg.el") (20322 55315 118883))
+;;;### (autoloads nil nil ("clojure-mode-pkg.el") (20708 51037 371955
+;;;;;; 0))
;;;***
@@ -0,0 +1 @@
+(define-package "clojure-mode" "2.0.0" "Major mode for Clojure code" (quote nil))

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1 +0,0 @@
-(define-package "inf-ruby" "2.2.3" "Run a ruby process in a buffer" (quote nil))
@@ -3,11 +3,11 @@
;;; Code:
-;;;### (autoloads (run-ruby inf-ruby inf-ruby-keys) "inf-ruby" "inf-ruby.el"
-;;;;;; (20293 31706))
+;;;### (autoloads (run-ruby inf-ruby inf-ruby-setup-keybindings)
+;;;;;; "inf-ruby" "inf-ruby.el" (20708 51036 0 0))
;;; Generated autoloads from inf-ruby.el
-(autoload 'inf-ruby-keys "inf-ruby" "\
+(autoload 'inf-ruby-setup-keybindings "inf-ruby" "\
Set local key defs to invoke inf-ruby from ruby-mode.
\(fn)" nil nil)
@@ -31,11 +31,12 @@ of `ruby-program-name'). Runs the hooks `inferior-ruby-mode-hook'
\(fn &optional COMMAND NAME)" t nil)
-(eval-after-load 'ruby-mode '(add-hook 'ruby-mode-hook 'inf-ruby-keys))
+(eval-after-load 'ruby-mode '(inf-ruby-setup-keybindings))
;;;***
-;;;### (autoloads nil nil ("inf-ruby-pkg.el") (20293 31706 998780))
+;;;### (autoloads nil nil ("inf-ruby-pkg.el") (20708 51036 442621
+;;;;;; 0))
;;;***
@@ -0,0 +1 @@
+(define-package "inf-ruby" "2.2.4" "Run a ruby process in a buffer" (quote nil))
@@ -6,7 +6,7 @@
;; URL: http://github.com/nonsequitur/inf-ruby
;; Created: 8 April 1998
;; Keywords: languages ruby
-;; Version: 2.2.3
+;; Version: 2.2.4
;;; Commentary:
;;
@@ -16,9 +16,9 @@
;; * drop the file somewhere on your load path (perhaps ~/.emacs.d)
;; * Add the following lines to your .emacs file:
;; (autoload 'inf-ruby "inf-ruby" "Run an inferior Ruby process" t)
-;; (autoload 'inf-ruby-keys "inf-ruby" "" t)
+;; (autoload 'inf-ruby-setup-keybindings "inf-ruby" "" t)
;; (eval-after-load 'ruby-mode
-;; '(add-hook 'ruby-mode-hook 'inf-ruby-keys))
+;; '(add-hook 'ruby-mode-hook 'inf-ruby-setup-keybindings))
;;; TODO:
;;
@@ -80,7 +80,7 @@ next one.")
("^\tfrom \\([^\(].*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?$" 1 2)))
;;;###autoload
-(defun inf-ruby-keys ()
+(defun inf-ruby-setup-keybindings ()
"Set local key defs to invoke inf-ruby from ruby-mode."
(define-key ruby-mode-map "\M-\C-x" 'ruby-send-definition)
(define-key ruby-mode-map "\C-x\C-e" 'ruby-send-last-sexp)
@@ -208,7 +208,7 @@ of `ruby-program-name'). Runs the hooks `inferior-ruby-mode-hook'
(setq name (or name "ruby"))
(if (not (comint-check-proc inf-ruby-buffer))
- (let ((commandlist (split-string command)))
+ (let ((commandlist (split-string-and-unquote command)))
(set-buffer (apply 'make-comint name (car commandlist)
nil (cdr commandlist)))
(inf-ruby-mode)))
@@ -326,9 +326,16 @@ Then switch to the process buffer."
(defun ruby-escape-single-quoted (str)
(replace-regexp-in-string "'" "\\\\'"
- (replace-regexp-in-string "\n" "\\\\n"
+ (replace-regexp-in-string "\n" "\\\\n"
(replace-regexp-in-string "\\\\" "\\\\\\\\" str))))
+(defun inf-ruby-fix-completions-on-windows ()
+ "On Windows, the string received by `accept-process-output'
+starts with the last line that was sent to the Ruby process.
+The reason for this is unknown. Remove this line from `completions'."
+ (if (eq system-type 'windows-nt)
+ (setq completions (cdr completions))))
+
(defun inf-ruby-completions (seed)
"Return a list of completions for the line of ruby code starting with SEED."
(let* ((proc (get-buffer-process inf-ruby-buffer))
@@ -339,7 +346,8 @@ Then switch to the process buffer."
(ruby-escape-single-quoted seed)))
(while (and (not (string-match inf-ruby-prompt-pattern kept))
(accept-process-output proc 2)))
- (setq completions (cdr (butlast (split-string kept "\r?\n") 2)))
+ (setq completions (butlast (split-string kept "\r?\n") 2))
+ (inf-ruby-fix-completions-on-windows)
(set-process-filter proc comint-filt)
completions))
@@ -373,7 +381,7 @@ Module used by readline when running irb through a terminal"
;;;###autoload
(eval-after-load 'ruby-mode
- '(add-hook 'ruby-mode-hook 'inf-ruby-keys))
+ '(inf-ruby-setup-keybindings))
(provide 'inf-ruby)
;;; inf-ruby.el ends here
@@ -1 +0,0 @@
-(define-package "rainbow-mode" "0.2" "Colorize color names in buffers" (quote nil))
@@ -4,7 +4,7 @@
;;;### (autoloads (rainbow-mode) "rainbow-mode" "rainbow-mode.el"
-;;;;;; (20297 27418))
+;;;;;; (20708 51035 0 0))
;;; Generated autoloads from rainbow-mode.el
(autoload 'rainbow-mode "rainbow-mode" "\
@@ -15,7 +15,8 @@ This will fontify with colors the string like \"#aabbcc\" or \"blue\".
;;;***
-;;;### (autoloads nil nil ("rainbow-mode-pkg.el") (20297 27418 671357))
+;;;### (autoloads nil nil ("rainbow-mode-pkg.el") (20708 51035 781696
+;;;;;; 0))
;;;***
@@ -0,0 +1 @@
+(define-package "rainbow-mode" "0.6" "Colorize color names in buffers" (quote nil))
Oops, something went wrong.

0 comments on commit 571a8f8

Please sign in to comment.