Merge branch 'master' of git.framasoft.org:com-informatimago/emacs

Pascal J. Bourguignon [2016-11-06 11:07]
Merge branch 'master' of git.framasoft.org:com-informatimago/emacs
Filename
android-classes.el
pjb-c-style.el
diff --git a/android-classes.el b/android-classes.el
index bd0e9b9..d0235dc 100644
--- a/android-classes.el
+++ b/android-classes.el
@@ -70,7 +70,7 @@
                                                                   ".")
                                                        nil)))
                           (let ((result (quote())))
-                            (mapfiles (lambda (path)
+                            (mapfiles (lambda (path)
                                         (when (suffixp ".java" path)
                                           (push path result)))
                                       root-directory :recursive)
diff --git a/pjb-c-style.el b/pjb-c-style.el
index e5efd7c..35cc8fa 100644
--- a/pjb-c-style.el
+++ b/pjb-c-style.el
@@ -189,7 +189,7 @@
        (brace-list-entry      . 0)
        ;; Subsequent lines in an enum or static array list.

-       (brace-entry-open      . +)
+       (brace-entry-open      . 0)
        ;; Subsequent lines in an enum or static array
        ;; list that start with an open brace.
ViewGit