emacs/admin, branch dima_regex_embedded_modifiers Emacs is the extensible, customizable, self-documenting real-time display editor. Compute a better commit message for merges 2016-03-22T23:42:42+00:00 Paul Eggert 2016-03-22T23:42:28+00:00 ddd9111a90f59abedd5065bfb7ac53454f816780 Problem reported by David Engster in: http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html * admin/gitmerge.el (gitmerge-commit-message): Truncate the computed commit message to at most 72 characters per line. (gitmerge-maybe-resume): Don’t use "-" as the commit message for merges; use the computed commit message instead. 
Problem reported by David Engster in:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html
* admin/gitmerge.el (gitmerge-commit-message):
Truncate the computed commit message to at most 72 characters per line.
(gitmerge-maybe-resume): Don’t use "-" as the commit message for
merges; use the computed commit message instead.
* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge". 2016-03-22T22:46:49+00:00 Paul Eggert 2016-03-22T22:46:30+00:00 4fab26ba5ac381ce836eff521fc56d8d28570221 






Change do-not-merge pattern to "do not merge"
2016-03-22T19:57:24+00:00

Paul Eggert

2016-03-22T19:53:54+00:00

b08237185ec044c8afff0feb88a126512b33a6d8

This should avoid the problem we recently had with
automatically-generated merge messages, while still letting people
specify commits not to merge.
* admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge".
(gitmerge-highlight-skip-regexp): Fold case when searching
for gitmerge-skip-regexp.





This should avoid the problem we recently had with
automatically-generated merge messages, while still letting people
specify commits not to merge.
* admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge".
(gitmerge-highlight-skip-regexp): Fold case when searching
for gitmerge-skip-regexp.







-
2016-03-22T18:04:36+00:00

Paul Eggert

2016-03-22T18:04:36+00:00

f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd












-
2016-03-22T18:01:30+00:00

Paul Eggert

2016-03-22T18:01:30+00:00

37b9099068c10383e959ee366a52a22516846163












Keep "merge" commits by default in gitmerge
2016-03-22T17:52:54+00:00

Paul Eggert

2016-03-22T17:52:54+00:00

6bd1e2203486ace170f5de15cf7d66146fc8cc87

* admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
causes false positives.  See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html





* admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
causes false positives.  See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html







Adjudicate review comments in abbrevs.texi
2016-03-19T11:05:55+00:00

Eli Zaretskii

2016-03-19T11:05:55+00:00

dd2737b375d1eb3d7e0acbb9544fc8c85403d65e

