[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  7fe760161df54cfbb2bdbc90a09a20ef0e7a6b30 (commit)
      from  1f3f79e55a9c8257efb406a43d0a925f1fba25e6 (commit)


- Log -----------------------------------------------------------------
commit 7fe760161df54cfbb2bdbc90a09a20ef0e7a6b30
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 22 09:33:29 2018 +0200

    OpenSSL-II style for emacs: don't indent because of extern block
    
    We don't want an indentation step inside a 'extern "C" {' .. '}'
    block.  Apparently, cc-mode has a c-offsets-alist keyword to allow
    exactly this.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6557)
    
    (cherry picked from commit 8973112884e67feb46384b573db14e62ad18d4cb)

-----------------------------------------------------------------------

Summary of changes:
 doc/openssl-c-indent.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/openssl-c-indent.el b/doc/openssl-c-indent.el
index cca1183..852f794 100644
--- a/doc/openssl-c-indent.el
+++ b/doc/openssl-c-indent.el
@@ -54,6 +54,7 @@
                 (arglist-close . c-lineup-arglist)           ; From "gnu" style
                 (inline-open . 0)                            ; From "gnu" style
                 (brace-list-open . +)                        ; From "gnu" style
+                (inextern-lang . 0)     ; Don't indent inside extern block
                 (topmost-intro-cont first c-lineup-topmost-intro-cont
                                     c-lineup-gnu-DEFUN-intro-cont) ; From "gnu" style
                 )