From: Paul Eggert <eggert@cs.ucla.edu>
To: rms@gnu.org
Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109264: * alloc.c (Fgarbage_collect): Indent as per usual Emacs style.
Date: Mon, 30 Jul 2012 23:24:35 -0700 [thread overview]
Message-ID: <50177A23.3070509@cs.ucla.edu> (raw)
In-Reply-To: <E1Sw5b1-0004NF-Qw@fencepost.gnu.org>
On 07/30/2012 11:06 PM, Richard Stallman wrote:
> Although the = in an initializer is not strictly speaking an infix
> operator, the style rule still applies to it.
Ah, OK, then I'll use that style in Emacs from now on.
In Emacs, several hundred initializers do not follow that style rule;
should these be changed? Here are a few examples of the sort of changes
that I imagine would be needed.
=== modified file 'lib-src/ebrowse.c'
*** lib-src/ebrowse.c 2012-06-24 17:39:14 +0000
--- lib-src/ebrowse.c 2012-07-31 06:09:55 +0000
***************
*** 306,329 ****
/* Command line options structure for getopt_long. */
! struct option options[] =
! {
! {"append", no_argument, NULL, 'a'},
! {"files", required_argument, NULL, 'f'},
! {"help", no_argument, NULL, -2},
! {"min-regexp-length", required_argument, NULL, 'm'},
! {"max-regexp-length", required_argument, NULL, 'M'},
! {"no-nested-classes", no_argument, NULL, 'n'},
! {"no-regexps", no_argument, NULL, 'x'},
! {"no-structs-or-unions", no_argument, NULL, 's'},
! {"output-file", required_argument, NULL, 'o'},
! {"position-info", required_argument, NULL, 'p'},
! {"search-path", required_argument, NULL, 'I'},
! {"verbose", no_argument, NULL, 'v'},
! {"version", no_argument, NULL, -3},
! {"very-verbose", no_argument, NULL, 'V'},
! {NULL, 0, NULL, 0}
! };
/* Semantic values of tokens. Set by yylex.. */
--- 306,329 ----
/* Command line options structure for getopt_long. */
! struct option options[]
! = {
! {"append", no_argument, NULL, 'a'},
! {"files", required_argument, NULL, 'f'},
! {"help", no_argument, NULL, -2},
! {"min-regexp-length", required_argument, NULL, 'm'},
! {"max-regexp-length", required_argument, NULL, 'M'},
! {"no-nested-classes", no_argument, NULL, 'n'},
! {"no-regexps", no_argument, NULL, 'x'},
! {"no-structs-or-unions", no_argument, NULL, 's'},
! {"output-file", required_argument, NULL, 'o'},
! {"position-info", required_argument, NULL, 'p'},
! {"search-path", required_argument, NULL, 'I'},
! {"verbose", no_argument, NULL, 'v'},
! {"version", no_argument, NULL, -3},
! {"very-verbose", no_argument, NULL, 'V'},
! {NULL, 0, NULL, 0}
! };
/* Semantic values of tokens. Set by yylex.. */
=== modified file 'lib-src/emacsclient.c'
*** lib-src/emacsclient.c 2012-07-11 05:44:06 +0000
--- lib-src/emacsclient.c 2012-07-31 06:15:26 +0000
***************
*** 172,199 ****
static _Noreturn void print_help_and_exit (void);
! struct option longopts[] =
! {
! { "no-wait", no_argument, NULL, 'n' },
! { "quiet", no_argument, NULL, 'q' },
! { "eval", no_argument, NULL, 'e' },
! { "help", no_argument, NULL, 'H' },
! { "version", no_argument, NULL, 'V' },
! { "tty", no_argument, NULL, 't' },
! { "nw", no_argument, NULL, 't' },
! { "create-frame", no_argument, NULL, 'c' },
! { "alternate-editor", required_argument, NULL, 'a' },
! { "frame-parameters", required_argument, NULL, 'F' },
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
! { "socket-name", required_argument, NULL, 's' },
#endif
! { "server-file", required_argument, NULL, 'f' },
#ifndef WINDOWSNT
! { "display", required_argument, NULL, 'd' },
#endif
! { "parent-id", required_argument, NULL, 'p' },
! { 0, 0, 0, 0 }
! };
\f
/* Like malloc but get fatal error if memory is exhausted. */
--- 172,199 ----
static _Noreturn void print_help_and_exit (void);
! struct option longopts[]
! = {
! { "no-wait", no_argument, NULL, 'n' },
! { "quiet", no_argument, NULL, 'q' },
! { "eval", no_argument, NULL, 'e' },
! { "help", no_argument, NULL, 'H' },
! { "version", no_argument, NULL, 'V' },
! { "tty", no_argument, NULL, 't' },
! { "nw", no_argument, NULL, 't' },
! { "create-frame", no_argument, NULL, 'c' },
! { "alternate-editor", required_argument, NULL, 'a' },
! { "frame-parameters", required_argument, NULL, 'F' },
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
! { "socket-name", required_argument, NULL, 's' },
#endif
! { "server-file", required_argument, NULL, 'f' },
#ifndef WINDOWSNT
! { "display", required_argument, NULL, 'd' },
#endif
! { "parent-id", required_argument, NULL, 'p' },
! { 0, 0, 0, 0 }
! };
\f
/* Like malloc but get fatal error if memory is exhausted. */
=== modified file 'lib-src/etags.c'
*** lib-src/etags.c 2012-07-10 22:42:22 +0000
--- lib-src/etags.c 2012-07-31 06:13:41 +0000
***************
*** 460,525 ****
static regexp *p_head; /* list of all regexps */
static bool need_filebuf; /* some regexes are multi-line */
! static struct option longopts[] =
! {
! { "append", no_argument, NULL, 'a' },
! { "packages-only", no_argument, &packages_only, TRUE },
! { "c++", no_argument, NULL, 'C' },
! { "declarations", no_argument, &declarations, TRUE },
! { "no-line-directive", no_argument, &no_line_directive, TRUE },
! { "no-duplicates", no_argument, &no_duplicates, TRUE },
! { "help", no_argument, NULL, 'h' },
! { "help", no_argument, NULL, 'H' },
! { "ignore-indentation", no_argument, NULL, 'I' },
! { "language", required_argument, NULL, 'l' },
! { "members", no_argument, &members, TRUE },
! { "no-members", no_argument, &members, FALSE },
! { "output", required_argument, NULL, 'o' },
! { "regex", required_argument, NULL, 'r' },
! { "no-regex", no_argument, NULL, 'R' },
! { "ignore-case-regex", required_argument, NULL, 'c' },
! { "parse-stdin", required_argument, NULL, STDIN },
! { "version", no_argument, NULL, 'V' },
!
! #if CTAGS /* Ctags options */
! { "backward-search", no_argument, NULL, 'B' },
! { "cxref", no_argument, NULL, 'x' },
! { "defines", no_argument, NULL, 'd' },
! { "globals", no_argument, &globals, TRUE },
! { "typedefs", no_argument, NULL, 't' },
! { "typedefs-and-c++", no_argument, NULL, 'T' },
! { "update", no_argument, NULL, 'u' },
! { "vgrind", no_argument, NULL, 'v' },
! { "no-warn", no_argument, NULL, 'w' },
!
! #else /* Etags options */
! { "no-defines", no_argument, NULL, 'D' },
! { "no-globals", no_argument, &globals, FALSE },
! { "include", required_argument, NULL, 'i' },
! #endif
! { NULL }
! };
!
! static compressor compressors[] =
! {
! { "z", "gzip -d -c"},
! { "Z", "gzip -d -c"},
! { "gz", "gzip -d -c"},
! { "GZ", "gzip -d -c"},
! { "bz2", "bzip2 -d -c" },
! { "xz", "xz -d -c" },
! { NULL }
! };
/*
* Language stuff.
*/
/* Ada code */
! static const char *Ada_suffixes [] =
! { "ads", "adb", "ada", NULL };
! static const char Ada_help [] =
! "In Ada code, functions, procedures, packages, tasks and types are\n\
tags. Use the `--packages-only' option to create tags for\n\
packages only.\n\
Ada tag names have suffixes indicating the type of entity:\n\
--- 460,525 ----
static regexp *p_head; /* list of all regexps */
static bool need_filebuf; /* some regexes are multi-line */
! static struct option longopts[]
! = {
! { "append", no_argument, NULL, 'a' },
! { "packages-only", no_argument, &packages_only, TRUE },
! { "c++", no_argument, NULL, 'C' },
! { "declarations", no_argument, &declarations, TRUE },
! { "no-line-directive", no_argument, &no_line_directive, TRUE },
! { "no-duplicates", no_argument, &no_duplicates, TRUE },
! { "help", no_argument, NULL, 'h' },
! { "help", no_argument, NULL, 'H' },
! { "ignore-indentation", no_argument, NULL, 'I' },
! { "language", required_argument, NULL, 'l' },
! { "members", no_argument, &members, TRUE },
! { "no-members", no_argument, &members, FALSE },
! { "output", required_argument, NULL, 'o' },
! { "regex", required_argument, NULL, 'r' },
! { "no-regex", no_argument, NULL, 'R' },
! { "ignore-case-regex", required_argument, NULL, 'c' },
! { "parse-stdin", required_argument, NULL, STDIN },
! { "version", no_argument, NULL, 'V' },
!
! #if CTAGS /* Ctags options */
! { "backward-search", no_argument, NULL, 'B' },
! { "cxref", no_argument, NULL, 'x' },
! { "defines", no_argument, NULL, 'd' },
! { "globals", no_argument, &globals, TRUE },
! { "typedefs", no_argument, NULL, 't' },
! { "typedefs-and-c++", no_argument, NULL, 'T' },
! { "update", no_argument, NULL, 'u' },
! { "vgrind", no_argument, NULL, 'v' },
! { "no-warn", no_argument, NULL, 'w' },
!
! #else /* Etags options */
! { "no-defines", no_argument, NULL, 'D' },
! { "no-globals", no_argument, &globals, FALSE },
! { "include", required_argument, NULL, 'i' },
! #endif
! { NULL }
! };
!
! static compressor compressors[]
! = {
! { "z", "gzip -d -c"},
! { "Z", "gzip -d -c"},
! { "gz", "gzip -d -c"},
! { "GZ", "gzip -d -c"},
! { "bz2", "bzip2 -d -c" },
! { "xz", "xz -d -c" },
! { NULL }
! };
/*
* Language stuff.
*/
/* Ada code */
! static const char *Ada_suffixes []
! = { "ads", "adb", "ada", NULL };
! static const char Ada_help []
! = "In Ada code, functions, procedures, packages, tasks and types are\n\
tags. Use the `--packages-only' option to create tags for\n\
packages only.\n\
Ada tag names have suffixes indicating the type of entity:\n\
***************
*** 536,552 ****
will just search for any tag `bidule'.";
/* Assembly code */
! static const char *Asm_suffixes [] =
! { "a", /* Unix assembler */
! "asm", /* Microcontroller assembly */
! "def", /* BSO/Tasking definition includes */
! "inc", /* Microcontroller include files */
! "ins", /* Microcontroller include files */
! "s", "sa", /* Unix assembler */
! "S", /* cpp-processed Unix assembler */
! "src", /* BSO/Tasking C compiler output */
! NULL
! };
static const char Asm_help [] =
"In assembler code, labels appearing at the beginning of a line,\n\
followed by a colon, are tags.";
--- 536,553 ----
will just search for any tag `bidule'.";
/* Assembly code */
! static const char *Asm_suffixes []
! = {
! "a", /* Unix assembler */
! "asm", /* Microcontroller assembly */
! "def", /* BSO/Tasking definition includes */
! "inc", /* Microcontroller include files */
! "ins", /* Microcontroller include files */
! "s", "sa", /* Unix assembler */
! "S", /* cpp-processed Unix assembler */
! "src", /* BSO/Tasking C compiler output */
! NULL
! };
static const char Asm_help [] =
"In assembler code, labels appearing at the beginning of a line,\n\
followed by a colon, are tags.";
next prev parent reply other threads:[~2012-07-31 6:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1SvWBA-00078u-9A@vcs.savannah.gnu.org>
2012-07-30 22:33 ` [Emacs-diffs] /srv/bzr/emacs/trunk r109264: * alloc.c (Fgarbage_collect): Indent as per usual Emacs style Stefan Monnier
2012-07-30 22:47 ` Paul Eggert
2012-07-30 23:11 ` Stefan Monnier
2012-07-30 23:32 ` Paul Eggert
2012-07-31 6:06 ` Richard Stallman
2012-07-31 6:24 ` Paul Eggert [this message]
2012-07-31 22:31 ` Richard Stallman
2012-07-31 23:28 ` Paul Eggert
2012-08-01 3:39 ` Richard Stallman
2012-08-01 23:31 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50177A23.3070509@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
--cc=rms@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.