1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 04:10:27 -08:00
Commit graph

29800 commits

Author SHA1 Message Date
Chong Yidong
91fd0b7281 Fix error in last merge from branch.
Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
not intended for trunk.
2010-11-01 11:18:42 -04:00
Juanma Barranquero
a8039db123 Fix dates in ChangeLog entries. 2010-11-01 15:59:31 +01:00
Kenichi Handa
f6f3366160 merge trunk 2010-11-01 16:53:08 +09:00
Kenichi Handa
65b6b59a80 w32term.c (x_draw_glyphless_glyph_string_foreground): Fix the arg with_background for font->driver->draw. 2010-11-01 16:35:04 +09:00
Kenichi Handa
b18fad6db4 Handle glyphless characters on tty. 2010-11-01 13:09:26 +09:00
Glenn Morris
8069698297 * src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe. 2010-10-31 15:35:44 -07:00
Glenn Morris
c8c5995481 Fix bug#7299; default value of tool-bar-mode in without-x builds.
* src/frame.c (syms_of_frame) <tool-bar-mode>:
Default to nil if !HAVE_WINDOW_SYSTEM.

* lisp/cus-start.el: Handle standard values via a keyword.
Only set version property if specified.
(cursor-in-non-selected-windows, menu-bar-mode)
(tool-bar-mode, show-trailing-whitespace):
Do not specify standard values.
(transient-mark-mode, temporary-file-directory): Use :standard.
2010-10-31 11:26:54 -07:00
Chong Yidong
2699a55464 Merge changes from emacs-23 branch 2010-10-31 10:40:01 -04:00
Chong Yidong
46eadc7aee Print informative error message when aborting on GTK disconnect.
* xterm.c (x_connection_closed): Print informative error message
when aborting on GTK.  This requires using shut_down_emacs
directly instead of Fkill_emacs.
2010-10-30 23:33:56 -04:00
Eli Zaretskii
ffe75e6b11 Fix 2010-10-29T06:51:36Z!rgm@gnu.org for non-CLASH_DETECTION platforms.
emacs.c (main): Call syms_of_filelock unconditionally.
 filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
 clause, but keep part of it conditioned on CLASH_DETECTION.
2010-10-29 12:43:38 +02:00
Glenn Morris
4f4f2973e5 Sync docs of some X, W32, NS C functions.
* src/nsfns.m (Fx-display-save-under, Fx-open-connection)
(Fxw-color-defined-p, Fxw-display-color-p, Fx-show-tip):
* src/w32fns.c (Fxw_color_defined_p, Fx_open_connection):
* src/xfns.c (Fxw_color_defined_p, Fx_open_connection):
Sync docs between X, W32, NS.
2010-10-29 00:04:09 -07:00
Glenn Morris
9d79402605 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
* lisp/abbrev.el (abbrev-mode):
* lisp/composite.el (auto-composition-mode):
* lisp/menu-bar.el (menu-bar-mode):
* lisp/simple.el (transient-mark-mode):
* lisp/tool-bar.el (tool-bar-mode): Adjust the define-minor-mode calls so
that they do not define the associated variables twice.
* lisp/simple.el (transient-mark-mode): Remove defvar.
* lisp/composite.el (auto-composition-mode): Make variable auto-buffer-local.
* lisp/cus-start.el: Add transient-mark-mode, menu-bar-mode, tool-bar-mode.
Handle multiple groups, and also custom-delayed-init-variables.
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.

