[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode 1962971 044/486: Correct indent with trailing sp
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode 1962971 044/486: Correct indent with trailing spaces/comments on previous line |
Date: |
Sat, 7 Aug 2021 09:24:45 -0400 (EDT) |
branch: elpa/rust-mode
commit 1962971cb2f2399528ba82897f210fdf3acf3c5e
Author: Micah Chalmer <micah@micahchalmer.net>
Commit: Micah Chalmer <micah@micahchalmer.net>
Correct indent with trailing spaces/comments on previous line
---
rust-mode.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/rust-mode.el b/rust-mode.el
index e0f2516..b79d093 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -62,7 +62,8 @@
;; - { means indent to either nesting-level *
rust-indent-offset,
;; or one further indent from that if either current line
;; begins with 'else', or previous line didn't end in
- ;; semi, comma or brace, and wasn't an attribute. PHEW.
+ ;; semi, comma or brace (other than whitespace and line
+ ;; comments) , and wasn't an attribute. PHEW.
((> level 0)
(let ((pt (point)))
(rust-rewind-irrelevant)
@@ -79,7 +80,7 @@
(beginning-of-line)
(rust-rewind-irrelevant)
(end-of-line)
- (if (looking-back "[{};,]")
+ (if (looking-back "[,;{}][[:space:]]*\\(?://.*\\)?")
(* rust-indent-offset level)
(back-to-indentation)
(if (looking-at "#")
- [nongnu] elpa/rust-mode bc77e16 240/486: remove emacs 23 support, (continued)
- [nongnu] elpa/rust-mode bc77e16 240/486: remove emacs 23 support, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 620d718 257/486: Fix #160, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode cffb950f2 258/486: [master] Remove redundant progn., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b3b0f78 259/486: Merge pull request #161 from Fanael/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode ba5ff90 260/486: Merge pull request #159 from hotpxl/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode f73f321 264/486: Merge pull request #163 from Wilfred/preserve_point_rustfmt, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode cc59c83 270/486: Recognize imenu items starting with "unsafe", ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode fba7714 271/486: Handle comments when indenting method chains, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 7b32066 032/486: rust-mode.el uses the 'cl macros, so it should actually require them, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 2e671d9 040/486: revisions to emacs compilation regexp, more readable and robust., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 1962971 044/486: Correct indent with trailing spaces/comments on previous line,
ELPA Syncer <=
- [nongnu] elpa/rust-mode f0e4edc 001/486: Move emacs mode into tree, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 6aa0a91 002/486: rust-mode: tag -> enum. Closes #1577, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 3dbae26 008/486: Remove "iface" from vim and emacs modes., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode d0d3911 007/486: For #2229, recognize 'again' in place of 'cont', final change pending snapshot., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 50e55e4 012/486: Add 'static' to rust-mode.el., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 256de23 011/486: emacs: add match as keyword, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 3a65c56 018/486: update readme, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 8d6ea12 019/486: Add author to meta-data, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 4b56ffe 020/486: update readme with package.el installation steps, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 58c47a3 021/486: add instructions for install from MELPA, ELPA Syncer, 2021/08/07