emacs/lisp, 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
Merge from origin/emacs-25 2016-04-11T16:07:15+00:00 Paul Eggert 2016-04-11T16:07:15+00:00 ff2c76476479c43607825df01c78d8f239caefb5 80128a7 Fix stability confusion in sort-tests 1e4aa42 Avoid describe-key error with lambdas a05fb21 * lisp/emacs-lisp/package.el (package-install-selected-packag... f501116 Sync with gnulib c4963f9 Fix doc for Universal Time 
80128a7 Fix stability confusion in sort-tests
1e4aa42 Avoid describe-key error with lambdas
a05fb21 * lisp/emacs-lisp/package.el (package-install-selected-packag...
f501116 Sync with gnulib
c4963f9 Fix doc for Universal Time
Fix last change on 2016-01-02 2016-04-11T12:20:13+00:00 Leo Liu 2016-04-11T12:19:38+00:00 bb30fa951c23911f5c3a14d9d46d1a3260a50fe0 * lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Move `cl-errs-re' before `lisp--el-match-keyword'; don't use `prepend' which highlights `cl-errs-re' even in comments or strings. 
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Move
  `cl-errs-re' before `lisp--el-match-keyword'; don't use `prepend'
  which highlights `cl-errs-re' even in comments or strings.
; Spelling fixes 2016-04-11T06:55:05+00:00 Paul Eggert 2016-04-11T06:54:33+00:00 488a72f8e390d5da37da3bb7792e1d6ca5079b07 






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.







Fix alignement rule for CSS
2016-04-10T21:31:19+00:00

Etienne Prud'homme

2016-04-06T21:05:41+00:00

d6ea6453f3d1696b9e6cd0a0222fc77dc646365c

* lisp/align.el (align-rules-list): Support CSS properties that have
multiple words.

Copyright-paperwork-exempt: yes





* lisp/align.el (align-rules-list): Support CSS properties that have
multiple words.

Copyright-paperwork-exempt: yes







Avoid crashes due to unreasonably large or small text scaling
2016-04-10T16:50:39+00:00

Eli Zaretskii

2016-04-10T16:50:39+00:00

0e7bcec103073eceecc2621c19e4d290b2d97e8d

* lisp/face-remap.el (text-scale-min-amount)
(text-scale-max-amount): New functions.
(text-scale-set, text-scale-increase): Use them to limit the text
scaling to a reasonable range of values.  (Bug#23259)





* lisp/face-remap.el (text-scale-min-amount)
(text-scale-max-amount): New functions.
(text-scale-set, text-scale-increase): Use them to limit the text
scaling to a reasonable range of values.  (Bug#23259)







New custom option for overriding mailcap choices
2016-04-10T16:15:45+00:00

Tassilo Horn

2016-04-10T07:39:51+00:00

b4b83fa2ba52cd5398e3b9d085b4afea679d1515

* lisp/net/mailcap.el (mailcap--get-user-mime-data): New function.
(mailcap--set-user-mime-data): New function.
(mailcap-user-mime-data): New customization option.
(mailcap-select-preferred-viewer): New function.
(mailcap-mime-info): Use it.

* doc/misc/emacs-mime.texi (mailcap): Document `mailcap-user-mime-data'.





* lisp/net/mailcap.el (mailcap--get-user-mime-data): New function.
(mailcap--set-user-mime-data): New function.
(mailcap-user-mime-data): New customization option.
(mailcap-select-preferred-viewer): New function.
(mailcap-mime-info): Use it.

* doc/misc/emacs-mime.texi (mailcap): Document `mailcap-user-mime-data'.







Improve documentation of 'with-eval-after-load'
2016-04-10T16:15:13+00:00

Eli Zaretskii

2016-04-10T16:15:13+00:00

85f257c9bc5b89043b2d7019e6763e552f4c89e7

* lisp/subr.el (with-eval-after-load): Doc fix.  (Bug#23258)





* lisp/subr.el (with-eval-after-load): Doc fix.  (Bug#23258)