]> git.eshelyaron.com Git - emacs.git/commitdiff
merge trunk
authorKenichi Handa <handa@etlken>
Mon, 12 Jul 2010 02:28:50 +0000 (11:28 +0900)
committerKenichi Handa <handa@etlken>
Mon, 12 Jul 2010 02:28:50 +0000 (11:28 +0900)
1  2 
src/ChangeLog
src/font.c

diff --cc src/ChangeLog
index 1cd57516c45ed3c0ea98be9933fc05717a86530d,14b11d647095bfcc6658cf4786ccef7d422885dc..5acf42608e4bdbb0a00d27fa4b009d9171c96c6b
 +2010-07-12  Kenichi Handa  <handa@m17n.org>
 +
 +      * font.h (enum font_property_index): New member FONT_ENTITY_INDEX.
 +
 +      * font.c (font_open_entity): Record ENTITY in FONT_OBJECT's slot
 +      of FONT_ENTITY_INDEX.
 +      (Ffont_get): If KEY is :otf and the font-object doesn't have the
 +      property, get the property value dynamically.
 +      (Ffont_put): Accept font-entity and font-object too.
 +      (Ffont_get_glyhphs): Renamed from Fget_font_glyphs.  Arguments and
 +      return value changed.
 +      (syms_of_font): Adjusted for the above change.
 +
+ 2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+       * blockinput.h: Remove obsolete comment.
+       * lisp.h: Include <stddef.h>.
+       (OFFSETOF): Don't define.
+       (VECSIZE): Use offsetof instead of OFFSETOF.
+       (PSEUDOVECSIZE): Likewise.
+       * process.c (conv_sockaddr_to_lisp): Likewise.
+       * alloc.c: Don't include <stddef.h>.
+       * buffer.h (PER_BUFFER_VAR_OFFSET): Use offsetof.
+       * process.c: Remove obsolete comment.
+ 2010-07-11  Chong Yidong  <cyd@stupidchicken.com>
+       * xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
+ 2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+       * callint.c (Fcall_interactively): Use strchr, strrchr instead of
+       index, rindex.
+       * doc.c (get_doc_string, Fsnarf_documentation): Likewise.
+       * editfns.c (Fuser_full_name, Fformat): Likewise.
+       * emacs.c (argmatch, sort_args, decode_env_path): Likewise.
+       * fileio.c (Ffile_symlink_p): Likewise.
+       * filelock.c (current_lock_owner): Likewise.
+       * font.c (font_parse_name, font_parse_family_registry): Likewise.
+       * fontset.c (fontset_pattern_regexp): Likewise.
+       * lread.c (read1): Likewise.
+       * sysdep.c (init_system_name): Likewise.
+       * xfns.c (select_visual): Likewise.
+       * s/hpux10-20.h (index, rindex): Don't define.
+       * s/ms-w32.h (index): Likewise.
+       * s/usg5-4.h: Likewise.
+       * callproc.c (relocate_fd): Use F_DUPFD if defined.
+       * alloc.c (pending_malloc_warning, malloc_warning): Add const.
+       * callproc.c (relocate_fd, getenv_internal_1, getenv_internal)
+       (egetenv): Likewise.
+       * doprnt.c (doprnt): Likewise.
+       * editfns.c (set_time_zone_rule, format2): Likewise.
+       * emacs.c (decode_env_path): Likewise.
+       * eval.c (signal_error, error): Likewise.
+       * insdel.c (replace_range_2): Likewise.
+       * keyboard.c (cmd_error_internal): Likewise.
+       * lread.c (isfloat_string, make_symbol, dir_warning): Likewise.
+       * print.c (write_string, write_string_1, print_error_message):
+       Likewise.
+       * vm-limit.c (warn_function, memory_warnings): Likewise.
+       * xdisp.c (message1, message1_nolog, message_with_string)
+       (vmessage, message, message_nolog): Likewise.
+       * emacs.c: Remove duplicate declaration.
+       * keyboard.h: Likewise.
+       * lisp.h: Update prototypes.
+       * eval.c: Fix indentation problem.
+       * keyboard.c: Include "process.h"
+       * eval.c: Remove obsolete noinline declaration.
+       * fns.c: Likewise.
+ 2010-07-11  Ken Raeburn  <raeburn@raeburn.org>
+       * doprnt.c (doprnt): Take a va_list argument instead of count and
+       pointer.
+       * eval.c (error): Change to a standard-C variadic function.
+       * xdisp.c (vmessage): Renamed from message, made static, and
+       changed to take a va_list argument.
+       (message): New variadic wrapper.
+       (message_nolog): Now a variadic function, calling vmessage.
+       * lisp.h: Include stdarg.h for va_list.
+       (doprnt, error, message, message_nolog): Decls updated.
+ 2010-07-11  Eli Zaretskii  <eliz@gnu.org>
+       * process.c (syms_of_process) <delete-exited-processes>: Define
+       even if !subprocesses.
+       (delete_exited_processes): Ditto.
+       * msdos.c (syms_of_msdos) <delete-exited-processes>: Remove DEFVAR.
+       (delete_exited_processes): Don't define.
+ 2010-07-10  Chong Yidong  <cyd@stupidchicken.com>
+       * frame.c (make_frame): Initialize menu_bar_lines and
+       tool_bar_lines members.
+       (make_initial_frame, make_terminal_frame): Initialize
+       menu_bar_lines using value of menu-bar-mode.
+       * msdos.c (IT_set_frame_parameters): Don't set menu-bar-lines.
+ 2010-07-10  Eli Zaretskii  <eliz@gnu.org>
+       * process.c: Reshuffle #include's.  Condition some of the global
+       and static variables on `subprocesses'.
+       (hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p):
+       Leave only one implementation.
+       (Fget_buffer_process, Fprocess_inherit_coding_system_flag)
+       (kill_buffer_processes, Flist_system_processes)
+       (Fprocess_attributes, init_process, syms_of_process): Unify the
+       implementations for with subprocesses and without them.
+ 2010-07-09  Jan Djärv  <jan.h.d@swipnet.se>
+       * xmenu.c (set_frame_menubar): Must realize menubar_widget to get the
+       correct size for Motif.
+       (free_frame_menubar): Call x_set_window_size to update frame size.
+       * xfns.c (x_window): Set borderWidth to 0 for pane and
+       EmacsFrame.  Frame size calculation is wrong otherwise.
+ 2010-07-09  Michael Albinus  <michael.albinus@gmx.de>
+       * dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
+       allows to suppress errors when polling in Emacs' main loop.
+       (Fdbus_init_bus, Fdbus_get_unique_name, Fdbus_call_method)
+       (Fdbus_call_method_asynchronously, Fdbus_method_return_internal)
+       (Fdbus_method_error_internal, Fdbus_send_signal)
+       (xd_get_dispatch_status, xd_read_message, Fdbus_register_signal)
+       (Fdbus_register_method): Use it.  (Bug#6579)
  2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>
  
        * alloc.c: Convert DEFUNs to standard C.
diff --cc src/font.c
Simple merge