* src/buffer.c (syms_of_buffer) <abbrev-mode, transient-mark-mode>:
* src/frame.c (syms_of_frame) <tool-bar-mode>: Move docs here from Lisp.
2010-10-28 20:29:29 -07:00
Kenichi Handa
0269bd9066 w32gui.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Surround chp by parentheses. 2010-10-29 11:01:41 +09:00
Kenichi Handa
b2cca8569a Implement various display methods for glyphless characters. 2010-10-29 09:50:13 +09:00
Juanma Barranquero
d46f6bbb57 * src/eval.c (init_eval_once): Set max_lisp_eval_depth to 600.
Otherwise, bootstrapping on Windows fails to compile macroexp.el.
2010-10-27 00:23:09 +02:00
Eli Zaretskii
84b288883d cmds.c: (internal_self_insert): Don't insert for negative arguments. 2010-10-26 20:47:19 +02:00
Eli Zaretskii
2e35f1a27e Fix bug #7281.
cmds.c (internal_self_insert): Don't insert if argument N is zero.
2010-10-26 20:03:34 +02:00
Jan D
8daaeda651 * gtkutil.c (qttip_cb): Set title to empty for ATK (Bug#7278). 2010-10-26 08:09:54 +02:00
Chong Yidong
931c1dfaae Document GTK Emacs kill on display close in PROBLEMS.
* src/xterm.c (x_connection_closed): Expand comment.
2010-10-25 12:08:27 -04:00
Chong Yidong
365dc66cec Document GTK Emacs kill on display close in PROBLEMS.
* src/xterm.c (x_connection_closed): Update comment.
2010-10-25 12:04:54 -04:00
Michael Albinus
655441b28a * dbusbind.c (Fdbus_call_method_asynchronously)
(Fdbus_register_signal, Fdbus_register_method): Check, whether
`dbus-registered-objects-table' is initialized.

Must not be synchronized with the trunk.
2010-10-25 13:46:21 +02:00
Glenn Morris
6a5c21753e Move ns-win.el's rather wacky menu adjustments to menu-bar.el.
* lisp/term/ns-win.el: Do not require easymenu.
(menu-bar-edit-menu) <copy, paste, paste-from-menu, separator-undo>:
<spell>: Move adjustments to menu-bar.el.
* lisp/menu-bar.el (menu-bar-edit-menu) <copy, paste, paste-from-menu>:
<separator-undo, spell>: Move ns-win's adjustments here.
* lisp/loadup.el [ns]: Do not load easymenu.

* src/Makefile.in (SOME_MACHINE_LISP): Remove easymenu.elc.
* lib-src/makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc.
2010-10-24 17:48:26 -07:00
Glenn Morris
7c051dd87f Sync docs of some W32 and X C functions.
* src/w32fns.c (Fx_synchronize, Fx_change_window_property)
(Fx_window_property, Fx_file_dialog):
* src/xfns.c (Fx_synchronize, Fx_change_window_property)
(Fx_window_property, Fx_file_dialog): Sync docs between w32 and X.
2010-10-24 15:45:10 -07:00
Chong Yidong
d414c7133f Merge changes from emacs-23 branch. 2010-10-24 17:37:38 -04:00
Chong Yidong
0c382083b6 Merge changes from emacs-23 2010-10-24 17:36:09 -04:00
Chong Yidong
23c261f58f * xterm.c (x_connection_closed): Kill Emacs unconditionally. 2010-10-24 17:05:11 -04:00
Jim Meyering
947f5e0162 * emacs.c (argmatch): Don't treat "--" as "--chdir". 2010-10-24 12:00:57 -04:00
Glenn Morris
f5f2561564 Sync docs of selection-coding-system between C and Lisp.
* src/w16select.c (syms_of_win16select) <selection-coding-system>:
* src/w32select.c (syms_of_w32select) <selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (selection-coding-system): Sync doc with C versions.
2010-10-23 19:22:43 -07:00
Glenn Morris
3646b86d0e Sync Lisp and C docs of next-selection-coding-system.
* src/w16select.c (syms_of_win16select) <next-selection-coding-system>:
* src/w32select.c (syms_of_w32select) <next-selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (next-selection-coding-system): Sync doc with C versions.
2010-10-23 19:13:37 -07:00
Glenn Morris
46710489c8 Remove duplicate definition of tty-defined-color-alist.
* src/xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
Lisp version.
* lisp/term/tty-colors.el (tty-defined-color-alist): Remove duplicate
definition of C variable.
2010-10-23 18:48:39 -07:00
Glenn Morris
ea88388346 Sync X and MS-Windows docs for x-use-underline-position-properties.
* src/w32term.c (syms_of_w32term) <x-use-underline-position-properties>:
Sync doc with the xterm.c version.
2010-10-23 18:22:37 -07:00
Glenn Morris
65807d7334 Sync X and MS-Windows docs of x-toolkit-scroll-bars.
* src/w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
* src/xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
2010-10-23 18:15:43 -07:00
Glenn Morris
e1fd756bae * src/frame.c (syms_of_frame) <menu-bar-mode>: Sync doc with Lisp. 2010-10-23 14:21:49 -07:00
Glenn Morris
a102db1ee5 * src/xdisp.c (syms_of_xdisp) <hourglass-delay>: Sync doc with Lisp. 2010-10-23 14:19:02 -07:00
Glenn Morris
6e82cf1a1d * src/xdisp.c (syms_of_xdisp) <display-hourglass>: Sync doc with Lisp. 2010-10-23 14:16:39 -07:00
Glenn Morris
66c6abf0d7 Sync docs of cursor-in-non-selected-windows between Lisp and C.
* lisp/frame.el (cursor-in-non-selected-windows): Sync doc with C version.
* src/buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>:
Sync doc with Lisp version.
2010-10-23 14:13:39 -07:00
Glenn Morris
f3d87560ba Sync docs of C and Lisp version of auto-hscroll-mode.
* lisp/frame.el (auto-hscroll-mode): Sync doc with C version.
* src/xdisp.c (syms_of_xdisp) <auto-hscroll-mode>: Sync doc with Lisp.
2010-10-23 14:02:44 -07:00
Eli Zaretskii
914f049bea src/ChangeLog: Revert inadvertent change of entry date. 2010-10-23 19:33:03 +02:00
Eli Zaretskii
d1d6801eb4 Implement mouse highlight for bidi-reordered lines.
xdisp.c (fast_find_string_pos): #ifdef away, not used anymore.
 (mouse_face_from_string_pos): New function, replaces
 fast_find_string_pos.
 (note_mouse_highlight): Call it instead of fast_find_string_pos.
 (note_mode_line_or_margin_highlight): Support bidi-reordered
 strings and R2L glyph rows.  Fix comments.
 (note_mouse_highlight): When bidi reordering is turned on in a
 buffer, call next-single-property-change and
 previous-single-property-change with last argument nil.  Clear
 mouse highlight when mouse pointer is in a R2L row on the stretch
 glyph that stands for no text beyond the line end.
 (row_containing_pos): Don't return too early when CHARPOS is in a
 bidi-reordered continued line.  Return immediately when the first
 hit is found in a line that is not continued, or when an exact
 match for CHARPOS is found.
 (rows_from_pos_range): New function.
 (mouse_face_from_buffer_pos): Use it instead of calling
 row_containing_pos for START_CHARPOS and END_CHARPOS.  Rewrite the
 function to support mouse highlight in bidi-reordered lines and
 not to assume that START_CHARPOS is always in mouse_face_beg_row.
 If necessary, swap mouse_face_beg_row and mouse_face_end_row so
 that the former is always above the latter or identical to it.
 (show_mouse_face): Support drawing highlighted R2L lines.
 (coords_in_mouse_face_p): New function, bidi-aware.
 (cursor_in_mouse_face_p, note_mouse_highlight, erase_phys_cursor):
 Call it instead of comparing with mouse-face members of dpyinfo.
 (note_mode_line_or_margin_highlight): Fix confusingly swapped
 usage of hpos and vpos.
2010-10-23 17:30:45 +02:00
Eli Zaretskii
a4041a7121 Fix support for R2L lines. Tested with reordered text.
xdisp.c (mouse_face_from_string_pos): Fix support for R2L lines.
2010-10-23 16:41:50 +02:00
Eli Zaretskii
03f46be29c The range [STARTPOS..ENDPOS] is inclusive in strings.
Tested with multiline display strings.

 xdisp.c (mouse_face_from_string_pos): Fix off-by-one error when
 testing against ENDPOS.
2010-10-23 14:58:12 +02:00
Eli Zaretskii
7b7e2c18a6 Tested with L2R rows and mouse highlight on a single line.
xdisp.c (mouse_face_from_string_pos): Initialize the `found'
 flag to zero, and exit the outer loop when it's non-zero.  Bail
 our early if no row in the window belongs to the highlighted
 string.  Always back up after exiting the second loop.
2010-10-23 14:28:28 +02:00
Juanma Barranquero
88dbda519d Fix typos.
* doc/misc/gnus.texi (Group Parameters, Buttons): Fix typos.

* lisp/org/org-exp.el (org-export-visible):
* lisp/progmodes/dcl-mode.el (dcl-electric-reindent-regexps):
  Fix typos in docstrings.
2010-10-23 01:38:34 +02:00
Juanma Barranquero
cd5ad71278 src/frame.c: Fix previous change. 2010-10-22 12:52:08 +02:00
Eli Zaretskii
89baa1df69 Document values of window-system and deprecate its use as predicate.
src/frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.
 Document all values.
 src/dispnew.c (syms_of_display) <initial-window-system, window-system>:
 Deprecate use as a boolean flag.  Document all values.
 src/display.texi (Window Systems): Deprecate use of window-system as
 a predicate.
2010-10-22 12:35:31 +02:00
Glenn Morris
039c6cc33e Obscure an example DEFVAR_INT comment so as to evade make-docfile. 2010-10-22 01:02:31 -07:00
Jan D
dee186b61d Fix compilation with Motif (Bug#7263).
* src/xfns.c: Include Xm/TextF and Xm/List.
(file_dialog_cb, file_dialog_unmap_cb, clean_up_file_dialog): Make
ANSI prototypes.

* src/xmenu.c: Revert 2010-07-27 change: lwlib.h is needed for
MOTIF (Bug#7263).

* src/xrdb.c: Include keyboard.h for MOTIF.
2010-10-22 07:49:47 +02:00
Glenn Morris
2f42e9a286 Fix format of old ChangeLog entry. 2010-10-21 20:38:52 -07:00
Glenn Morris
5fb59edbdd * src/Makefile.in (SOME_MACHINE_LISP): Add w32-vars.
Remove ccl and duplicate mouse.
2010-10-21 20:37:20 -07:00
Chong Yidong
8b78d5e38f * insdel.c (prepare_to_modify_buffer): Don't set
saved-region-selection if modification hooks are disabled.
2010-10-21 13:27:32 -04:00