emacs/lisp/progmodes, branch nick.lloyd-bytecode-jit Emacs is the extensible, customizable, self-documenting real-time display editor. Allow C++ nested brace-list-entries to be better indented. 2017-02-01T20:20:09+00:00 Alan Mackenzie 2017-02-01T20:20:09+00:00 94ad13b93c6fc099a353c8eb27c00a68ee79a952 This fixes bug #24431. The key change of this bug fix is correctly analyzing nested brace lists when the opening element stands on the same line as both its introductory brace and an enclosing parameter list parenthesis. * list/progmodes/cc-align.el (c-lineup-under-anchor): New line-up function. * list/progmodes/cc-engine.el (c-looking-at-or-maybe-in-bracelist): Accept the presence of exactly an identifier between an open parenthesis and an open brace as evidence of the brace starting a brace list. (c-looking-at-statement-block): New function, extracted from c-looking-at-inexpr-block. Enhance it to analyze inner blocks recursively when needed. (c-looking-at-inexpr-block): Extract new function (see above) and call it. (c-add-stmt-syntax): Enhance, with new &optional parameter, to supply the prime syntactic symbol with a fixed anchor point. When this is used, restrict all added syntactic symbols to those having an anchor point on the same line. Add, in addition to the current additional symbols, c-brace-list-entry when needed; use c-looking-at-statement-block to determine the latter. (c-guess-basic-syntax, CASE 9D): Use c-add-stmt-syntax rather than just c-add-syntax, to assemble the syntactic context of a 'brace-list-entry, thus getting, possibly, several accompanying syntactic entries. * lisp/progmodes/cc-styles.el (c-style-alist, "gnu" style): New entry for 'brace-list-intro, namely c-lineup-arglist-intro-after-paren. * lisp/progmodes/cc-vars.el (c-offsets-alist): Change the factory default offset for 'brace-list-entry from 0 to c-lineup-under-anchor. * doc/misc/cc-mode.texi (Syntactic Symbols): Amend the definition of brace-list-intro. (Brace List Symbols): Amend the example to show the new analysis of brace lists when the first element comes on the same line as the opening brace. (Misc Line-Up): Document the new line-up function c-lineup-under-anchor. 
This fixes bug #24431.  The key change of this bug fix is correctly analyzing
nested brace lists when the opening element stands on the same line as both
its introductory brace and an enclosing parameter list parenthesis.

* list/progmodes/cc-align.el (c-lineup-under-anchor): New line-up function.

* list/progmodes/cc-engine.el (c-looking-at-or-maybe-in-bracelist): Accept the
presence of exactly an identifier between an open parenthesis and an open
brace as evidence of the brace starting a brace list.
(c-looking-at-statement-block): New function, extracted from
c-looking-at-inexpr-block.  Enhance it to analyze inner blocks recursively
when needed.
(c-looking-at-inexpr-block): Extract new function (see above) and call it.
(c-add-stmt-syntax): Enhance, with new &optional parameter, to supply the
prime syntactic symbol with a fixed anchor point.  When this is used, restrict
all added syntactic symbols to those having an anchor point on the same line.
Add, in addition to the current additional symbols, c-brace-list-entry when
needed; use c-looking-at-statement-block to determine the latter.
(c-guess-basic-syntax, CASE 9D): Use c-add-stmt-syntax rather than just
c-add-syntax, to assemble the syntactic context of a 'brace-list-entry, thus
getting, possibly, several accompanying syntactic entries.

* lisp/progmodes/cc-styles.el (c-style-alist, "gnu" style): New entry for
'brace-list-intro, namely c-lineup-arglist-intro-after-paren.

* lisp/progmodes/cc-vars.el (c-offsets-alist): Change the factory default
offset for 'brace-list-entry from 0 to c-lineup-under-anchor.