* doc/lispref/abbrevs.texi (Abbrev Files, Abbrev Expansion):
* doc/emacs/abbrevs.texi (Dabbrev Customization): State the
default values of variables.  Suggested by Steve Byrne
<sbb@penguinis.org>.  (Bug#23016)

* admin/release-process (Check manuals): Mark files reviewed by
Steve Byrne.





* doc/lispref/abbrevs.texi (Abbrev Files, Abbrev Expansion):
* doc/emacs/abbrevs.texi (Dabbrev Customization): State the
default values of variables.  Suggested by Steve Byrne
<sbb@penguinis.org>.  (Bug#23016)

* admin/release-process (Check manuals): Mark files reviewed by
Steve Byrne.







Update Unicode notes for importing a new Unicode version
2016-03-12T16:07:34+00:00

Eli Zaretskii

2016-03-12T16:07:34+00:00

983448dfa062e3e8512e79edf08dcf16ad56b8bd

* admin/notes/unicode: Mention the need to update otf-script-alist
in fontset.el when importing data files from a new Unicode
version.





* admin/notes/unicode: Mention the need to update otf-script-alist
in fontset.el when importing data files from a new Unicode
version.







Import new data files from Unicode 9.0.0beta
2016-03-12T15:51:45+00:00

Eli Zaretskii

2016-03-12T15:51:45+00:00

a761fbf262b6898036a537a36476da7767c0daca

* admin/unidata/UnicodeData.txt:
* admin/unidata/Blocks.txt:
* admin/unidata/BidiMirroring.txt:
* admin/unidata/BidiBrackets.txt: Update from Unicode 9.0.0beta.
* admin/unidata/unidata-gen.el (unidata-gen-files): Bind
'coding-system-for-read' to 'utf-8, as various Unicode data files
now actually use non-ASCII characters.
(unidata-setup-list, unidata-get-name): Support the new Tangut
Ideographs block.

* lisp/international/characters.el (standard-case-table): Add new
characters from Unicode 9.0.0.
(standard-category-table): Add Arabic block u+08A0..u+08FF.  Add
Cyrillic Extended-C block.
(char-width-table): Update ranges per Unicode 9.0.0.
* lisp/international/fontset.el (script-representative-chars): Add
new scripts defined by Unicode 9.0.0.
(otf-script-alist): Add new OTF script tags.
* lisp/international/mule-cmds.el (ucs-names): Update ranges per
Unicode 9.0.0 additions.





* admin/unidata/UnicodeData.txt:
* admin/unidata/Blocks.txt:
* admin/unidata/BidiMirroring.txt:
* admin/unidata/BidiBrackets.txt: Update from Unicode 9.0.0beta.
* admin/unidata/unidata-gen.el (unidata-gen-files): Bind
'coding-system-for-read' to 'utf-8, as various Unicode data files
now actually use non-ASCII characters.
(unidata-setup-list, unidata-get-name): Support the new Tangut
Ideographs block.

* lisp/international/characters.el (standard-case-table): Add new
characters from Unicode 9.0.0.
(standard-category-table): Add Arabic block u+08A0..u+08FF.  Add
Cyrillic Extended-C block.
(char-width-table): Update ranges per Unicode 9.0.0.
* lisp/international/fontset.el (script-representative-chars): Add
new scripts defined by Unicode 9.0.0.
(otf-script-alist): Add new OTF script tags.
* lisp/international/mule-cmds.el (ucs-names): Update ranges per
Unicode 9.0.0 additions.







Merge from origin/emacs-25
2016-03-11T21:33:32+00:00

John Wiegley

2016-03-11T21:33:32+00:00

63efcc268635dea78c6bd80749eae4ee2c72d717

facb5e2 Update Emacs manual section related to character folding
4efea8e ; * etc/DEBUG: Fix a typo.  (Bug#22984)
f8df21b Update admin/notes/unicode
950be68 Add symref-filepattern entries for c?perl-mode
8b8a6ad Don't use XRANDR 1.3 extensions if the server doesn't support them.
985dacf ; NEWS update for the last change in etags
741a6f8 Sync with gnulib
7352c6c Rework C source files to avoid ^(
a589e9a By default, etags produces unqualified Perl tag names
72c7438 Indent methods with keyword names correctly
28532a9 Propertize character literals and special global variables
        differently
a7d6f39 ; Fix last change in NEWS
83b2a20 Change how /etc/NEWS presents character folding
b417c5a Revert "Revert "Backport: * lisp/isearch.el: Turn char-folding
        off by default""
711ca36 Properly handle lambda as read function (bug 22961)
1b9d616 Propertize operator symbol names with symbol syntax class
9b16bc2 Stop recognizing :#{} as symbol in ruby-mode
366ec77 Allow using the left shift operator without spaces on both sides
02bf7cc Properly handle unquoting in wdired (bug 22938)
16cf469 ; Spelling fix and tighten up comment
f50bc04 Allow splat operator before percent literal
991c801 Don't apply the return value of goto-char as syntax class
6e63b3e Guard against nested percent literals
066f3bc Recognize iuwu-mod after an escaped newline
6f7a57c Fix symbolic mode string conversion for s and t
50b9826 Update 'ucs-names' database
993b2fb Improve doc string of 'shell-command'
b71c717 Make the code in movemail_strftime more general
cc057e4 Speed up redisplay of binary files with long series of nulls
e51b27e Remove the highlighting support for quoting 'like this' inside
        Lisp docstrings
b1abce1 Restore leading space in movemail pop output
98b8d44 Fix bidi-paragraph-direction in Rmail view buffer
dc9d837 Don't misindent computed property generator methods
7923112 Fix mbox files produced by movemail on MS-Windows
c45a1ca doc string file descriptor exhaustion fix
265141b Fix Bug#22814





facb5e2 Update Emacs manual section related to character folding
4efea8e ; * etc/DEBUG: Fix a typo.  (Bug#22984)
f8df21b Update admin/notes/unicode
950be68 Add symref-filepattern entries for c?perl-mode
8b8a6ad Don't use XRANDR 1.3 extensions if the server doesn't support them.
985dacf ; NEWS update for the last change in etags
741a6f8 Sync with gnulib
7352c6c Rework C source files to avoid ^(
a589e9a By default, etags produces unqualified Perl tag names
72c7438 Indent methods with keyword names correctly
28532a9 Propertize character literals and special global variables
        differently
a7d6f39 ; Fix last change in NEWS
83b2a20 Change how /etc/NEWS presents character folding
b417c5a Revert "Revert "Backport: * lisp/isearch.el: Turn char-folding
        off by default""
711ca36 Properly handle lambda as read function (bug 22961)
1b9d616 Propertize operator symbol names with symbol syntax class
9b16bc2 Stop recognizing :#{} as symbol in ruby-mode
366ec77 Allow using the left shift operator without spaces on both sides
02bf7cc Properly handle unquoting in wdired (bug 22938)
16cf469 ; Spelling fix and tighten up comment
f50bc04 Allow splat operator before percent literal
991c801 Don't apply the return value of goto-char as syntax class
6e63b3e Guard against nested percent literals
066f3bc Recognize iuwu-mod after an escaped newline
6f7a57c Fix symbolic mode string conversion for s and t
50b9826 Update 'ucs-names' database
993b2fb Improve doc string of 'shell-command'
b71c717 Make the code in movemail_strftime more general
cc057e4 Speed up redisplay of binary files with long series of nulls
e51b27e Remove the highlighting support for quoting 'like this' inside
        Lisp docstrings
b1abce1 Restore leading space in movemail pop output
98b8d44 Fix bidi-paragraph-direction in Rmail view buffer
dc9d837 Don't misindent computed property generator methods
7923112 Fix mbox files produced by movemail on MS-Windows
c45a1ca doc string file descriptor exhaustion fix
265141b Fix Bug#22814