summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos.Juanma Barranquero2011-07-053-9/+9
|
* Use GConf and GSettings both, check GConf/GSettings toolbar style and font name.Jan Djärv2011-07-052-97/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Random fixes. E.g., (random) never returned negative values.Paul Eggert2011-07-043-7/+26
| | | | | | | | | | | * 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.
* * textprop.c (text_property_stickiness): Obey Vtext_property_default_nonsticky.Stefan Monnier2011-07-044-10/+16
| | | | | | (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.
* * fileio.c (barf_or_query_if_file_exists): Use S_ISDIR.Paul Eggert2011-07-042-1/+6
| | | | This is more efficient than Ffile_directory_p and avoids a minor race.
* * buffer.c (Foverlay_put): Say what the return value isLars Magne Ingebrigtsen2011-07-042-1/+5
| | | | (bug#7835).
* (barf_or_query_if_file_exists): Make the "File is a directory"Lars Magne Ingebrigtsen2011-07-042-1/+3
| | | | error be more correct.
* * fileio.c (barf_or_query_if_file_exists): Check first if the fileLars Magne Ingebrigtsen2011-07-042-0/+8
| | | | | is a directory before asking whether to use the file name (bug#7564).
* * fns.c (Frequire): Remove the mention of the .gz files, sinceLars Magne Ingebrigtsen2011-07-042-2/+7
| | | | | that's installation-specific, but keep the mention of `get-load-suffixes'.
* * editfns.c (Fformat_time_string): Don't assume strlen fits in int.Paul Eggert2011-07-042-3/+12
| | | | Report string overflow if the output is too long.
* src/gnutls.c: Remove bogus references to :verify-error.Juanma Barranquero2011-07-042-24/+25
| | | | | | | * 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).
* src/eval.c (find_handler_clause): Remove unused parameters.Juanma Barranquero2011-07-042-18/+13
| | | | | | * 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.
* * callint.c (Finteractive): Clarify the meaning of "@".Lars Magne Ingebrigtsen2011-07-042-3/+8
| | | | Fixes: debbugs:8813
* Fix how custom themes handle faces, so the multi-tty/multi-frame case works.Chong Yidong2011-07-032-0/+17
| | | | | | | | | | | | | | * 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.
* Clarify what the "-" and "0" flags mean in the `format' functionLars Magne Ingebrigtsen2011-07-032-1/+6
| | | | (bug#6659).
* * xsettings.c (SYSTEM_FONT): Define only when used.Paul Eggert2011-07-022-3/+8
| | | | No need to define when HAVE_GSETTINGS || !HAVE_XFT.
* * keymap.c (access_keymap_1): Now static.Paul Eggert2011-07-022-1/+5
|
* Fix corner case in prefix-arg handling for mouse events (Bug#1586).Chong Yidong2011-07-022-1/+17
| | | | | * src/keyboard.c (command_loop_1): If a down-mouse event is unbound, leave any prefix arg for the up event.
* * lread.c (syms_of_lread): Mention single symbols defined byLars Magne Ingebrigtsen2011-07-022-3/+8
| | | | `defvar' or `defconst' (bug#7154).
* (Frequire): Mention get-load-suffixes.Lars Magne Ingebrigtsen2011-07-022-1/+3
|
* * fns.c (Frequire): Mention .el.gz files.Lars Magne Ingebrigtsen2011-07-022-0/+5
| | | | Fixes: debbugs:7314
* Remove clone-number support. Provide clone-of parameter in window states.Martin Rudalics2011-07-024-49/+18
| | | | | | | | | | | | | | | | * 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.
* Add multiple inheritance to keymaps.Stefan Monnier2011-07-023-352/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/keymap.c (Fmake_composed_keymap): New function. (Fset_keymap_parent): Simplify. (fix_submap_inheritance): Remove. (access_keymap_1): New function extracted from access_keymap to handle embedded parents and handle lists of maps. (access_keymap): Use it. (Fkeymap_prompt, map_keymap_internal, map_keymap, store_in_keymap) (Fcopy_keymap): Handle embedded parents. (Fcommand_remapping, define_as_prefix): Simplify. (Fkey_binding): Simplify. (syms_of_keymap): Move minibuffer-local-completion-map, minibuffer-local-filename-completion-map, minibuffer-local-must-match-map, and minibuffer-local-filename-must-match-map to Elisp. (syms_of_keymap): Defsubr make-composed-keymap. * src/keyboard.c (menu_bar_items): Use map_keymap_canonical. (parse_menu_item): Trivial simplification. * lisp/subr.el (remq): Don't allocate if it's not needed. (keymap--menu-item-binding, keymap--menu-item-with-binding) (keymap--merge-bindings): New functions. (keymap-canonicalize): Use them to refine the canonicalization. * lisp/minibuffer.el (minibuffer-local-completion-map) (minibuffer-local-must-match-map): Move initialization from C. (minibuffer-local-filename-completion-map): Move initialization from C; don't inherit from anything here. (minibuffer-local-filename-must-match-map): Make obsolete. (completing-read-default): Use make-composed-keymap to combine minibuffer-local-filename-completion-map with either minibuffer-local-must-match-map or minibuffer-local-filename-completion-map.
* Fix typos that break xsettings.c compilation.Glenn Morris2011-07-012-1/+5
| | | | | | * configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo. * src/Makefile.in (SETTINGS_LIBS): Fix typo.
* * coding.c (Fencode_coding_string): Record the last coding systemKazuhiro Ito2011-07-012-1/+6
| | | | | | used, as the function doc string says. Fixes: debbugs:8738
* * process.c: Add defined (HAVE_GSETTINGS) for xgselect.hJan Djärv2011-07-014-156/+72
| | | | | | | | | | | | | | | | | | | | | | | | (wait_reading_process_output): Add defined (HAVE_GSETTINGS) for xg_select. * xgselect.c: Add defined (HAVE_GSETTINGS). (xgselect_initialize): Ditto. * xsettings.c (store_monospaced_changed): Take new font as arg and check for change against current_mono_font. (EMACS_TYPE_SETTINGS): Remove this and related defines. (emacs_settings_constructor, emacs_settings_get_property) (emacs_settings_set_property, emacs_settings_class_init) (emacs_settings_init, gsettings_obj): Remove. (something_changedCB): New function for HAVE_GSETTINGS. (something_changedCB): HAVE_GCONF: Call store_monospaced_changed with value as argument. (init_gsettings): Check that GSETTINGS_SCHEMA exists before calling g_settings_new. Do not create gsettings_obj. Remove calls to g_settings_bind. Connect something_changedCB to "changed". Fixes: debbugs:8967
* * eval.c (struct backtrace): Simplify and port the data structure.Paul Eggert2011-06-302-20/+13
| | | | | | | | | Do not assume that "int nargs : BITS_PER_INT - 2;" produces a signed bit field, as this assumption is not portable and it makes Emacs crash when compiled with Sun C 5.8 on sparc. Do not use "char debug_on_exit : 1" as this is not portable either; instead, use the portable "unsigned int debug_on_exit : 1". Remove unused member evalargs. Remove obsolete comments about cc bombing out.
* Fix bad include.Jan Djärv2011-06-302-3/+3
| | | | * xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
* Add GSettings support (GConf is going away).Jan Djärv2011-06-303-29/+242
| | | | | | | | | | | | | | | | | | | | | | | * configure.in (gsettings): New option and check for GSettings. * src/Makefile.in (SETTINGS_CFLAGS, SETTINGS_LIBS): Renamed from GCONF_CFLAGS/LIBS. * src/xsettings.c: Include glib.h if HAVE_GSETTINGS. Let HAVE_GSETTINGS override HAVE_GCONF. (store_monospaced_changed): New function. (EMACS_SETTINGS): A new type derived from GObject to handle GSettings notifications. (emacs_settings_constructor, emacs_settings_get_property) (emacs_settings_set_property, emacs_settings_class_init): New functions. (gsettings_client, gsettings_obj): New variables. (GSETTINGS_SCHEMA): New define. (something_changedCB): Call store_monospaced_changed. (init_gsettings): New function. (xsettings_initialize): Call init_gsettings. (syms_of_xsettings): Initialize gsettings_client, gsettings_obj to NULL.
* ChangeLog fix.Glenn Morris2011-06-291-1/+1
|
* Rename more functions to use window-/window-- prefixes.Martin Rudalics2011-06-292-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.c (resize_root_window, grow_mini_window) (shrink_mini_window): Rename Qresize_root_window to Qwindow_resize_root_window and Qresize_root_window_vertically to Qwindow_resize_root_window_vertically. * window.el (normalize-live-buffer): Rename to window-normalize-buffer. (normalize-live-frame): Rename to window-normalize-frame. (normalize-any-window): Rename to window-normalize-any-window. (normalize-live-window): Rename to window-normalize-live-window. (make-window-atom): Rename to window-make-atom. (window-resize-reset): Rename to window--resize-reset. (window-resize-reset-1): Rename to window--resize-reset-1. (resize-mini-window): Rename to window--resize-mini-window. (resize-subwindows-skip-p): Rename to window--resize-subwindows-skip-p. (resize-subwindows-normal): Rename to window--resize-subwindows-normal. (resize-subwindows): Rename to window--resize-subwindows. (resize-other-windows): Rename to window--resize-siblings. (resize-this-window): Rename to window--resize-this-window. (resize-root-window): Rename to window--resize-root-window. (resize-root-window-vertically): Rename to window--resize-root-window-vertically. (normalize-buffer-to-display): Rename to window-normalize-buffer-to-display. (normalize-buffer-to-switch-to): Rename to window-normalize-buffer-to-switch-to. Correspondingly update all callers of the functions listed above. (display-buffer-alist, display-buffer-normalize-arguments) (display-buffer-normalize-options, display-buffer) (display-buffer-alist-set): Use "function" instead of "fun-with-args".
* * gnutls.c (Qgnutls_bootprop_verify_error): Remove unused var.Paul Eggert2011-06-282-1/+4
|
* Use window- prefix more consistently. Fix two buffer display bugs.Martin Rudalics2011-06-272-41/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.c (resize_window_check): Rename to window_resize_check. (resize_window_apply): Rename to window_resize_apply. (Fresize_window_apply): Rename to Fwindow_resize_apply. (Fdelete_other_windows_internal, resize_frame_windows) (Fsplit_window_internal, Fdelete_window_internal) (grow_mini_window, shrink_mini_window) (Fresize_mini_window_internal): Fix callers accordingly. * window.el (resize-window-reset): Rename to window-resize-reset. (resize-window-reset-1): Rename to window-resize-reset-1. (resize-window): Rename to window-resize. (window-min-height, window-min-width) (resize-mini-window, resize-this-window, resize-root-window) (resize-root-window-vertically, adjust-window-trailing-edge) (enlarge-window, shrink-window, maximize-window) (minimize-window, delete-window, quit-restore-window) (split-window, balance-windows, balance-windows-area-adjust) (balance-windows-area, window-state-put-2) (display-buffer-even-window-sizes, display-buffer-set-height) (display-buffer-set-width, set-window-text-height) (fit-window-to-buffer): Rename all "resize-window" prefixed calls to use the "window-resize" prefix convention. (display-buffer-alist): Fix symbol for label specifier. (display-buffer-reuse-window): Set reuse-dedicated to cdr of corresponding specifier. Reported by Juanma Barranquero <lekktu@gmail.com>.
* src/makefile.w32-in: Redesign dependencies.Juanma Barranquero2011-06-272-955/+730
|
* Use better names for window-next/-prev and window-vchild/-hchild.Martin Rudalics2011-06-272-16/+21
| | | | | | | | | | | | | | | | | * window.c (Fwindow_vchild): Rename to Fwindow_top_child. (Fwindow_hchild): Rename to Fwindow_left_child. (Fwindow_next): Rename to Fwindow_next_sibling. (Fwindow_prev): Rename to Fwindow_prev_sibling. * window.el (window-right, window-left, window-child) (window-child-count, window-last-child) (window-iso-combination-p, walk-window-tree-1) (window-atom-check-1, window-tree-1, delete-window) (window-state-get-1, display-buffer-even-window-sizes): Adapt to new naming conventions - window-vchild, window-hchild, window-next and window-prev are now called window-top-child, window-left-child, window-next-sibling and window-prev-sibling respectively.
* Have overlays with window property respect clone numbers.Martin Rudalics2011-06-272-6/+24
| | | | | | | * buffer.c (Qclone_number): Declare static and DEFSYM it. (sort_overlays, overlay_strings): When an overlay's clone number matches the window's clone number process the overlay even if the overlay's window property doesn't match the current window.
* Fix wm_size-hints race between KDE/KWin and Gtk+ 3.Jan Djärv2011-06-264-46/+102
| | | | | | | | | | | | | | | | | | | | | | | * emacsgtkfixed.c: State that this is only used with Gtk+3. (_EmacsFixedPrivate): Remove minwidth/height. Add struct frame *f. (emacs_fixed_init): Initialize priv->f. (get_parent_class, emacs_fixed_set_min_size): Remove. (emacs_fixed_new): Set priv->f to argument. (emacs_fixed_get_preferred_width) (emacs_fixed_get_preferred_height): Use min_width/height from frames size_hint to set minimum and natural. (XSetWMSizeHints, XSetWMNormalHints): Override these functions and use min_width/height from frames size_hint to set min_width/height (Bug#8919). * emacsgtkfixed.h: State that this is only used with Gtk+3. (emacs_fixed_set_min_size): Remove. (emacs_fixed_new): Take frame as argument. * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new. (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix indentation.
* Avoid bidi-related crashes in Cperl Mode.Eli Zaretskii2011-06-262-2/+8
| | | | | | src/bidi.c (bidi_paragraph_init): Test for ZV_BYTE before calling bidi_at_paragraph_end, since fast_looking_at doesn't like to be called at ZV.
* Fix handling of pending signals in wait_reading_process_output (Bug#8869).Chong Yidong2011-06-252-4/+16
| | | | | | * process.c (wait_reading_process_output): Bypass select if waiting for a cell while ignoring keyboard input, and input is pending. Suggested by Jan Djärv.
* ChangeLog fix.Glenn Morris2011-06-251-1/+1
|
* Merge from trunk.Paul Eggert2011-06-252-0/+6
|\
| * Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.Glenn Morris2011-06-252-0/+6
| |\
| | * * dispnew.c (scrolling_window): Before scrolling, turn off a mouse-highlight ↵YAMAMOTO Mitsuharu2011-06-182-0/+6
| | | | | | | | | | | | in the window being scrolled.
| | * Fix ChangeLog entry (no need to merge to trunk)Glenn Morris2011-06-161-5/+4
| | |
| | * Merge: nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF.Paul Eggert2011-06-162-35/+40
| | |
* | | Use gnulib's dup2 module instead of rolling our own.Paul Eggert2011-06-252-31/+5
|/ / | | | | | | | | | | | | * Makefile.in (GNULIB_MODULES): Add dup2. * configure.in: Do not check for dup2; gnulib does that now. * lib/dup2.c, m4/dup2.m4: New files, from gnulib. * src/sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.
* | Move DEFSYM to lisp.h and use everywhere.Juanma Barranquero2011-06-2450-1300/+656
| |
* | * gnutls.c (syms_of_gnutls): Use the DEFSYM macro from character.h.Ted Zlatanov2011-06-242-57/+27
| |
* | Merge from trunk.Paul Eggert2011-06-232-82/+10
|\ \
| * | Move completing-read-function and completing-read-default to elispLeo Liu2011-06-232-80/+6
| | |
View Lorry Controller Status