emacs/lisp/progmodes, branch dima_regex_embedded_modifiers Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from origin/emacs-25 2016-04-11T16:07:16+00:00 Paul Eggert 2016-04-11T16:07:16+00:00 435da5d2955ce35be4785b7d46566ed9b42ea9fb b134c20 Sync with gnulib bb30fa9 Fix last change on 2016-01-02 488a72f ; Spelling fixes 9b1aab9 Port run-prolog EMACS to SWI-Prolog 7.2.3 0e7bcec Avoid crashes due to unreasonably large or small text scaling 85f257c Improve documentation of 'with-eval-after-load' 668c7bc Improve handling of non-ASCII characters in Git log messages b570769 Remove undefined behavior in OS X dumper. 97211f3 Fix clipping of xwidgets e87fbc0 Improve Lisp-level documentation of tooltips 9f1786e Faces names should not end in "-face". 3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings. a1f221b Comint and compile no longer set EMACS 5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2... a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... c93ae7a Allow to customize names of executables used by grep.el f6497c6 Set locale encoding to UTF-8 when run from OS X GUI. 7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt a3f1ac2 Avoid infinite loop in 'studlify-word' f36df4b Don’t recommend obsolete EMACS env var fb0b531 * lisp/emacs-lisp/package.el: Change from a few days ago need... 
b134c20 Sync with gnulib
bb30fa9 Fix last change on 2016-01-02
488a72f ; Spelling fixes
9b1aab9 Port run-prolog EMACS to SWI-Prolog 7.2.3
0e7bcec Avoid crashes due to unreasonably large or small text scaling
85f257c Improve documentation of 'with-eval-after-load'
668c7bc Improve handling of non-ASCII characters in Git log messages
b570769 Remove undefined behavior in OS X dumper.
97211f3 Fix clipping of xwidgets
e87fbc0 Improve Lisp-level documentation of tooltips
9f1786e Faces names should not end in "-face".
3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings.
a1f221b Comint and compile no longer set EMACS
5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2...
a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
c93ae7a Allow to customize names of executables used by grep.el
f6497c6 Set locale encoding to UTF-8 when run from OS X GUI.
7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
a3f1ac2 Avoid infinite loop in 'studlify-word'
f36df4b Don’t recommend obsolete EMACS env var
fb0b531 * lisp/emacs-lisp/package.el: Change from a few days ago need...
Merge from origin/emacs-25 2016-04-11T16:07:16+00:00 Paul Eggert 2016-04-11T16:07:16+00:00 d1e2b10afa2df313e029b3faeeb0d694fd6e0fbc 96d9e78 Fix "Beginning of buffer" error in forward-page 20686f7 Add a `transient' project type 
96d9e78 Fix "Beginning of buffer" error in forward-page
20686f7 Add a `transient' project type
Port run-prolog EMACS to SWI-Prolog 7.2.3 2016-04-11T05:47:21+00:00 Paul Eggert 2016-04-11T05:47:03+00:00 9b1aab91fc479be9a923af1874801eadc1c19b20 * lisp/progmodes/prolog.el (prolog-ensure-process): Work around incompatibility of SWI-Prolog 7.2.3 and earlier with the new way of dealing with the EMACS and INSIDE_EMACS environment variables. 
* lisp/progmodes/prolog.el (prolog-ensure-process):
Work around incompatibility of SWI-Prolog 7.2.3 and earlier
with the new way of dealing with the EMACS and INSIDE_EMACS
environment variables.
Comint and compile no longer set EMACS 2016-04-08T20:40:01+00:00 Paul Eggert 2016-04-08T20:39:17+00:00 a1f221bd82eb4393ccba83a361b435a4992b532a This mostly restores the change that I reverted on March 23, fixing most of Bug#20202. The only part of the change that is still reverted is the change to M-x term, where compatibility with current Bash constrains us from moving too quickly (Bug#20484). Problem reported by Phillip Lord in: http://bugs.gnu.org/20484#108 * etc/NEWS: Document this. * lisp/comint.el (comint-exec-1): * lisp/net/tramp-sh.el (tramp-remote-process-environment): * lisp/progmodes/compile.el (compilation-start): Don’t set EMACS=t in the subsidiary process. 
This mostly restores the change that I reverted on March 23,
fixing most of Bug#20202.  The only part of the change that is
still reverted is the change to M-x term, where compatibility with
current Bash constrains us from moving too quickly (Bug#20484).
Problem reported by Phillip Lord in: http://bugs.gnu.org/20484#108
* etc/NEWS: Document this.
* lisp/comint.el (comint-exec-1):
* lisp/net/tramp-sh.el (tramp-remote-process-environment):
* lisp/progmodes/compile.el (compilation-start):
Don’t set EMACS=t in the subsidiary process.
Allow to customize names of executables used by grep.el 2016-04-08T13:54:18+00:00 Eli Zaretskii 2016-04-08T13:54:18+00:00 c93ae7a1e5a94541189a8f36984014344d561ffc * lisp/progmodes/grep.el (grep-find-program): Renamed from 'find-program', which was a variable. All uses changed. (grep-xargs-program): Renamed from 'xargs-program', which was a variable. All uses changed. (grep-program): Now a defcustom rather than a simple variable. (Bug#23219) 
* lisp/progmodes/grep.el (grep-find-program): Renamed from
'find-program', which was a variable.  All uses changed.
(grep-xargs-program): Renamed from 'xargs-program', which was a
variable.  All uses changed.
(grep-program): Now a defcustom rather than a simple variable.
(Bug#23219)
Add a `transient' project type 2016-04-06T23:02:26+00:00 Dmitry Gutov 2016-04-06T23:02:13+00:00 20686f7a6430ef37f17b3866f14e7dc3095c1524 * lisp/progmodes/project.el (project-roots): Implement for the `transient' project type (bug#23224). (project-current): Instead of signaling an error, return a transient project instance rooted in the chosen directory. 
* lisp/progmodes/project.el (project-roots): Implement for the
`transient' project type (bug#23224).
(project-current): Instead of signaling an error, return a
transient project instance rooted in the chosen directory.
Add new keywords of Python 3.5 2016-04-06T08:51:09+00:00 Lele Gaifax 2016-04-06T08:38:23+00:00 1f6b0bc1512de08fd542df0234476788038c8c82 Python 3.5, released in mid September 2015, introduced a few new keywords to better support asynchronous code, "async" and "await" in particular. See https://www.python.org/dev/peps/pep-0492/ for details. (Bug#21783) * lisp/progmodes/python.el (python-rx-constituents): Add async def/for/with as block-start and async def as defun. * lisp/progmodes/python.el (python-font-lock-keywords): Add async def/for/with as keyword. * test/automated/python-tests.el (python-indent-after-async-block-1, python-indent-after-async-block-2, python-indent-after-async-block-3, python-nav-beginning-of-defun-3): New tests to test indentation and navigation for the async keyword. 
Python 3.5, released in mid September 2015, introduced a few new
keywords to better support asynchronous code, "async" and "await"
in particular. See https://www.python.org/dev/peps/pep-0492/ for
details. (Bug#21783)
* lisp/progmodes/python.el (python-rx-constituents): Add async
def/for/with as block-start and async def as defun.
* lisp/progmodes/python.el (python-font-lock-keywords): Add async
def/for/with as keyword.
* test/automated/python-tests.el (python-indent-after-async-block-1,
python-indent-after-async-block-2, python-indent-after-async-block-3,
python-nav-beginning-of-defun-3): New tests to test indentation and
navigation for the async keyword.
Spelling fixes 2016-04-04T06:17:09+00:00 Paul Eggert 2016-04-04T06:16:35+00:00 a11756ad0e2ee719266c0081150c20996cce8e0d 






Revert "Add `r'/`l' grep command history commands"
2016-04-03T22:46:53+00:00

John Wiegley

2016-04-03T22:46:53+00:00

0695108b9e2d5ed6d424f241af35947f87578975

This reverts commit a32eea60ac90d367435860fe3a10bf843e6f497c.





This reverts commit a32eea60ac90d367435860fe3a10bf843e6f497c.







Revert "Restore the point in grep buffers when traversing the history"
2016-04-03T22:46:52+00:00

John Wiegley

2016-04-03T22:46:52+00:00

3a5f146e5abd79c7fb1810f5af99c7d448012604

This reverts commit f7c5f79ca565d3ef3feeb1e0af5ca261f1bcf58a.





This reverts commit f7c5f79ca565d3ef3feeb1e0af5ca261f1bcf58a.