emacs/README, branch comment-cache Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from origin/emacs-25 2017-01-01T09:10:47+00:00 Paul Eggert 2017-01-01T09:10:47+00:00 bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017 
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Update copyright year to 2017 2017-01-01T03:42:26+00:00 Paul Eggert 2017-01-01T03:14:01+00:00 5badc81c1cdfbb261ad3e6d1b753defb15712f26 Run admin/update-copyright. 
Run admin/update-copyright.
Bump Emacs version to 25.1.91 2016-12-30T14:38:03+00:00 Nicolas Petton 2016-12-30T14:38:03+00:00 e092f08515af5e523a85ce0624e36da61fba65bd * README: * configure.ac: * msdos/sed2v2.inp: * nt/README.W32: Bump Emacs version. * lisp/ldefs-boot.el: Update. 
* README:
* configure.ac:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version.
* lisp/ldefs-boot.el: Update.
Bump Emacs version to 25.1.90 2016-11-27T23:01:35+00:00 Nicolas Petton 2016-11-27T23:01:10+00:00 3674317311131a597dacc8920c5e1cd258ccd6d7 * README: * configure.ac: * msdos/sed2v2.inp: * nt/README.W32: Bump Emacs version to 25.1.90 
* README:
* configure.ac:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 25.1.90
; Revert "Bump Emacs version" 2016-11-27T22:59:55+00:00 Nicolas Petton 2016-11-27T22:58:31+00:00 938e3166942da1ed0ca265cb7bbcebf44c588c44 The version should be 25.1.90, not 25.2.90. This reverts commit 596289bc8d2c4dfb51e32cde3df4350855c5c084. 
The version should be 25.1.90, not 25.2.90.

