[elpa] master c0e5823: Fix maintainer address

2016-01-25 Thread Stefan Monnier
branch: master
commit c0e5823c5b1cbc08f20527ffb8522d6030b5a54c
Author: Stefan Monnier 
Commit: Stefan Monnier 

Fix maintainer address
---
 packages/ioccur/ioccur.el |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ioccur/ioccur.el b/packages/ioccur/ioccur.el
index 521d3de..aa2b23d 100644
--- a/packages/ioccur/ioccur.el
+++ b/packages/ioccur/ioccur.el
@@ -1,8 +1,8 @@
 ;;; ioccur.el --- Incremental occur
 
-;; Copyright (C) 2010-2013  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2013, 2016  Free Software Foundation, Inc.
 
-;; Author: Thierry Volpiatto 
+;; Author: Thierry Volpiatto 
 ;; X-URL: https://github.com/thierryvolpiatto/ioccur
 ;; Version: 2.4
 ;; Compatibility: GNU Emacs >=22.3



[elpa] master ad2214a: * sm-c-mode/sm-c-mode.el (sm-c-smie-rules): Improve indent of enum's {...}

2016-01-25 Thread Stefan Monnier
branch: master
commit ad2214a5ea10ea8d5e5075bc0a518d9c474321d6
Author: Stefan Monnier 
Commit: Stefan Monnier 

* sm-c-mode/sm-c-mode.el (sm-c-smie-rules): Improve indent of enum's {...}
---
 packages/sm-c-mode/sm-c-mode.el |   10 ++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/packages/sm-c-mode/sm-c-mode.el b/packages/sm-c-mode/sm-c-mode.el
index a643829..54b9a54 100644
--- a/packages/sm-c-mode/sm-c-mode.el
+++ b/packages/sm-c-mode/sm-c-mode.el
@@ -640,6 +640,16 @@ if INNER is non-nil, it stops at the innermost one."
   0
 (funcall smie-rules-function :elem 'basic))
   (smie-indent-virtual
+  ((and (member tok '("enum" "struct"))
+;; Make sure that the {...} is about this struct/enum, as
+;; opposed to "struct foo *get_foo () {...}"!
+(save-excursion
+  (smie-indent-forward-token)
+  (smie-indent-forward-token)
+  (forward-comment (point-max))
+  (>= (point) pos)))
+   `(column . ,(+ (funcall smie-rules-function :elem 'basic)
+  (smie-indent-virtual
   ((or (member tok sm-c-paren-block-keywords)
(equal tok "do"))
nil)