GitLab

Set with AC_DEFINE rather than AH_BOTTOM.

* src/s/sol2-6.h (INHIBIT_X11R6_XIM): Remove, handled by configure now.

* admin/CPP-DEFINES: Remove INHIBIT_X11R6_XIM.

* configure, src/config.in: Regenerate.

* configure.in (CFLAGS, REAL_CFLAGS): Set with shell, not cpp.
* configure, src/config.in: Regenerate.

* configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC):
(USE_MMAP_FOR_BUFFERS, C_WARNING_SWITCH): Set with shell, not cpp.
(LIBX): Remove, just use -lX11 in the one place this was used.
(cannot_dump): Replace with CANNOT_DUMP.

* src/Makefile.in (CANNOT_DUMP): Update for configure name change.

* src/s/freebsd.h (USE_MMAP_FOR_BUFFERS):
* src/s/irix6-5.h (USE_MMAP_FOR_BUFFERS):
* src/s/darwin.h (SYSTEM_MALLOC):
* src/s/sol2-10.h (SYSTEM_MALLOC): Move to configure.

* src/m/alpha.h: Remove old comment.
* src/s/aix4-2.h: Update comment.
* src/s/template.h: Remove USE_MMAP_FOR_BUFFERS.

* msdos/sed1v2.inp (CANNOT_DUMP): Update for configure name change.

* admin/CPP-DEFINES: Remove USE_MMAP_FOR_BUFFERS, CANNOT_DUMP.

* etc/DEBUG: Update SYSTEM_MALLOC and CANNOT_DUMP references.
Some re-filling.

* vc/diff-mode.el (diff-vc-backend): New var.

* vc/vc.el (vc-deduce-backend): New fun.  Handle diff buffers.
(vc-root-diff, vc-print-root-log, vc-log-incoming)
(vc-log-outgoing): Use it.
(vc-diff-internal): Set diff-vc-backend.

* nsfns.m: extern declare Vmenu_bar_mode, Vtool_bar_mode.
(ns_get_screen): Don't assign integer to f.
(Fx_display_color_cells): Declarations before statements.

* configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
by minimum required Gtk+ 2.6).  Add checks for functions introduced
in Gtk+ 2.14 or newer.

* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.