This reverts commit 596289bc8d2c4dfb51e32cde3df4350855c5c084.
Bump Emacs version 2016-11-27T19:44:43+00:00 Nicolas Petton 2016-11-27T19:44:43+00:00 596289bc8d2c4dfb51e32cde3df4350855c5c084 * README: * configure.ac: * etc/NEWS: * msdos/sed2v2.inp: * nt/README.W32: Bump Emacs version to 25.2.90 
* README:
* configure.ac:
* etc/NEWS:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 25.2.90
Merge from origin/emacs-25 2016-11-19T22:31:05+00:00 Paul Eggert 2016-11-19T22:31:05+00:00 c61ee94959ba96b2a327df0684593f7e569e30be 4af5981 Add a comment in generated refcards about the source ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment. 4887e7c js-mode: Fix indent problem after a regexp e992ac0 Fix sluggish display of symbols in UTF-8 language environment 1fc101b Don't confuse how Texinfo outputs @var with the input 91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame... f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da... 5b0cddd More fixes in copyright notices in etc/refcards/ f994c20 Update copyright text in refcards 9ad2ae7 Fix Outline command names 26c3554 Send text received by bracketed paste to process db0b58d Correct the statement about programming modes always running ... 78aece4 Improve documentation of 'occur' eb364fd Do call debugger on failed cl-assert 3ef4ee8 Avoid infloop in python 8da810f Don't refer to obsolete FEATURE-unload-hook 4f478ca Improve documentation of dabbrevs 7272e5d * lisp/chistory.el (list-command-history): Doc fix. (Bug#24890) 89b7482 * lisp/simple.el (set-mark-command): Doc fix. (Bug#24890) 3b199f7 Improve documentation of some Help commands 93d3a0e Fix documentation of yes-or-no prompts af04919 Fix documentation of partial completion style ed80184 Fix documentation of the mode line on emacsclient frames e6be855 Fix description of 'C-z' in User manual 16f7007 Improve and clarify documentation of Outline Mode 31d93aa Add Emacs version number to nt/README.W32 0b6b815 Fix python-mode hideshow regexp dc152c5 Modernize usage of 'macOS' in doc and comments 84c5343 Prefer comments /* like this */ in C code bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845). 3ef86fd Clarify documentation of face attribute functions de51d59 ; * nt/README.W32: Minor copyedits. db436e9 Don't call debug on failed cl-assert # Conflicts: # doc/emacs/cmdargs.texi # etc/NEWS # etc/PROBLEMS # lisp/auth-source.el # lisp/net/tramp-sh.el 
4af5981 Add a comment in generated refcards about the source
ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment.
4887e7c js-mode: Fix indent problem after a regexp
e992ac0 Fix sluggish display of symbols in UTF-8 language environment
1fc101b Don't confuse how Texinfo outputs @var with the input
91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame...
f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da...
5b0cddd More fixes in copyright notices in etc/refcards/
f994c20 Update copyright text in refcards
9ad2ae7 Fix Outline command names
26c3554 Send text received by bracketed paste to process
db0b58d Correct the statement about programming modes always running ...
78aece4 Improve documentation of 'occur'
eb364fd Do call debugger on failed cl-assert
3ef4ee8 Avoid infloop in python
8da810f Don't refer to obsolete FEATURE-unload-hook
4f478ca Improve documentation of dabbrevs
7272e5d * lisp/chistory.el (list-command-history): Doc fix.  (Bug#24890)
89b7482 * lisp/simple.el (set-mark-command): Doc fix.  (Bug#24890)
3b199f7 Improve documentation of some Help commands
93d3a0e Fix documentation of yes-or-no prompts
af04919 Fix documentation of partial completion style
ed80184 Fix documentation of the mode line on emacsclient frames
e6be855 Fix description of 'C-z' in User manual
16f7007 Improve and clarify documentation of Outline Mode
31d93aa Add Emacs version number to nt/README.W32
0b6b815 Fix python-mode hideshow regexp
dc152c5 Modernize usage of 'macOS' in doc and comments
84c5343 Prefer comments /* like this */ in C code
bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845).
3ef86fd Clarify documentation of face attribute functions
de51d59 ; * nt/README.W32: Minor copyedits.
db436e9 Don't call debug on failed cl-assert

# Conflicts:
#	doc/emacs/cmdargs.texi
#	etc/NEWS
#	etc/PROBLEMS
#	lisp/auth-source.el
#	lisp/net/tramp-sh.el
Modernize usage of 'macOS' in doc and comments 2016-11-06T07:42:03+00:00 Paul Eggert 2016-11-06T07:33:43+00:00 dc152c54f4e44f5f2040883b03f71ff6aa66c893 Apple changed the spelling of its operating system again, to "macOS", effective with macOS 10.12 Sierra (2016-09-20). Change Emacs documentation and comments to match this. Stick with older OS spellings ("OS X", "Mac OS X") when talking about older releases where the older names are more correct. 
Apple changed the spelling of its operating system again, to "macOS",
effective with macOS 10.12 Sierra (2016-09-20).  Change Emacs
documentation and comments to match this.  Stick with older OS
spellings ("OS X", "Mac OS X") when talking about older releases where
the older names are more correct.
Bump Emacs version to 26.0.50 2016-10-01T08:14:05+00:00 Eli Zaretskii 2016-10-01T08:14:05+00:00 787b525f366097425d91ef8f62225ca5ccdf90bc * README: * configure.ac: * etc/NEWS: * etc/refcards/ru-refcard.tex: * msdos/sed2v2.inp: * src/msdos.c: Increment Emacs version to 26.0.50. * etc/NEWS.25: New file, copied from etc/NEWS with post-25.1 stuff moved to etc/NEWS. 
* README:
* configure.ac:
* etc/NEWS:
* etc/refcards/ru-refcard.tex:
* msdos/sed2v2.inp:
* src/msdos.c: Increment Emacs version to 26.0.50.
* etc/NEWS.25: New file, copied from etc/NEWS with post-25.1 stuff
moved to etc/NEWS.
Increment Emacs version to 25.1.50 2016-09-23T07:46:26+00:00 Eli Zaretskii 2016-09-23T07:46:26+00:00 0d016ca1164463320a77482df88ef81cc34056d1 * README: * configure.ac: * etc/NEWS: * msdos/sed2v2.inp: Bump the version to 25.1.50. 
* README:
* configure.ac:
* etc/NEWS:
* msdos/sed2v2.inp: Bump the version to 25.1.50.