diff options
| author | Glenn Morris | 2014-11-04 21:08:57 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-04 21:08:57 -0800 |
| commit | b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934 (patch) | |
| tree | c7562d5cde06977fc2eb14a7c0b6972738696386 /lisp/ChangeLog | |
| parent | ddce73d32fa3e62e022842e3bbdc0aa83bb358cc (diff) | |
| parent | 58064b4da2835acb24d0f68021c84102e0fb1c0f (diff) | |
| download | emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.tar.gz emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.zip | |
Merge from emacs-24; up to 117669
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4684c017d94..dc17f8e3ffb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,19 @@ | |||
| 1 | 2014-11-05 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being | ||
| 4 | returned by load-average. | ||
| 5 | |||
| 6 | 2014-11-05 Michael Albinus <michael.albinus@gmx.de> | ||
| 7 | |||
| 8 | * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use | ||
| 9 | a local copy; setting `inhibit-file-name-handlers' proper might be | ||
| 10 | more performant. (Bug#18751) | ||
| 11 | |||
| 12 | 2014-11-05 Glenn Morris <rgm@gnu.org> | ||
| 13 | |||
| 14 | * mail/emacsbug.el (report-emacs-bug): No longer include | ||
| 15 | recent-keys in the report. (Bug#18900) | ||
| 16 | |||
| 1 | 2014-11-04 Paul Eggert <eggert@cs.ucla.edu> | 17 | 2014-11-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 18 | ||
| 3 | * mouse.el (mouse-drag-line): Fix misspelling of "right-fringe". | 19 | * mouse.el (mouse-drag-line): Fix misspelling of "right-fringe". |