From 963ce6361af7f8b7aefb63e7a50956e497020b12 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 25 Oct 2013 08:35:56 +0400 Subject: [PATCH] * lisp/progmodes/ruby-mode.el (ruby-mode-menu): Use proper capitalization. Use :visible instead of :active. Fix `ruby-indent-exp' reference. Add menu items for the generic commands that are used with SMIE. (ruby-do-end-to-brace): Insert space after `{'. --- lisp/ChangeLog | 8 ++++++++ lisp/progmodes/ruby-mode.el | 21 ++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5bd6b2b9d1b..07de60c735d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2013-10-25 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-mode-menu): Use proper + capitalization. Use :visible instead of :active. Fix + `ruby-indent-exp' reference. Add menu items for the generic + commands that are used with SMIE. + (ruby-do-end-to-brace): Insert space after `{'. + 2013-10-25 John Anthony * progmodes/ruby-mode.el (ruby-mode-menu): Add a menu. (Bug#15600) diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 1ea6c3c7c99..dbca0d4dd26 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -165,16 +165,22 @@ This should only be called after matching against `ruby-here-doc-beg-re'." ruby-mode-map "Ruby Mode Menu" '("Ruby" - ["Beginning Of Block" ruby-beginning-of-block t] - ["End Of Block" ruby-end-of-block t] + ["Beginning of Block" ruby-beginning-of-block t] + ["End of Block" ruby-end-of-block t] ["Toggle Block" ruby-toggle-block t] "--" ["Backward Sexp" ruby-backward-sexp - :active (not ruby-use-smie)] + :visible (not ruby-use-smie)] + ["Backward Sexp" backward-sexp + :visible ruby-use-smie] ["Forward Sexp" ruby-forward-sexp - :active (not ruby-use-smie)] - ["Indent Sexp" ruby-indent-sexp - :active (not ruby-use-smie)])) + :visible (not ruby-use-smie)] + ["Forward Sexp" forward-sexp + :visible ruby-use-smie] + ["Indent Sexp" ruby-indent-exp + :visible (not ruby-use-smie)] + ["Indent Sexp" prog-indent-sexp + :visible ruby-use-smie])) (defvar ruby-mode-syntax-table (let ((table (make-syntax-table))) @@ -1461,7 +1467,8 @@ See `add-log-current-defun-function'." (insert "}") (goto-char orig) (delete-char 2) - (insert "{") + ;; Maybe this should be customizable, let's see if anyone asks. + (insert "{ ") (setq beg-marker (point-marker)) (when (looking-at "\\s +|") (delete-char (- (match-end 0) (match-beginning 0) 1)) -- 2.39.5