The branch OpenSSL_1_0_1-stable has been updated via c88f65f5b5cdc01fc16ca38084aebfc141dcba03 (commit) via fc90ab42db6de59f2d1d9ea35141963c9db98083 (commit) via 8d677c10f91af886b229207dbc1119a1e98da619 (commit) from cb5320014d18633dcb444d09948f5bdac8f48c0d (commit)
- Log ----------------------------------------------------------------- commit c88f65f5b5cdc01fc16ca38084aebfc141dcba03 Author: Richard Levitte <rich...@levitte.org> Date: Mon Aug 31 17:58:53 2015 +0200 Remove auto-fill-mode Apparently, emacs sees changes to auto-fill-mode as insecure Reviewed-by: Rich Salz <rs...@openssl.org> (cherry picked from commit 6dc08048d93ff35de882878f190ae49aa698b5d2) commit fc90ab42db6de59f2d1d9ea35141963c9db98083 Author: Richard Levitte <rich...@levitte.org> Date: Mon Aug 31 17:25:17 2015 +0200 Add an example .dir-locals.el This file, when copied to .dir-locals.el in the OpenSSL source top, will make sure that the CC mode style "OpenSSL-II" will be used for all C files. Additionally, I makes sure that tabs are never used as indentation character, regardless of the emacs mode, and that the fill column is 78. Reviewed-by: Rich Salz <rs...@openssl.org> (cherry picked from commit 0927f0d822b1e0f55cb7d8bacf9004ad3495514b) commit 8d677c10f91af886b229207dbc1119a1e98da619 Author: Richard Levitte <rich...@levitte.org> Date: Mon Aug 31 17:12:37 2015 +0200 Add emacs CC mode style for OpenSSL This hopefully conforms closely enough to the current code style. Reviewed-by: Rich Salz <rs...@openssl.org> (cherry picked from commit d9b3554b2d9724bc2d1621a026ddaf0223e2d191) ----------------------------------------------------------------------- Summary of changes: doc/dir-locals.example.el | 15 ++++++++++++ doc/openssl-c-indent.el | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 doc/dir-locals.example.el create mode 100644 doc/openssl-c-indent.el diff --git a/doc/dir-locals.example.el b/doc/dir-locals.example.el new file mode 100644 index 0000000..79d0b01 --- /dev/null +++ b/doc/dir-locals.example.el @@ -0,0 +1,15 @@ +;;; This is an example of what a .dir-locals.el suitable for OpenSSL +;;; development could look like. +;;; +;;; Apart from setting the CC mode style to "OpenSSL-II", it also +;;; makes sure that tabs are never used for indentation in any file, +;;; and that the fill column is 78. +;;; +;;; For more information see (info "(emacs) Directory Variables") + +((nil + (indent-tabs-mode . nil) + (fill-column . 78) + ) + (c-mode + (c-file-style . "OpenSSL-II"))) diff --git a/doc/openssl-c-indent.el b/doc/openssl-c-indent.el new file mode 100644 index 0000000..144a915 --- /dev/null +++ b/doc/openssl-c-indent.el @@ -0,0 +1,62 @@ +;;; This Emacs Lisp file defines a C indentation style for OpenSSL. +;;; +;;; This definition is for the "CC mode" package, which is the default +;;; mode for editing C source files in Emacs 20, not for the older +;;; c-mode.el (which was the default in less recent releaes of Emacs 19). +;;; +;;; Recommended use is to add this line in your .emacs: +;;; +;;; (load (expand-file-name "~/PATH/TO/openssl-c-indent.el")) +;;; +;;; To activate this indentation style, visit a C file, type +;;; M-x c-set-style <RET> (or C-c . for short), and enter "eay". +;;; To toggle the auto-newline feature of CC mode, type C-c C-a. +;;; +;;; If you're a OpenSSL developer, you might find it more comfortable +;;; to have this style be permanent in your OpenSSL development +;;; directory. To have that, please perform this: +;;; +;;; M-x add-dir-local-variable <RET> c-mode <RET> c-file-style <RET> +;;; "OpenSSL-II" <RET> +;;; +;;; A new buffer with .dir-locals.el will appear. Save it (C-x C-s). +;;; +;;; Alternatively, have a look at dir-locals.example.el + +;;; For suggesting improvements, please send e-mail to levi...@openssl.org. + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Note, it could be easy to inherit from the "gnu" style... however, +;; one never knows if that style will change somewhere in the future, +;; so I've chosen to copy the "gnu" style values explicitely instead +;; and mark them with a comment. // RLevitte 2015-08-31 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(c-add-style "OpenSSL-II" + '((c-basic-offset . 4) + (indent-tabs-mode . nil) + (fill-column . 78) + (comment-column . 33) + (c-comment-only-line-offset 0 . 0) ; From "gnu" style + (c-hanging-braces-alist ; From "gnu" style + (substatement-open before after) ; From "gnu" style + (arglist-cont-nonempty)) ; From "gnu" style + (c-offsets-alist + (statement-block-intro . +) ; From "gnu" style + (knr-argdecl-intro . 0) + (knr-argdecl . 0) + (substatement-open . +) ; From "gnu" style + (substatement-label . 0) ; From "gnu" style + (label . 1) + (statement-case-open . +) ; From "gnu" style + (statement-cont . +) ; From "gnu" style + (arglist-intro . c-lineup-arglist-intro-after-paren) ; From "gnu" style + (arglist-close . c-lineup-arglist) ; From "gnu" style + (inline-open . 0) ; From "gnu" style + (brace-list-open . +) ; From "gnu" style + (topmost-intro-cont first c-lineup-topmost-intro-cont + c-lineup-gnu-DEFUN-intro-cont) ; From "gnu" style + ) + (c-special-indent-hook . c-gnu-impose-minimum) ; From "gnu" style + (c-block-comment-prefix . "* ") + )) _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits