mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-08 23:40:24 -08:00
Code Issues Projects Releases Wiki Activity
141943 commits 241 branches 194 tags 7.7 GiB
Commit graph

360 commits

Author SHA1 Message Date
Jan Djärv
8a52f00afa Add tool bar style text-image-horiz (text to the left of the image). 
* lisp/cus-start.el (tool-bar-style): Add text-image-horiz.

* src/gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar
style text_image_horiz.

* src/lisp.h (Qtext_image_horiz): Declare.

* src/xdisp.c (Qtext_image_horiz): Define.
(syms_of_xdisp): Initialize Qtext_image_horiz.  Add text-image-horiz
to ducumentation of tool-bar-style.

* src/xsettings.c (Ftool_bar_get_system_style): Also check for
Qtext_image_horiz.
 2010-07-28 19:34:51 +02:00
Eli Zaretskii
c0162ade6f cus-start.el (all): Add native condition for tool-bar-* symbols. 2010-05-07 16:52:25 +03:00
Jan Djärv
f904c0f938 Gtk tool bars can be text, icons with text or just icons. 
* xsettings.c: Qmonospace_font_name, Qtool_bar_style and
current_tool_bar_style are new.
(store_config_changed_event): Rename from store_font_changed_event.
(XSETTINGS_TOOL_BAR_STYLE): New define.
(SEEN_FONT, SEEN_TB_STYLE): New enum values.
(struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
HAVE_XFT.
(something_changedCB): store_font_changed_event is now
store_config_changed_event
(parse_settings): Rename from parse_xft_settings.  Read
non-xft xsettings outside #ifdef HAVE_XFT.
(read_settings): Renamed from read_xft_settings.
(apply_xft_settings): Take current settings as parameter.  Do not
call read_(xft)_settings.
(read_and_apply_settings): New function.
(xft_settings_event): Do non-xft stuff out of HAVE_XFT.  Call
read_and_apply_settings if there are settings to be read.
(init_xsettings): Renamed from init_xfd_settings.
Call read_and_apply_settings unconditionally.
(xsettings_initialize): Call init_xsettings.
(Ftool_bar_get_system_style): New function.
(syms_of_xsettings): Define Qmonospace_font_name and
Qtool_bar_style.  Initialize current_tool_bar_style to nil.
defsubr Stool_bar_get_system_style. Fprovide on
dynamic-setting.

* xsettings.h (Ftool_bar_get_system_style): Declare.

* xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
Qtext, Qboth, Qboth_horiz are new.
(syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
Vtool_bar_style, tool_bar_max_label_size.

* lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.

* keyboard.c: QClabel is new.
(parse_tool_bar_item): Take out QClabel from tool bar items.
Try to construct a label if ther is no QClabel.
(syms_of_keyboard): Intern :label as QClabel.

* dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
(Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
New.

* Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
dynamic-setting.el.

* gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
(xg_make_tool_item, xg_show_toolbar_item): New function.
(update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
Call xg_make_tool_item to make a tool bar item.
Call xg_show_toolbar_item.  Use wtoolbar instead of x->toolbar_widget.

* xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
into account for toolbars.

* vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.

* tool-bar.el (tool-bar-setup): Add :label on some tool bar items.

* loadup.el: Load dynamic-setting.el if feature dynamic-setting
is present.

* info.el (info-tool-bar-map): Add labels.

* cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.

* cus-edit.el (custom-commands): Add labels for tool bar.
(custom-buffer-create-internal, Custom-mode): Adjust for
labels in custom-commands.

* dynamic-setting.el: Renamed from font-setting.el.
 2010-04-20 20:52:07 +02:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Jan Djärv
8b571bf308 * cus-start.el (all): Add native condition for font-use-system-font. 
* configure.in: Don't check for GConf unless X is used.
 2009-11-21 15:40:24 +00:00
Jan Djärv
dfb3c4c640 xsettings.c didn't check font-use-system-font, fix that. 
* xsettings.c (something_changedCB, Ffont_get_system_font): Check
use_system_font.
(syms_of_xsettings): DEFVAR font-use-system-font.

* font-setting.el (font-use-system-font): Moved ...

* cus-start.el (all): ... to here.
 2009-11-17 20:17:46 +00:00
Adrian Robert
044f9b057d * cus-start.el (ns-use-qd-smoothing): Remove. 2009-09-18 15:33:26 +00:00
Stefan Monnier
4e3b4528ea * subr.el (default-mode-line-format, default-header-line-format) 
(default-line-spacing, default-abbrev-mode, default-ctl-arrow)
(default-direction-reversed, default-truncate-lines)
(default-left-margin, default-tab-width, default-case-fold-search)
(default-left-margin-width, default-right-margin-width)
(default-left-fringe-width, default-right-fringe-width)
(default-fringes-outside-margins, default-scroll-bar-width)
(default-vertical-scroll-bar, default-indicate-empty-lines)
(default-indicate-buffer-boundaries, default-fringe-indicator-alist)
(default-fringe-cursor-alist, default-scroll-up-aggressively)
(default-scroll-down-aggressively, default-fill-column)
(default-cursor-type, default-buffer-file-type)
(default-cursor-in-non-selected-windows)
(default-buffer-file-coding-system, default-major-mode)
(default-enable-multibyte-characters): Mark as obsolete.
* cus-start.el (default-major-mode): Customize `major-mode' instead.
(enable-multibyte-characters): Not customizable any more.
 2009-08-27 04:24:00 +00:00
Jan Djärv
e044e4fcd5 * xterm.h (struct x_display_info): Add invisible_cursor. 
(struct x_output): Add current_cursor.

* xterm.c (XTtoggle_invisible_pointer): New function.
(x_define_frame_cursor): Don't define cursor if invisible or the
same as before.  Set current_cursor.
(x_create_terminal): Set toggle_invisible_pointer_hook.

* xfns.c (make_invisible_cursor): New function.
(x_set_mouse_color): Call make_invisible_cursor.
Set current_cursor.
(x_window): Set current_cursor.

* termhooks.h (struct terminal): Add toggle_invisible_pointer_hook.

* keyboard.c (command_loop_1): Call frame_make_pointer_invisible after
inserting a character.
(read_avail_input): Call frame_make_pointer_visible.

* frame.c (Vmake_pointer_invisible): New variable.
(frame_make_pointer_invisible, frame_make_pointer_visible): New
functions.
(syms_of_frame): DEFVAR make-pointer-invisible, initialize to Qt.

* frame.h: Declare frame_make_pointer_invisible and
frame_make_pointer_visible.
(struct frame): Add pointer_invisible.

* cus-start.el (all): Added make-pointer-invisible.
 2009-07-03 11:07:02 +00:00
Miles Bader
666e158e38 Add the recenter-redisplay' variable, and make recenter' use it. 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1604
 2009-06-23 07:07:45 +00:00
Andreas Schwab
11ff3b6711 * simple.el (shift-select-mode): Make it a defcustom. 
* cus-start.el: Remove shift-select-mode.
 2009-03-27 16:50:14 +00:00
David Reitter
ae2349fed8 (all): Use existing ns' rather than new nextstep' group for variables affected by last two changes. 2009-03-21 13:01:44 +00:00
Eli Zaretskii
77346ecd11 (all): Fix last change. 2009-03-21 09:47:13 +00:00
David Reitter
bc9ebf4106 (all): add ns-{control|command|alternate|function}-modifier', ns-antialias-text' and `ns-use-qd-smoothing' 2009-03-21 02:31:29 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
3a66cc9128 (truncate-partial-width-windows): Changed in 23.1. 2008-08-29 06:55:22 +00:00
Chong Yidong
6ba7a6f0fa Handle auto-save-visited-file-name. 2008-08-05 21:41:56 +00:00
Chong Yidong
ed278e5d53 Add customization info for read-buffer-completion-ignore-case. 2008-07-30 15:29:06 +00:00
Dan Nicolaescu
9e2a264775 Remove support for Mac Carbon. 
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon

* erc.el: Remove code for Carbon.

Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.

Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.

* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.

* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.

* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.

* xresources.texi: Remove mentions of Mac Carbon.

* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.

Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL:  Remove code for Carbon.
* configure: Regenerate.
 2008-07-27 18:24:48 +00:00
Jason Rumney
6cf29fe815 Changes from Toru Tsuneyoshi for using Trash can when deleting files. 
* files.el (backup-extract-version): Handle versioned directories.
	(trash-directory): New variable.
	(move-file-to-trash): New function.

	* cus-start.el (delete-by-moving-to-trash): Declare for custom.

        * lisp.h (Qdelete_file, Qdelete_directory): Declare extern.

        * fileio.c (delete_by_moving_to_trash, Qmove_file_to_trash): New vars.
        (syms_of_fileio): Initialize and export them.
        (Fdelete_directory, Fdelete_file): Optionally delete via trash.

        * w32fns.c (FOF_NO_CONNECTED_ELEMENTS): Define if not already.
        (Fsystem_move_file_to_trash): New function.
        (syms_of_w32fns): Export it to lisp.
 2008-07-02 13:19:07 +00:00
Chong Yidong
84975bbe3b Add customization types for word-wrap and shift-select-mode. 2008-06-26 19:29:43 +00:00
Stefan Monnier
2a3bd2e193 * xdisp.c (underline_minimum_offset): Rename from xterm.c's 
x_underline_minimum_display_offset.
(syms_of_xdisp): Declare it here rather than in xterm.c.
* dispextern.h (underline_minimum_offset): Declare it.
* w32term.c (x_draw_glyph_string): Use it.
* xterm.c (x_underline_minimum_display_offset): Move to xdisp.c.
(syms_of_xterm): Don't declare it any more.
(x_draw_glyph_string): Adjust to the new name.

* cus-start.el (underline-minimum-offset) Rename from
x-underline-minimum-display-offset.
 2008-06-10 20:22:10 +00:00
Stefan Monnier
d5dc61631e * xterm.c (x_underline_minimum_display_offset): New var. 
(x_draw_glyph_string): Use it.
(syms_of_xterm): Declare it.
* cus-start.el (x-underline-minimum-display-offset): Give it a type.
 2008-06-10 20:01:54 +00:00
Stefan Monnier
87478b52f9 * window.el (display-buffer-function, special-display-p) 
(special-display-buffer-names, special-display-regexps)
(special-display-function, same-window-p, same-window-buffer-names)
(same-window-regexps, pop-up-frames, display-buffer-reuse-frames)
(pop-up-frame-function, pop-up-windows)
(split-window-preferred-function, split-height-threshold)
(split-width-threshold, window--splittable-p)
(window--try-to-split-window, window--frame-usable-p)
(even-window-heights, window--even-window-heights)
(window--display-buffer-1, window--display-buffer-2, display-buffer)
(pop-to-buffer): Move from window.c and buffer.c.
(split-window-preferred-horizontally): Remove.
* cus-start.el: Remove corresponding declarations.

* window.c (pop_up_windows, pop_up_frames)
(display_buffer_reuse_frames, Vpop_up_frame_function)
(Vdisplay_buffer_function, Veven_window_heights)
(Vspecial_display_buffer_names, Vspecial_display_regexps)
(Vspecial_display_function, Vsame_window_buffer_names)
(Vsame_window_regexps, split_height_threshold)
(Vsplit_window_preferred_function): Move those vars to window.el.
(display_buffer_1, Fspecial_display_p, Fsame_window_p)
(Fdisplay_buffer): Move those functions to window.el.
(syms_of_window): Remove corresponding declarations.
(display_buffer): New function.
(temp_output_buffer_show, Fother_window_for_scrolling): Use it.
* dispnew.c (Flast_nonminibuf_frame): New function.
* buffer.c (Fpop_to_buffer): Move to window.el.
 2008-06-05 18:00:36 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Stefan Monnier
dbd50d4b77 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate) 
(read-file-name-completion-ignore-case, insert-default-directory):
New vars, moved from fileio.c.
(read-file-name): New fun, moved from fileio.c.
* lisp/cus-start.el: Remove insert-default-directory and
read-file-name-completion-ignore-case.
* src/fileio.c (Vread_file_name_function, Vread_file_name_predicate)
(read_file_name_completion_ignore_case, insert_default_directory)
(Qdefault_directory): Move to minibuffer.el.
(Fread_file_name): Call the new `read-file-name' instead.
 2008-04-23 18:19:57 +00:00
Stefan Monnier
ba5ff07b2a * minibuffer.el (minibuffer): Move group from cus-edit.el. 
(completion-auto-help): Move from C code.
(minibuffer--maybe-completion-help): Remove.
(minibuffer--bitset): New function.
(minibuffer--do-completion): Rename from minibuffer-do-completion.
Renumber a bit.  Really complete on string *before* point.
Add argument used for word-completion.
Join trailing / in completion with following text, as done in
minibuffer-complete-word.
Handle new value `lazy' for completion-auto-help.
(minibuffer-try-word-completion): New function extracted from
minibuffer-complete-word.
(minibuffer-complete-word): Use minibuffer--do-completion.
(minibuffer--insert-strings): Rename from
minibuffer-complete-insert-strings.
(exit-minibuffer): Fix typo.
* cus-edit.el (minibuffer): Move group to minibuffer.el.
* cus-start.el: Remove completion-auto-help.
* minibuf.c (Vcompletion_auto_help): Move to minibuffer.el.
(syms_of_minibuf): Remove its initialization.
 2008-04-09 19:33:56 +00:00
Juri Linkov
f1917c6f19 (split-window-preferred-function): 
Set choice for "vertically" to nil instead of split-window.
Set choice for "horizontally" to split-window-preferred-horizontally
instead of lambda.
 2008-03-29 23:04:17 +00:00
Glenn Morris
866a8ce4ed (selection-coding-system): Remove, since it's now defined in select.el 
rather than in xselect.c.
 2008-02-08 20:12:26 +00:00
Miles Bader
d235ca2ff8 Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
 2008-01-30 07:57:28 +00:00
Martin Rudalics
6671cab318 (all): Add missing version entries. 2008-01-11 09:59:48 +00:00
Miles Bader
430d2ee291 Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
 2008-01-09 01:21:15 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
 2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Miles Bader
a0c92ed92d Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306
 2007-12-29 02:39:17 +00:00
Martin Rudalics
e45db0fb26 (all): Use correct group name for members of mode-line group. 2007-12-19 17:06:28 +00:00
Martin Rudalics
3283b167ac (all): Use correct group name for members of mode-line group. 2007-12-19 17:02:10 +00:00
Miles Bader
f23d76bdef Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
 2007-11-11 00:56:44 +00:00
Stefan Monnier
e047f44883 Rewrite abbrev.c in Elisp. 
* image.c (Qcount): Don't declare as extern.
(syms_of_image): Initialize and staticpro `Qcount'.
* puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
* emacs.c (main): Don't call syms_of_abbrev.
* Makefile.in (obj): Remove abbrev.o.
(abbrev.o): Remove.
* abbrev.c: Remove.

Rewrite abbrev.c in Elisp.
* abbrev.el (abbrev-mode): Move custom group from cus-edit.el.
(abbrev-table-get, abbrev-table-put, abbrev-get)
(abbrev-put, make-abbrev-table, abbrev-table-p, clear-abbrev-table)
(define-abbrev, abbrev--check-chars, define-global-abbrev)
(define-mode-abbrev, abbrev--active-tables, abbrev-symbol)
(abbrev-expansion, abbrev--before-point, expand-abbrev)
(unexpand-abbrev, abbrev--write, abbrev--describe)
(insert-abbrev-table-description, define-abbrev-table):
New funs, largely transcribed from abbrev.c.
(abbrev-with-wrapper-hook): New macro.
(abbrev-table-name-list, global-abbrev-table)
(abbrev-minor-mode-table-alist, fundamental-mode-abbrev-table)
(abbrevs-changed, abbrev-all-caps, abbrev-start-location)
(abbrev-start-location-buffer, last-abbrev, last-abbrev-text)
(last-abbrev-location, pre-abbrev-expand-hook, abbrev-expand-function):
New vars, largely transcribed from abbrev.c.
* cus-edit.el (abbrev-mode): Remove.  Move to abbrev.el.
* cus-start.el: Remove abbrev-all-caps and pre-abbrev-expand-hook.
* loadup.el: Load "abbrev.el" before "lisp-mode.el".
 2007-10-28 02:41:00 +00:00
Miles Bader
63655c8314 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 887-889)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 116-121)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-268
 2007-10-15 05:03:21 +00:00
Dan Nicolaescu
ce00d09337 * cus-start.el (all): Use test that does not match the X11 version 
for mac.
 2007-10-13 16:36:05 +00:00
Dan Nicolaescu
3d2062d8f6 * cus-start.el (all): Undo previous change. 2007-10-13 09:14:27 +00:00
Miles Bader
2b42d458a4 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 880-885)

   - Remove RCS keywords from doc/misc/cc-mode.texi
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264
 2007-10-13 05:53:03 +00:00
Dan Nicolaescu
e470405ced * cus-start.el (all): Use the same test as the 22.2 branch. 2007-10-12 23:40:42 +00:00
Miles Bader
ecb21060d5 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
 2007-10-11 16:14:00 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
 2007-10-09 08:52:57 +00:00
Martin Rudalics
f4c307a53b (all): Add focus-follows-mouse. 2007-10-06 10:06:28 +00:00
Romain Francoise
1c5eb1357a (all): Revert 2007-09-08 change. 2007-09-12 11:32:41 +00:00
Eli Zaretskii
e80134cd12 (all): Add prefer-window-split-horizontally from window.c. 2007-09-08 10:35:27 +00:00
Stefan Monnier
c8f1ea764e (split-window-preferred-function): Add custom info. 2007-09-07 03:32:35 +00:00