emacs/lisp/org/ChangeLog.1, 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.
Merge from origin/emacs-25 2016-08-22T21:40:35+00:00 Paul Eggert 2016-08-22T21:40:35+00:00 c325e199668a2449a9b0d662e114eec9d4802288 927afa1 ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 RC2 6bf83b5 * etc/AUTHORS: Update the AUTHORS file 73cbb81 ; ChangeLog spelling fixes 9b99772 Some assorted documentation clarifications 37d4723 Improve commentary in src/character.h 5ccd593 ; Fix typo in /etc/NEWS 96e3d16 * etc/NEWS: Mention the change in json-encode-string. 2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create... 2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... 66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe... # Conflicts: # ChangeLog.2 # lisp/ldefs-boot.el 
927afa1 ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 RC2
6bf83b5 * etc/AUTHORS: Update the AUTHORS file
73cbb81 ; ChangeLog spelling fixes
9b99772 Some assorted documentation clarifications
37d4723 Improve commentary in src/character.h
5ccd593 ; Fix typo in /etc/NEWS
96e3d16 * etc/NEWS: Mention the change in json-encode-string.
2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create...
2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...

# Conflicts:
#	ChangeLog.2
#	lisp/ldefs-boot.el
; ChangeLog spelling fixes 2016-08-21T11:15:44+00:00 Paul Eggert 2016-08-21T11:15:15+00:00 73cbb813cfea53e4162409f2adc0a793ab301894 






; Spelling fixes
2016-04-21T21:45:01+00:00

Paul Eggert

2016-04-21T21:44:31+00:00

7621a521452d988b27e761c76ad8e667e932192e












-
2016-01-30T19:43:26+00:00

Paul Eggert

2016-01-30T19:43:26+00:00

cb4e054e41cdb7e398351a5ae8224759e721349e












Spelling fixes
2016-01-25T16:09:09+00:00

Paul Eggert

2016-01-25T16:08:24+00:00

a528a60f48f6b939c5014c96d3445de13d2ed243












Merge from origin/emacs-25
2016-01-12T06:48:07+00:00

John Wiegley

2016-01-12T06:48:07+00:00

1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302

ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016





ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016







Spelling fixes
2016-01-04T22:47:01+00:00

Paul Eggert

2016-01-04T22:46:35+00:00

61e83e902b388490b609677a76f3d49740439f24












Update copyright year to 2016
2016-01-01T09:34:24+00:00

Paul Eggert

2016-01-01T09:16:19+00:00

0e963201d03d9229bb8ac4323291d2b0119526ed

Run admin/update-copyright.





Run admin/update-copyright.