diff options
author | John Wiegley <johnw@newartisans.com> | 2016-02-03 23:54:45 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2016-02-03 23:54:45 -0800 |
commit | 1829a1fc85b040912dc194806c64670096ddcf43 (patch) | |
tree | e2ea31dde9caa974a251a5e943e8eb0588801dd9 /ChangeLog.2 | |
parent | 535e2bef6dd7b9abe2567f865c8b24a06a555178 (diff) | |
parent | ae26c8a7a46ffa6266a4efce592827cf47e85170 (diff) | |
download | emacs-1829a1fc85b040912dc194806c64670096ddcf43.tar.gz |
Merge from origin/emacs-25
ea26c8a * lisp/net/browse-url.el (browse-url-default-browser): Lower
priority of non-free Chrome.
0fac75f Improve the custom type of some user options.
2df0e04 Highlight CSS variables with variable name face
3cf5e81 * lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not
user-serviceable.
2a5233c Mark some user options that can get evalled as risky.
39b166f Disable DebPrint in sys_read on MS-Windows
9fd0189 ;Fix ChangeLog entry
4bb7233 Fix typos in Introduction to Emacs Lisp manual
Diffstat (limited to 'ChangeLog.2')
-rw-r--r-- | ChangeLog.2 | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index 12f98342eef..40d7bc40026 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -228,9 +228,27 @@ Re-enable checks in member, memql, delete to complain about non-lists - * fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 change. - -2016-01-28 Glenn Morris <rgm@gnu.org> + * src/fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 change. + +2016-02-04 Martin Rudalics <rudalics@gmx.at> + + Minor doc(-string) tweaks + + * lisp/window.el (window-in-direction): Fix doc-string typo. + * doc/lispref/frames.texi (Frame Font): Mention canonical + character width/height. + * doc/lispref/windows.texi (Windows and Frames): Clarify + handling of minibuffer window for `window-in-direction'. + (Window Sizes): Minor tweaks in descriptions of + `window-max-chars-per-line', `window-min-width' and + `window-min-size'. + (Deleting Windows): Minor tweak in `delete-window' description. + (Selecting Windows): Clarify window use time description. + (Cyclic Window Ordering): Minor tweak. + (Switching Buffers): Clarify description of + `switch-to-buffer-in-dedicated-window'. + +2016-02-04 Eli Zaretskii <eliz@gnu.org> Remove some useless-use-of eval. |