| commit | 6129cd03e20a0aaee46ceb742a9ed1ae2904eab3 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Sun, 23 Oct 2016 09:43:17 +0000 (23 02:43 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Sun, 23 Oct 2016 09:43:17 +0000 (23 02:43 -0700) | ||
| tree | f432bbffba80979cec74cfc125a9f73abfd06a91 | treesnapshot (tar.gz zip) |
| parent | 16d126d7559c2f58c8af6cf86c9f54b6e21cceb4 | commitdiff |
| parent | b73f4668ab685dfb690eced15b20ed47f90efccb | commitdiff |
Merge from origin/emacs-25
b73f466 * lisp/cus-start.el (exec-path): Handle nil elements. (Bug#2...
55ebb70 Catch the imenu-unavailable error in sh-mode completion table
993acb5 ; Minor fix for last change in characters.el
30c4bb5 More char-width fixes
4eb4463 Fix char-width-table values for some Emoji
528997d Keep point when switching from and to *terminal* buffer
2130005 * INSTALL: Use correct Emacs release number 25.
10835b1 Avoid crashes due to objects read with the #n=object form
4de671d Improve doc string of 'completion-at-point-functions'
ceb46f0 Fix crash in evaluating functions
d8374c4 * src/filelock.c (current_lock_owner): Update comment.
b73f466 * lisp/cus-start.el (exec-path): Handle nil elements. (Bug#2...
55ebb70 Catch the imenu-unavailable error in sh-mode completion table
993acb5 ; Minor fix for last change in characters.el
30c4bb5 More char-width fixes
4eb4463 Fix char-width-table values for some Emoji
528997d Keep point when switching from and to *terminal* buffer
2130005 * INSTALL: Use correct Emacs release number 25.
10835b1 Avoid crashes due to objects read with the #n=object form
4de671d Improve doc string of 'completion-at-point-functions'
ceb46f0 Fix crash in evaluating functions
d8374c4 * src/filelock.c (current_lock_owner): Update comment.