* doc/misc/cc-mode.texi (Syntactic Symbols): Amend the definition of
brace-list-intro.
(Brace List Symbols): Amend the example to show the new analysis of brace
lists when the first element comes on the same line as the opening brace.
(Misc Line-Up): Document the new line-up function c-lineup-under-anchor.
Escape dash in xref rgrep regexp 2017-01-29T21:01:42+00:00 Dmitry Gutov 2017-01-29T08:41:32+00:00 8ba236e772b64d0bb021aa691bd7eacf4b7f3ae4 * lisp/progmodes/xref.el (xref-collect-matches): Escape dash in REGEXP if it's the first character. 
* lisp/progmodes/xref.el (xref-collect-matches): Escape dash
in REGEXP if it's the first character.
Say JavaScript, not Javascript 2017-01-29T21:01:42+00:00 Dmitry Gutov 2017-01-29T08:39:55+00:00 52feecd3c71716ca5dbade0e8e6ae2f8ebf46e54 * lisp/progmodes/js.el (js-mode-map, js-syntax-propertize) (js-js-error, js-eval, js-set-js-context) (js--get-js-context): Refer to the language consistently as JavaScript. 
* lisp/progmodes/js.el (js-mode-map, js-syntax-propertize)
(js-js-error, js-eval, js-set-js-context)
(js--get-js-context):
Refer to the language consistently as JavaScript.
lisp/*.el: Fix some warnings 2017-01-29T18:34:35+00:00 Juanma Barranquero 2017-01-29T18:34:35+00:00 2f90bbb5febd44bc9ff8dbff9267f535f907c307 * lisp/battery.el (dbus-get-property): * lisp/dired-aux.el (format-spec): Declare function. * lisp/net/zeroconf.el (zeroconf-list-service-names) (zeroconf-list-service-types, zeroconf-list-services): Mark unused lexical arg. * lisp/progmodes/hideshow.el (hs-hide-block-at-point): * lisp/progmodes/sql.el (sql-end-of-statement): Pass LIMIT to 'looking-back'. 
* lisp/battery.el (dbus-get-property):
* lisp/dired-aux.el (format-spec): Declare function.

* lisp/net/zeroconf.el (zeroconf-list-service-names)
(zeroconf-list-service-types, zeroconf-list-services):
Mark unused lexical arg.

* lisp/progmodes/hideshow.el (hs-hide-block-at-point):
* lisp/progmodes/sql.el (sql-end-of-statement):
Pass LIMIT to 'looking-back'.
python-mode: Fix detection for opening blocks. 2017-01-27T01:14:19+00:00 Hong Xu 2016-12-13T01:55:25+00:00 7cb7a582f44db94292709d35f4f5474f891f03b0 * python.el (python-info-dedenter-opening-block-positions): There can't be any back-indented lines between an opening block and the current line. * python-tests.el (python-indent-electric-colon-4): Add an indent test case where there is one-more indented previous opening block. 
	* python.el (python-info-dedenter-opening-block-positions): There
	can't be any back-indented lines between an opening block and the
	current line.

	* python-tests.el (python-indent-electric-colon-4): Add an indent
	test case where there is one-more indented previous opening block.
Make use of cl-loop destructuring 2017-01-26T02:34:46+00:00 Mark Oteiza 2017-01-26T02:34:46+00:00 44765de2005fb56c5930383d6bd1e959a0102a45 * lisp/progmodes/js.el (js--get-tabs): Replace extraneous bits with destructuring. (with-js): Add declare forms. 
* lisp/progmodes/js.el (js--get-tabs): Replace extraneous bits with
destructuring.
(with-js): Add declare forms.
* lisp/progmodes/vhdl-mode.el: Avoid add-to-list on local vars 2017-01-24T16:31:11+00:00 Stefan Monnier 2017-01-24T16:31:11+00:00 52a87c894d1e2351baecaff9ff061e3b83827220 Require `cl' for `pushnew'. (vhdl-scan-project-contents, vhdl-compose-wire-components) (vhdl-uniquify): Use `pushnew' instead of `add-to-list'. 
Require `cl' for `pushnew'.
(vhdl-scan-project-contents, vhdl-compose-wire-components)
(vhdl-uniquify): Use `pushnew' instead of `add-to-list'.
Fix low-level handling of (big) C macros. 2017-01-21T15:16:49+00:00 Alan Mackenzie 2017-01-21T15:14:15+00:00 de3336051ef74e0c3069374ced5b5fc7bb9fba15 In particular, ensure that a comment detected by its syntax is not a CPP construct marked with generic comment delimiter syntax-table text properties. * lisp/progmodes/cc-engine.el (c-beginning-of-macro, c-end-of-macro): Set c-macro-cache-syntactic to nil when the cached macro changes. (c-syntactic-end-of-macro, c-no-comment-end-of-macro) (c-state-semi-pp-to-literal, c-state-full-pp-to-literal) (c-state-pp-to-literal, c-parse-ps-state-to-cache) (c-state-cache-non-literal-place, c-literal-limits, c-literal-start) (c-determine-limit): When checking a parse syntax for a comment, check that we're not in a CPP construct marked by syntax-table generic comment delimiter text property. (c-state-pp-to-literal): Change from a defsubst to a defun. * lisp/progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): Check a parse syntax as described above under cc-engine.el. 
In particular, ensure that a comment detected by its syntax is not a CPP
construct marked with generic comment delimiter syntax-table text
properties.

* lisp/progmodes/cc-engine.el (c-beginning-of-macro, c-end-of-macro): Set
c-macro-cache-syntactic to nil when the cached macro changes.
(c-syntactic-end-of-macro, c-no-comment-end-of-macro)
(c-state-semi-pp-to-literal, c-state-full-pp-to-literal)
(c-state-pp-to-literal, c-parse-ps-state-to-cache)
(c-state-cache-non-literal-place, c-literal-limits, c-literal-start)
(c-determine-limit): When checking a parse syntax for a comment, check that
we're not in a CPP construct marked by syntax-table generic comment delimiter
text property.
(c-state-pp-to-literal): Change from a defsubst to a defun.

* lisp/progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): Check a
parse syntax as described above under cc-engine.el.
Fix JS regexp literal syntax propertization in expressions 2017-01-17T22:33:20+00:00 Tom Tromey 2017-01-16T21:02:45+00:00 aa711e0a92c30914e1c68cf39251638d4faee22d Bug#25465: * lisp/progmodes/js.el (js-syntax-propertize): Recognize a regexp literal after "!", "&", and "|". test/lisp/progmodes/js-tests.el (js-mode-regexp-syntax): New test. 
Bug#25465:
* lisp/progmodes/js.el (js-syntax-propertize): Recognize a regexp
literal after "!", "&", and "|".
test/lisp/progmodes/js-tests.el (js-mode-regexp-syntax): New test.
Correct c-parse-state-get-strategy for moving HERE backward into a macro. 2017-01-14T12:38:43+00:00 Alan Mackenzie 2017-01-14T12:38:43+00:00 a23974d6e62f660259409baadd848cf6f834d88b * list/progmodes/c-engine.el (c-parse-state-get-strategy): When HERE is below its previous value, we chose strategy 'forward, and the new HERE is in a (different) macro, ensure the returned START-POINT is not above the start of the macro. 
* list/progmodes/c-engine.el (c-parse-state-get-strategy): When HERE is below
its previous value, we chose strategy 'forward, and the new HERE is in a
(different) macro, ensure the returned START-POINT is not above the start of
the macro.