From 0b9dc80d493cb911a2d9d4152433b5998a40d556 Mon Sep 17 00:00:00 2001 From: Micah Chalmer Date: Thu, 29 Aug 2013 23:28:36 -0400 Subject: [PATCH] One indent after open paren with no argument --- src/etc/emacs/rust-mode.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el index b79d09395b0fb..8cf6c45597946 100644 --- a/src/etc/emacs/rust-mode.el +++ b/src/etc/emacs/rust-mode.el @@ -68,7 +68,13 @@ (let ((pt (point))) (rust-rewind-irrelevant) (backward-up-list) - (if (looking-at "[[(]") + (if (and + (looking-at "[[(]") + ; We don't want to indent out to the open bracket if the + ; open bracket ends the line + (save-excursion + (forward-char) + (not (looking-at "[[:space:]]*\\(?://.*\\)?$")))) (+ 1 (current-column)) (progn (goto-char pt) @@ -80,7 +86,7 @@ (beginning-of-line) (rust-rewind-irrelevant) (end-of-line) - (if (looking-back "[,;{}][[:space:]]*\\(?://.*\\)?") + (if (looking-back "[,;{}(][[:space:]]*\\(?://.*\\)?") (* rust-indent-offset level) (back-to-indentation) (if (looking-at "#")