From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 8 Aug 2010 21:15:44 +0000 (-0400)
Subject: Merge changes from emacs-23 branch.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc36ae609d01e7922c662c78866300d57b34b07e;p=emacs.git

Merge changes from emacs-23 branch.
---

cc36ae609d01e7922c662c78866300d57b34b07e
diff --cc src/ChangeLog
index 7931a9bbfa6,e931fce093e..8214030d4d6
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,33 -1,37 +1,65 @@@
+ 2010-08-08  Kenichi Handa  <handa@m17n.org>
+ 
+ 	* charset.c: Include <stdlib.h>
+ 	(struct charset_sort_data): New struct.
+ 	(charset_compare): New function.
+ 	(Fsort_charsets): New funciton.
+ 	(syms_of_charset): Declare Fsort_charsets as a Lisp function.
+ 
+ 	* coding.c (decode_coding_iso_2022): Fix checking of dimension
+ 	number in CTEXT extended segment.
+ 
+ 2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+ 
+ 	* w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring.
+ 	* xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring.
+ 
+ 2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+ 
+ 	* fns.c (Fsubstring_no_properties, Fnthcdr, Ffeaturep)
+ 	(Fhash_table_size): Fix typos in docstrings.
+ 	(Fmake_hash_table): Doc fix.
+ 
+ 2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+ 
+ 	* minibuf.c (syms_of_minibuf) <read-buffer-function>:
+ 	Doc fix (bug#5625).
+ 
+ 2010-08-08  Ken Brown  <kbrown@cornell.edu>
+ 
+ 	* dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of
+ 	the MSDOS definition.
+ 
  2010-08-08  Dan Nicolaescu  <dann@ics.uci.edu>
  
 +	Use const char* instead of char*.
 +	* xterm.c (x_create_toolkit_scroll_bar):
 +	* xfont.c (xfont_list_pattern):
 +	* xfns.c (x_default_scroll_bar_color_parameter)
 +	(xic_create_fontsetname, x_default_font_parameter)
 +	(x_screen_planes):
 +	* xdisp.c (c_string_pos, number_of_chars, reseat_to_string)
 +	(store_mode_line_string, decode_mode_spec, display_string):
 +	* menu.c (digest_single_submenu):
 +	* keymap.h (initial_define_key, initial_define_lispy_key):
 +	* keymap.c (initial_define_key, initial_define_lispy_key):
 +	* image.c (image_error, image_keyword):
 +	* gtkutil.h (xg_create_widget, xg_create_scroll_bar):
 +	* gtkutil.c (xg_create_widget, xg_create_scroll_bar):
 +	* ftfont.c (struct fc_charset_table, ftfont_spec_pattern)
 +	(ftfont_list, ftfont_match):
 +	* frame.c (frame_parm_table):
 +	* font.h (font_intern_prop, font_parse_xlfd, font_parse_fcname)
 +	(font_unparse_fcname, font_unparse_fcname, font_open_by_name)
 +	(font_add_log, font_deferred_log):
 +	* font.c (font_intern_prop, font_parse_xlfd, font_parse_fcname)
 +	(font_unparse_fcname, font_unparse_fcname, font_open_by_name)
 +	(font_add_log, font_deferred_log):
 +	* emacs.c (argmatch):
 +	* dispextern.h (struct it):
 +	* coding.c (ENCODE_DESIGNATION):
 +	* charset.c (define_charset_internal): Use const.
 +
  	* s/freebsd.h (DECLARE_GETPWUID_WITH_UID_T): Remove, unused.
  
  	* xrdb.c: Remove include guard.  Remove