Mercurial > emacs
changeset 107728:56e62ae17d17
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 01 Apr 2010 00:00:14 +0000 |
| parents | d3652b82ebe3 (current diff) 0e2821d60d4c (diff) |
| children | f449a4ebd49f |
| files | |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Mar 31 21:55:47 2010 +0000 +++ b/lisp/ChangeLog Thu Apr 01 00:00:14 2010 +0000 @@ -1,3 +1,8 @@ +2010-03-31 Chong Yidong <cyd@stupidchicken.com> + + * cus-edit.el (custom-buffer-sort-alphabetically): Update + :version. + 2010-03-31 Juri Linkov <juri@jurta.org> * simple.el (next-line, previous-line): Re-throw a signal
--- a/lisp/cus-edit.el Wed Mar 31 21:55:47 2010 +0000 +++ b/lisp/cus-edit.el Thu Apr 01 00:00:14 2010 +0000 @@ -675,7 +675,8 @@ (defcustom custom-buffer-sort-alphabetically t "Whether to sort customization groups alphabetically in Custom buffer." :type 'boolean - :group 'custom-buffer) + :group 'custom-buffer + :version "24.1") (defcustom custom-buffer-order-groups 'last "If non-nil, order group members within each customization group.
--- a/src/ChangeLog Wed Mar 31 21:55:47 2010 +0000 +++ b/src/ChangeLog Thu Apr 01 00:00:14 2010 +0000 @@ -16,6 +16,11 @@ (gif_load): Put GIF extension data to the property `Qextension_data'. +2010-03-31 Chong Yidong <cyd@stupidchicken.com> + + * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL. + * nsterm.h: Fix prototype. + 2010-03-31 Eli Zaretskii <eliz@gnu.org> * xdisp.c (highlight_trailing_whitespace): Support highlight of
--- a/src/nsfns.m Wed Mar 31 21:55:47 2010 +0000 +++ b/src/nsfns.m Thu Apr 01 00:00:14 2010 +0000 @@ -686,7 +686,7 @@ void -ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval) +ns_set_doc_edited (struct frame *f, Lisp_Object arg) { NSView *view = FRAME_NS_VIEW (f); NSAutoreleasePool *pool;