* xterm.c (XTflash): Use gtk_widget_get_window.
(xg_scroll_callback): Use gtk_adjustment_get_upper and
gtk_adjustment_get_page_size.
(handle_one_xevent): Use gtk_widget_get_mapped.
(x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
messages.

* xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.

* gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
HAVE_GTK_FILE_SELECTION_NEW.

* gtkutil.c (xg_display_open, xg_display_close): Remove
HAVE_GTK_MULTIDISPLAY, it is always defined.
(xg_display_open): Return type is void.
(gtk_widget_set_has_window)
(gtk_dialog_get_action_area, gtk_dialog_get_content_area)
(gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
(gtk_adjustment_set_page_increment)
(gtk_adjustment_get_step_increment): #define these if not found
by configure.
(remove_submenu): New define based on Gtk+ version.
(xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
gtk_widget_get_window.
(xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
(xg_create_frame_widgets): Use gtk_widget_set_has_window.
(create_dialog): Use gtk_dialog_get_action_area and
gtk_dialog_get_content_area.
(xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW.  File chooser is always
available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
(xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
g_object_ref and g_object_unref.
(xg_update_menu_item, xg_tool_bar_menu_proxy): Use
gtk_widget_get_sensitive.
(xg_update_submenu): Use remove_submenu.
(xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
properties instead to get old x and y position.
(xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
(xg_get_tool_bar_widgets): New function.
(xg_tool_bar_menu_proxy, xg_show_toolbar_item)
(update_frame_tool_bar): Call xg_get_tool_bar_widgets.
(toolbar_set_orientation): New #define based on if configure
finds gtk_orientable_set_orientation.
(xg_create_tool_bar): Call toolbar_set_orientation.
(xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
instead of gtk_box_pack_start_defaults.

delete-forward-char.

* mouse.el (mouse-region-delete-keys): Deleted.
(mouse-show-mark): Simplify.

* simple.el (delete-active-region): New option.
(delete-backward-char): Implement in Lisp.
(delete-forward-char): New command.

* src/cmds.c (Fdelete_backward_char): Move into Lisp.

bsd-common.h defines it already.

(ruby-mode): Bind indent-line-function (Bug#5119).

Don't add entries for `menu-bar-lines' and `tool-bar-lines' to
`default-frame-alist' and `initial-frame-alist' at startup.
Instead, use X resources to update the `menu-bar-mode' and
`tool-bar-mode' variables at startup, and use them as defaults during
frame creation.

* lisp/frame.el (frame-notice-user-settings): Don't change
default-frame-alist based on menu-bar-mode and tool-bar-mode, or
vice versa.

* lisp/menu-bar.el (menu-bar-mode):
* lisp/tool-bar.el (tool-bar-mode): Don't change default-frame-alist.
Set init-value to t.

* lisp/startup.el (command-line): Use X resources to set the value of
menu-bar-mode and tool-bar-mode, before calling frame-initialize.

* src/frame.c (Vmenu_bar_mode, Vtool_bar_mode): New vars.

* src/w32fns.c (Fx_create_frame):
* src/nsfns.m (Fx_create_frame): Likewise.

* src/xfns.c (Fx_create_frame): Don't consult X resouces when setting
menu-bar-lines and tool-bar-lines.  Use menu-bar-mode and
tool-bar-mode, which are now set using these X resources at
startup, to determine the defaults.

 config.bat: Remove white space around "+" in COPY commands.
 msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c
 instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org).
 msdos/sed1v2.inp (MKDEPDIR): Edit to empty.
 Delete lines in rules that invoke $(MKDEPDIR).
 Fix editing rules that begin with "cd ../lisp".
 Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
 Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.

2010-06-26  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-goto-calendar): Do not bind obsolete
	variables.

	* org.el (calendar): Require calendar now on top level in org.el
	and define aliases to new variables when needed.
	(org-read-date, org-goto-calendar): Do not bind obsolete
	variables.

Since the menu-bar and tool-bar are now unconditionally turned on by
default, we can let the defcustom defaults reflect that.

* frame.el (initial-frame-alist): Give default value entries for
menu-bar-lines and tool-bar-lines consistent with the startup
default (Bug#2249).

* frame.c (Vdefault_frame_alist): Give default value entries for
menu-bar-lines and tool-bar-lines consistent with the startup
default (Bug#2249).

Add missing Changelog entries for textmodes/ispell.el (bzr#100641) and textmodes/flyspell.el (bzr#100640)

`horizontal'.  Remove `nil' value from :type.  Doc fix.  (Bug#6459)

buffer-locally to lambda that re-runs the vc diff command.  (Bug#6447)

* lisp/kmacro.el (kmacro-call-macro): Don't issue hint message if the
echo area is in use (Bug#3412).

* gtkutil.c (xg_update_scrollbar_pos): Show/hide scroll bar as needed
if height is less than scroll bar min size.
(xg_show_scroll_bar): Remove, show moved to xg_update_scrollbar_pos.

* gtkutil.h (xg_show_scroll_bar): : Remove.

* xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar.

* lisp/textmodes/texinfmt.el (texinfo-format-region)
(texinfo-raise-lower-sections, texinfo-format-separate-node)
(texinfo-itemize-item, texinfo-multitable-item, texinfo-alias)
(texinfo-format-option, texinfo-noindent):
Use line-beginning-position and line-end-position.

* xfns.c (x_default_font_parameter): Try to open font from system
before using it (bug#6478).  Rename got_from_gconf to got_from_system.

* lisp/calc/calc-aent.el, lisp/calc/calc-ext.el, lisp/calc/calc-lang.el:
* lisp/calc/calc-store.el, lisp/calc/calc-units.el, lisp/calc/calc.el:
* lisp/calc/calccomp.el:
Add explicit utf-8 coding cookies to files with utf-8 characters.
Also delete trailing whitespace.

  `compose-mail-user-agent-warnings', instead of to the
  nonexistent `compose-mail-check-user-agent'.

progmodes/cc-mode.el (c-common-init): Initialise c-new-BEG/END.
(c-neutralize-syntax-in-and-mark-CPP): c-new-BEG/END: Take account
of existing values.

progmodes/cc-engine.el (c-clear-<-pair-props-if-match-after)
(c-clear->-pair-props-if-match-before): now return t when they've cleared
properties, nil otherwise.
(c-before-change-check-<>-operators): Set c-new-beg/end correctly by
taking account of the existing value.

progmodes/cc-defs.el (c-clear-char-property-with-value-function): Fix
this to clear the property rather than overwriting it with nil.