1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 12:40:49 -08:00
Commit graph

31592 commits

Author SHA1 Message Date
Juanma Barranquero
9cb2ac5616 src/chartab.c (uniprop_table_uncompress): Remove unused local variable. 2011-07-09 15:58:09 +02:00
Jan Djärv
f25661f0c3 * gtkutil.c (qttip_cb): Remove code without function. 2011-07-09 09:59:22 +02:00
Eli Zaretskii
8278c4fef8 Fix MS-Windows build broken by 2011-07-08T20:39:30Z!eggert@cs.ucla.edu.
src/w32.c (pthread_sigmask): New stub.
2011-07-09 10:00:58 +03:00
Paul Eggert
1301ac268f Merge: Use pthread_sigmask, not sigprocmask (Bug#9010). 2011-07-08 13:39:30 -07:00
Paul Eggert
67517972df Merge from trunk. 2011-07-08 13:22:17 -07:00
Paul Eggert
2a84b02da8 Simplify Emacs part of pthread_sigmask support.
* Makefile.in (GNULIB_TOOL_FLAGS): Do not avoid sigprocmask.
* configure.in (AC_TYPE_UID_T): New dummy macro.
Configure gnulib after adjusting LIBS,
so that gnulib can assume the libraries in LIBS.
* lib/pthread_sigmask.c, lib/sigprocmask.c, m4/signalblocking.m4:
New files, automatically imported from gnulib.
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
* src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro.
(LIBES): Use it.
2011-07-08 13:20:19 -07:00
Jan Djärv
1b85461891 Better fix that keeps corret margins in tooltip.
* gtkutil.c (qttip_cb): Set line wrap to FALSE for tooltip widget.
(xg_prepare_tooltip): Revert text in x->ttip_lbl, margins was
wrong.

Fixes: debbugs:8591
2011-07-08 19:57:55 +02:00
Jan Djärv
0ce7e563da Don't let Gtk+ linewrap tooltips.
* gtkutil.c (xg_prepare_tooltip): Fix indentation and comment.
Put text in x->ttip_lbl instead of gtk_tooltip_set_text.
(xg_hide_tooltip): Fix comment.

Fixes: debbugs:8591
2011-07-08 19:25:17 +02:00
Jan Djärv
3fe4b54936 Fix breakage introduced by fixing Bug#8842.
* nsfns.m (Fx_open_connection): Put NSStringPboardType into
ns_return_type.

* nsterm.m (initFrameFromEmacs): Don't use ns_return_types
in registerServicesMenuSendTypes.
(validRequestorForSendType): Don't check ns_return_types.
2011-07-08 17:39:40 +02:00
Jason Rumney
5df75e47ac * src/w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
frame struct members of non-existent frames.

Fixes: debbugs:6284
2011-07-08 20:46:17 +08:00
Jan Djärv
4393663bc5 Fix warnings in ns*m files: Replace deprecated methods, declare new interfaces.
* emacs.c: Declare unexec_init_emacs_zone.

* nsfns.m (check_ns_display_info): Cast to long and use %ld in error
to avoid warning.

* nsimage.m (allocInitFromFile): Don't use deprecated method
bestRepresentationForDevice on OSX >= 10.6.

* nsmenu.m (fillWithWidgetValue): Don't use depercated method
sizeToFit on OSX >= 10.2.

* nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods
cString and lossyCString on OSX >= 10.4

* nsterm.h (MAC_OS_X_VERSION_10_3, MAC_OS_X_VERSION_10_4)
(MAC_OS_X_VERSION_10_5): Define if not defined.
(EmacsView, EmacsTooltip): Implements NSWindowDelegate on OSX >= 10.6.
(EmacsMenu): Implements NSMenuDelegate on OSX >= 10.6.
(EmacsToolbar): Implements NSToolbarDelegate on OSX >= 10.6.

* nsterm.m (keyDown): Call to wantsToDelayTextChangeNotifications and
variable firstTime not needed on OSX >= 10.6.
(setPosition): setFloatValue:knobProportion: is deprecated on OSX
>= 10.5.  Use setKnobProportion, setDoubleValue.
2011-07-08 12:04:23 +02:00
Paul Eggert
1692ae2dd5 Merge from trunk. 2011-07-08 02:38:32 -07:00
Jan Djärv
a63e078125 * nsgui.h: Fix compiler warning about gnulib redefining verify. 2011-07-08 10:42:58 +02:00
Jan Djärv
699c10bd69 Fix services menu empty on OSX 1.6+.
* nsfns.m (Fx_open_connection): Remove NSStringPboardType from
ns_return_types.
(Fns_list_services): Just return Qnil on 10.6, code not working there.

* nsmenu.m (ns_update_menubar): Remove useless setDelegate call
on svcsMenu.

* nsselect.m (ns_get_local_selection): Change to extern (Bug#8842).

* nsterm.h (MAC_OS_X_VERSION_10_6): Define here instead of nsterm.m.
(ns_get_local_selection): Declare.

* nsterm.m (QUTF8_STRING): Declare.
(initFrameFromEmacs): Call registerServicesMenuSendTypes.
(validRequestorForSendType): Return type is (id).
Change indexOfObjectIdenticalTo to indexOfObject.
Check if we have local selection before returning self (Bug#8842).
(writeSelectionToPasteboard): Put local selection into paste board
if we have a local selection (Bug#8842).
(syms_of_nsterm): DEFSYM QUTF8_STRING.
2011-07-08 10:11:35 +02:00
Lars Magne Ingebrigtsen
9888ff71e3 (describe_map_tree): Don't insert a double newline at the end of the string
Return whether we inserted something.  This should allow the caller to
decide whether to insert more newlines or not.

Fixes: debbugs:1169
2011-07-07 19:19:10 +02:00
Lars Magne Ingebrigtsen
54e1018443 Clarify the `call-interactively' doc string, and add an example. 2011-07-07 18:59:26 +02:00
Chong Yidong
412f24b9dd Merge from emacs-23 branch 2011-07-07 12:18:25 -04:00
Eli Zaretskii
a8815b00dc Fix bug #9015 with a bogus crash with glyphless characters on a TTY.
src/term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what.
2011-07-07 18:39:23 +03:00
Kenichi Handa
15fa4783a3 Ignore a static composition that starts before the current checking position in redisplay. 2011-07-07 16:11:54 +09:00
Kenichi Handa
ef7b981ddd merge trunk 2011-07-07 13:20:12 +09:00
Kenichi Handa
023e7b416b chartab.c (sub_char_table_set_range): Fix previous change. 2011-07-07 13:16:52 +09:00
Dan Nicolaescu
76b397fb2a Simplify Irix build, remove iris4d.h file.
* configure.in: Remove reference to iris4d.h.

* src/m/iris4d.h: Remove file, move contents ...
* src/s/irix6-5.h: ... here.
2011-07-06 20:24:33 -07:00
Paul Eggert
8a6ebd580b Add Bug#. 2011-07-06 16:29:03 -07:00
Kenichi Handa
d2a0a50628 merge trunk 2011-07-07 08:28:00 +09:00
Kenichi Handa
c805dec0b5 Add C interface for Unicode character property table. 2011-07-07 07:43:48 +09:00
Paul Eggert
8a5c77bba5 Remove more assumptions re struct layout (Bug#8884). 2011-07-06 15:22:32 -07:00
Paul Eggert
22b4128ef0 Remove unportable assumption about struct layout (Bug#8884).
* buffer.c (clone_per_buffer_values): Don't assume that
sizeof (struct buffer) is a multiple of sizeof (Lisp_Object).
This isn't true in general, and it's particularly not true
if Emacs is configured with --with-wide-int.
* buffer.h (FIRST_FIELD_PER_BUFFER, LAST_FIELD_PER_BUFFER):
New macros, used in the buffer.c change.
2011-07-06 14:53:56 -07:00
Paul Eggert
123403e42f Use pthread_sigmask, not sigprocmask.
* callproc.c (Fcall_process):
* sysdep.c (sys_sigblock, sys_sigunblock, sys_sigsetmask):
* process.c (create_process):
sigprocmask is portable only for single-threaded applications, and
Emacs can be multi-threaded when it uses GTK.
2011-07-06 11:04:23 -07:00
Juanma Barranquero
9173deecd8 Fix typos. 2011-07-05 11:51:56 +02:00
Jan Djärv
869795d6b5 Use GConf and GSettings both, check GConf/GSettings toolbar style and font name.
* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.

* lisp/dynamic-setting.el (dynamic-setting-handle-config-changed-event): 
Update doc string.

* src/xsettings.c: Use both GConf and GSettings if both are available.
(store_config_changed_event): Add comment.
(dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
(store_tool_bar_style_changed): New functions.
(store_monospaced_changed): Add comment. Call dpyinfo_valid.
(struct xsettings): Move font inside HAVE_XFT.
(GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
(GSETTINGS_MONO_FONT): Renamed from SYSTEM_MONO_FONT.
Move inside HAVE_XFT.
(something_changed_gsettingsCB): Renamed from something_changedCB.
Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
also.
(GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
(GCONF_MONO_FONT): Renamed from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
(something_changed_gconfCB): Renamed from something_changedCB.
Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
(parse_settings): Move check for font inside HAVE_XFT.
(read_settings, apply_xft_settings): Add comment.
(read_and_apply_settings): Add comment.  Call map_tool_bar_style and
store_tool_bar_style_changed.  Move check for font inside HAVE_XFT and
call store_font_name_changed.
(xft_settings_event): Add comment.
(init_gsettings): Add comment.  Get values for GSETTINGS_TOOL_BAR_STYLE
and GSETTINGS_FONT_NAME.  Move check for fonts within HAVE_XFT.
(init_gconf): Add comment.  Get values for GCONF_TOOL_BAR_STYLE
and GCONF_FONT_NAME.  Move check for fonts within HAVE_XFT.
(xsettings_initialize): Call init_gsettings last.
(xsettings_get_system_font, xsettings_get_system_normal_font): Add
comment.
2011-07-05 10:21:38 +02:00
Paul Eggert
d8ed26bd07 Random fixes. E.g., (random) never returned negative values.
* fns.c (Frandom): Use GET_EMACS_TIME for random seed, and add the
subseconds part to the entropy, as that's a bit more random.
Prefer signed to unsigned, since the signedness doesn't matter and
in general we prefer signed.  When given a limit, use a
denominator equal to INTMASK + 1, not to VALMASK + 1, because the
latter isn't right if USE_2_TAGS_FOR_INTS.
* sysdep.c (get_random): Return a value in the range 0..INTMASK,
not 0..VALMASK.  Don't discard "excess" bits that random () returns.
2011-07-04 19:51:15 -07:00
Stefan Monnier
cabf1cac90 * textprop.c (text_property_stickiness): Obey Vtext_property_default_nonsticky.
(syms_of_textprop): Add `display' to Vtext_property_default_nonsticky.
* w32fns.c (syms_of_w32fns):
* xfns.c (syms_of_xfns): Don't Add `display' since it's there by default.
2011-07-04 14:31:29 -04:00
Paul Eggert
6e9b2be9e6 * fileio.c (barf_or_query_if_file_exists): Use S_ISDIR.
This is more efficient than Ffile_directory_p and avoids a minor race.
2011-07-04 10:50:12 -07:00
Lars Magne Ingebrigtsen
7c301272b4 * buffer.c (Foverlay_put): Say what the return value is
(bug#7835).
2011-07-04 17:32:22 +02:00
Lars Magne Ingebrigtsen
ad63790719 (barf_or_query_if_file_exists): Make the "File is a directory"
error be more correct.
2011-07-04 16:34:31 +02:00
Lars Magne Ingebrigtsen
c4f2d8d48d * fileio.c (barf_or_query_if_file_exists): Check first if the file
is a directory before asking whether to use the file name
(bug#7564).
2011-07-04 15:44:52 +02:00
Lars Magne Ingebrigtsen
90186c68a4 * fns.c (Frequire): Remove the mention of the .gz files, since
that's installation-specific, but keep the mention of
`get-load-suffixes'.
2011-07-04 14:22:39 +02:00
Paul Eggert
da64016efd * editfns.c (Fformat_time_string): Don't assume strlen fits in int.
Report string overflow if the output is too long.
2011-07-04 00:44:38 -07:00
Juanma Barranquero
a555cb8799 src/gnutls.c: Remove bogus references to :verify-error.
* gnutls.c (Fgnutls_boot): Don't mention :verify-error.
  (syms_of_gnutls): Remove duplicate DEFSYM for
  Qgnutls_bootprop_verify_hostname_error, an error for
  Qgnutls_bootprop_verify_error (which is no longer used).
2011-07-04 04:47:04 +02:00
Juanma Barranquero
7d47b58038 src/eval.c (find_handler_clause): Remove unused parameters.
* eval.c (find_handler_clause): Remove parameters `sig' and `data',
  unused since 2011-01-26T20:02:07Z!monnier@iro.umontreal.ca.  All callers changed.
  Also (re)move comments that are misplaced or no longer relevant.
2011-07-04 04:14:42 +02:00
Lars Magne Ingebrigtsen
1e49bfab49 * callint.c (Finteractive): Clarify the meaning of "@".
Fixes: debbugs:8813
2011-07-04 01:21:45 +02:00
Chong Yidong
1485f4c03a Fix how custom themes handle faces, so the multi-tty/multi-frame case works.
* lisp/custom.el (custom-push-theme): Don't record faces in `changed'
theme; this doesn't work correctly for per-frame face settings.
(disable-theme): Use face-set-after-frame-default to reset faces.
(custom--frame-color-default): New function.

* lisp/frame.el (frame-background-mode, frame-set-background-mode):
Moved from faces.el.
(frame-default-terminal-background): New function.

* src/xfaces.c (Finternal_merge_in_global_face): Modify the foreground
and background color parameters if they have been changed.
2011-07-03 18:16:07 -04:00
Lars Magne Ingebrigtsen
a9ab721e7f Clarify what the "-" and "0" flags mean in the `format' function
(bug#6659).
2011-07-03 15:02:43 +02:00
Paul Eggert
2e13213db2 * xsettings.c (SYSTEM_FONT): Define only when used.
No need to define when HAVE_GSETTINGS || !HAVE_XFT.
2011-07-02 23:17:19 -07:00
Paul Eggert
cf7cff5784 * keymap.c (access_keymap_1): Now static. 2011-07-02 23:15:12 -07:00
Chong Yidong
7a8e04f79e Fix corner case in prefix-arg handling for mouse events (Bug#1586).
* src/keyboard.c (command_loop_1): If a down-mouse event is unbound,
leave any prefix arg for the up event.
2011-07-02 19:40:04 -04:00
Lars Magne Ingebrigtsen
69bb1ef7df * lread.c (syms_of_lread): Mention single symbols defined by
`defvar' or `defconst' (bug#7154).
2011-07-02 18:18:24 +02:00
Lars Magne Ingebrigtsen
7b3747f94c (Frequire): Mention get-load-suffixes. 2011-07-02 16:34:45 +02:00
Lars Magne Ingebrigtsen
61352f622b * fns.c (Frequire): Mention .el.gz files.
Fixes: debbugs:7314
2011-07-02 16:30:52 +02:00
Martin Rudalics
28545e0497 Remove clone-number support. Provide clone-of parameter in window states.
* window.h (window): Remove clone_number slot.
* window.c (Fwindow_clone_number, Fset_window_clone_number):
Remove.
(make_parent_window, make_window, saved_window)
(Fset_window_configuration, save_window_save): Don't deal with
clone numbers.
* buffer.c (Qclone_number): Remove declaration.
(sort_overlays, overlay_strings): Don't deal with clone numbers.

* window.el (window-state-get-1): Don't assign clone numbers.
Add clone-of item to list of window parameters.
(window-state-put-2): Don't process clone numbers.
(display-buffer-alist): Fix doc-string.
2011-07-02 12:36:48 +02:00