summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge from origin/emacs-25Paul Eggert2017-01-012494-2526/+10381
|\
| * Fix copyright years by handPaul Eggert2017-01-0194-105/+105
| * Update copyright year to 2017Paul Eggert2016-12-312426-2454/+2487
* | ; Merge from origin/emacs-25Paul Eggert2017-01-010-0/+0
|\ \ | |/
| * Bump Emacs version to 25.1.91emacs-25.1.91Nicolas Petton2016-12-305-1119/+1112
* | Merge from origin/emacs-25Paul Eggert2017-01-012-3/+308
|\ \ | |/
| * ; Update ChangeLog.2 and AUTHORS filesNicolas Petton2016-12-302-55/+363
* | ; Merge from origin/emacs-25Paul Eggert2017-01-010-0/+0
|\ \ | |/
| * Backport: Remove an ambiguity from defvar's doc string. Fixes bug #25292.Alan Mackenzie2016-12-301-4/+5
| * * lisp/emacs-lisp/inline.el: Fix apply-conversion (bug#25280)Stefan Monnier2016-12-281-3/+3
* | Merge from origin/emacs-25Paul Eggert2017-01-0112-28/+119
|\ \ | |/
| * ; Improve wording of previous change in variables.texiEli Zaretskii2016-12-271-6/+7
| * Document 'default-toplevel-value' and 'set-default-toplevel-value'Eli Zaretskii2016-12-261-0/+38
| * Don't modify minibuffer variables globallyLeo Liu2016-12-251-7/+7
| * Revert to pre-25.1 behavior in ffapEli Zaretskii2016-12-241-2/+6
| * * lisp/ffap.el: Fix obsolete comment referencing ffap-bug.Noam Postavsky2016-12-241-1/+1
| * Attempt to fix 64-bit AIX buildEli Zaretskii2016-12-231-5/+5
| * Clarify usage of 'ediff-cleanup-hook' (Bug#24675)Philipp Stephani2016-12-231-3/+8
| * Document that variable binding order is unspecifiedPhilipp Stephani2016-12-232-0/+17
| * * lisp/desktop.el (desktop-buffers-not-to-save): Doc fix.Eli Zaretskii2016-12-231-1/+4
| * Fix M-x hints on Mac portStefan Monnier2016-12-231-0/+1
| * Work around reporting a dpi change in apply_xft_settingsMartin Rudalics2016-12-221-2/+17
| * ; lisp/skeleton.el (skeleton-insert): Fix typo in last changeNoam Postavsky2016-12-201-2/+2
| * Amend the version number of CC Mode 5.33 -> 5.32.99. Don't merge to trunk.Alan Mackenzie2016-12-202-1/+8
| * Improve skeleton docstringsNoam Postavsky2016-12-191-6/+6
* | ; Merge from origin/emacs-25Paul Eggert2017-01-010-0/+0
|\ \ | |/
| * ; Auto-commit of loaddefs file.Glenn Morris2016-12-191-1/+1
* | Merge from origin/emacs-25Paul Eggert2017-01-012-2/+7
|\ \ | |/
| * Improve documentation of 'w32-scroll-lock-modifier'Eli Zaretskii2016-12-192-2/+7
* | ; Merge from origin/emacs-25Paul Eggert2017-01-010-0/+0
|\ \ | |/
| * Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25Eli Zaretskii2016-12-190-0/+0
| |\
| | * Document 'describe-fontset'Eli Zaretskii2016-12-191-0/+7
* | | Merge from origin/emacs-25Paul Eggert2017-01-0115-39/+119
|\ \ \ | |/ /
| * | Document 'describe-fontset'Eli Zaretskii2016-12-191-0/+7
| |/
| * ; Add missing symbol quoting.Philipp Stephani2016-12-181-1/+1
| * Repair desktop restoration on text terminalsEli Zaretskii2016-12-171-2/+2
| * Ignore forward-sexp-function in js-mode indentation codeDmitry Gutov2016-12-171-1/+3
| * Improve documentation of 'define-coding-system'Eli Zaretskii2016-12-161-2/+11
| * Fix Bug#25162Michael Albinus2016-12-112-2/+17
| * Fix a typo in define-abbrev-tableGlenn Morris2016-12-101-4/+4
| * Bump makeinfo requirement from 4.7 to 4.13Glenn Morris2016-12-101-4/+3
| * Fixes related to select-enable-clipboardGlenn Morris2016-12-103-8/+6
| * Define struct predicate before acccesorsNoam Postavsky2016-12-101-8/+8
| * Doc fix for vc-gitGlenn Morris2016-12-071-0/+2
| * Further improve make-dist checkingGlenn Morris2016-12-071-1/+8
| * Improve previous make-dist changeGlenn Morris2016-12-071-0/+7
| * Make make-dist --snapshot do some sanity checksGlenn Morris2016-12-071-1/+41
* | Give eval-and-compile a correct edebug spec. Fixes bug #16184 properly.Alan Mackenzie2017-01-012-7/+4
* | Clarify internal_catch etc.Paul Eggert2016-12-311-48/+43
* | Further improve filenotify-tests.elKen Brown2016-12-311-4/+7