1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-15 04:11:53 -08:00
Commit graph

29521 commits

Author SHA1 Message Date
Kenichi Handa
9dfdbc0ad5 fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf. 2010-08-25 14:58:15 +09:00
Kenichi Handa
f6aa6ec68e Allow composition striding over PT. 2010-08-25 13:39:30 +09:00
Kenichi Handa
8809a9f997 merge trunk 2010-08-25 12:49:02 +09:00
Kenichi Handa
ff94e32cb3 Fix finding a stop position for composition. 2010-08-25 09:54:05 +09:00
Chong Yidong
1c409d0b96 Avoid clobbering primary selection when switching frames (Bug#6872).
* lisp/mouse.el (mouse-yank-primary): Avoid setting primary when
deactivating the mark (Bug#6872).

* src/keyboard.c (command_loop_1): Don't set primary selection during
handle-switch-frame (Bug#6872).
2010-08-24 11:48:14 -04:00
Michael Albinus
0c37265543 * dbusbind.c: Accept UNIX domain sockets as bus address.
(Fdbus_close_bus): New function.
(Vdbus_registered_buses): New variable.
(xd_initialize): Implement string as bus address.
(Fdbus_init_bus): Add bus to Vdbus_registered_buses).
(Fdbus_get_unique_name, Fdbus_call_method)
(Fdbus_call_method_asynchronously, Fdbus_method_return_internal)
(Fdbus_method_error_internal, Fdbus_send_signal)
(Fdbus_register_signal, Fdbus_register_method): Remove bus type
check.  This is done in xd_initialize_bus.  Adapt doc string, if
necessary.
(xd_pending_messages, xd_read_queued_messages): Loop over buses in
Vdbus_registered_buses.
(Vdbus_registered_objects_table): Create hash.
2010-08-23 15:02:00 +02:00
Juanma Barranquero
692f3ddcd0 src/ChangeLog: Fix typos. 2010-08-23 12:28:12 +02:00
Juri Linkov
7133b7ee62 Move reading an extended command to Elisp (bug#5364, bug#5214).
* lisp/simple.el (read-extended-command): New function with the logic
for `completing-read' moved to Elisp from `execute-extended-command'.
Use `function-called-at-point' in `minibuffer-default-add-function'
to get a command name for M-n (bug#5364, bug#5214).

* src/keyboard.c (Fexecute_extended_command): Move reading a command name
with `completing-read' to a new Elisp function `read-extended-command'.
Call it to read a command to `function'  (bug#5364, bug#5214).
2010-08-23 00:27:59 +01:00
Chong Yidong
198a7a97ff Make obsolete --unibyte argument do nothing (Bug#6886).
* src/emacs.c (main): Remove --unibyte handling (Bug#6886).

* lisp/startup.el (command-line-1): Issue warning for ignored arguments
--unibyte, etc (Bug#6886).

* doc/lispref/nonascii.texi (Text Representations):
* doc/lispref/loading.texi (Loading Non-ASCII):
* doc/lispref/compile.texi (Byte Compilation): Don't mention obsolete
--unibyte command-line argument.
2010-08-22 17:15:20 -04:00
Chong Yidong
b0126eac41 Merge changes from emacs-23 branch. 2010-08-22 16:02:16 -04:00
Eli Zaretskii
b613941ba0 Fix dependencies according to 2010-08-22T15:14:37Z!dann@ics.uci.edu.
deps.mk (sysdep.o, msdos.o): Depend on sysselect.h.
2010-08-22 20:18:52 +03:00
Eli Zaretskii
a583bbef0e Fix the w32 build after 2010-08-22T15:14:37Z!dann@ics.uci.edu.
sysselect.h [WINDOWSNT]: Don't define the FD_* and select stuff for w32.
 s/ms-w32.h (HAVE_SYS_TIMEB_H): Don't #undef HAVE_SYS_SELECT_H, it's done
 in nt/config.nt.
 makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on sysselect.h.
2010-08-22 20:00:08 +03:00
Eli Zaretskii
22eec92494 Clean up and ANSIfy unexcoff.c.
unexcoff.c (report_error, make_hdr, write_segment)
 (copy_text_and_data, copy_sym, mark_x, adjust_lnnoptrs, unexec):
 Convert argument lists and prototypes to ANSI C.
 (make_hdr, write_segment): Remove unused variables.
 (unexec): Remove commented-out line.  Initialize `new' to shut up
 compiler warnings.
2010-08-22 18:43:00 +03:00
Eli Zaretskii
5f2f0bc11e Clean up unexcoff.c.
unexcoff.c (report_error, make_hdr, write_segment)
 (copy_text_and_data, copy_sym, mark_x, adjust_lnnoptrs, unexec):
 Convert argument lists and prototypes to ANSI C.
 (make_hdr, write_segment): Remove unused variables.
 (unexec): Remove commented-out line.  Initialize `new' to shut up
 compiler warnings.
2010-08-22 18:37:01 +03:00
Dan Nicolaescu
a7ebc40927 Simplify termio code.
All non-MSDOS non-WINDOWSNT platforms define HAVE_TERMIOS, so
HAVE_TERMIO code is obsolete.
Replace HAVE_TERMIOS conditionals with !DOS_NT.
* src/systty.h: Do not define HAVE_TCATTR.
Remove HAVE_TERMIO, HAVE_LTCHARS and HAVE_TCHARS code.
Do not define EMACS_HAVE_TTY_PGRP.  Only define
EMACS_GET_TTY_PGRP for !DOS_NT.
* src/sysdep.c: Include sysselect.h unconditionally.  Do not include
sys/ioctl.h and termios.h, systty.h does it.  Use
HAVE_SYS_UTSNAME_H instead of USG as an include guard.
(init_baud_rate): Remove HAVE_TERMIO code.
(child_setup_tty): Remove HAVE_TERMIO code.
(emacs_get_tty, emacs_set_tty): Remove HAVE_TERMIO, HAVE_TCHARS
and HAVE_LTCHARS code.  Use !DOS_NT instead of HAVE_TCATTR.
(new_ltchars, new_tchars): Remove, unused.
(init_sys_modes): Remove HAVE_TERMIO, HAVE_TCHARS and HAVE_LTCHARS
code.  Remove special casing for __mips__, it was a no-op.  Remove
HAVE_TCATTR conditional, it is implied by HAVE_TERMIOS.
(init_sys_modes): Remove HPUX special case.
* src/process.c: Include stdlib.h unconditionally.  Do not include
fcntl.h, systty.h does it.  Remove conditional code for
HAVE_SERIAL, it is always true.
(process_send_signal): Remove HAVE_TERMIOS conditional, it's
always true when SIGNALS_VIA_CHARACTERS is true.
(Fcontinue_process, Fprocess_send_eof): Simplify conditionals:
!WINDOWSNT means HAVE_TERMIOS.
(create_process): Remove HAVE_TERMIOS, it's inside a HAVE_PTYS
conditional, which is true for all HAVE_TERMIOS systems.
* src/keyboard.c (init_keyboard): Do not use HAVE_TERMIO, use !DOS_NT
instead of HAVE_TERMIOS.
* src/emacs.c (shut_down_emacs): Use !defined DOS_NT instead of
EMACS_HAVE_TTY_PGRP.
* src/callproc.c (child_setup): Move EMACS_SET_TTY_PGRP use to the
non-MSDOS, non-WINDOWSNT code, it's only defined for such systems
anyway.
2010-08-22 08:14:37 -07:00
Eli Zaretskii
0deaf02ae1 xdisp.c: Fix typo in a comment in note_tool_bar_highlight. 2010-08-21 16:25:03 +03:00
Eli Zaretskii
40629f171b Fix mirroring pixel positions on GUI terminals.
dispnew.c (buffer_posn_from_coords): Fix off-by-one error in
 mirroring pixel positions.
2010-08-21 12:35:31 +03:00
Glenn Morris
0c9b8993e0 ChangeLog fixes. 2010-08-20 19:21:51 -07:00
Dan Nicolaescu
b5c76d0c4f Remove unused variables malloc_sbrk_used and malloc_sbrk_unused.
* src/alloc.c (malloc_sbrk_used, malloc_sbrk_unused): Remove,
write only.
(init_alloc_once): Remove writes to malloc_sbrk_unused, and
malloc_sbrk_used, nothing uses them.
2010-08-20 16:02:11 -07:00
Dan Nicolaescu
748155880f Small src/puresize.h cleanup.
* src/puresize.h: Remove code assuming PNTR_COMPARISON_TYPE is not
defined, unconditionally defined in lisp.h.
2010-08-20 15:52:10 -07:00
Dan Nicolaescu
f5817d1cb5 * src/term.c: Do not include <termios.h>, systty.h does it. 2010-08-20 15:44:38 -07:00
Dan Nicolaescu
d931da8c2a Remove redundant HAVE_TCATTR defines.
* src/s/unixware.h (HAVE_TCATTR):
* src/s/aix4-2.h (HAVE_TCATTR): Remove definitions, not needed.
systty.h defines it when HAVE_TERMIOS is defined.
2010-08-20 15:36:07 -07:00
Eli Zaretskii
00c5399425 Fix last change in buffer_posn_from_coords for text terminals.
dispnew.c (buffer_posn_from_coords): Add one-character offset for R2L lines.
2010-08-21 00:01:36 +03:00
Eli Zaretskii
b43c883c71 Fix last change in buffer_posn_from_coords for text terminals.
dispnew.c (buffer_posn_from_coords): Add one-character offset for R2L lines.
2010-08-20 23:55:09 +03:00
Joakim Verona
38f9163d62 merge from upstream 2010-08-20 22:00:00 +02:00
Joakim Verona
ccd8061864 minor imagemagick tweaks, one configure bugfix, and some ChangeLogs 2010-08-20 21:55:21 +02:00
Eli Zaretskii
ff2de6d2bb Fix version string in top-level MSDOS Makefile.
msdos/mainmake.v2 (version): Update due to change in emacs.c.
 src/emacs.c <emacs_version>: Add a comment regarding msdos/mainmake.v2's
 dependency on the syntax of this declaration.
2010-08-20 22:49:20 +03:00
Eli Zaretskii
491a154635 Fix version string in top-level MSDOS Makefile.
msods/mainmake.v2 (version): Update due to change in emacs.c.
 src/emacs.c <emacs_version>: Add a comment regarding msdos/mainmake.v2's
 dependency on the syntax of this declaration.
2010-08-20 22:45:24 +03:00
Eli Zaretskii
c30b8a12a4 xdisp.c: Add commentary about iterator geometry in R2L paragraphs. 2010-08-20 17:31:38 +03:00
Eli Zaretskii
2396cbba62 Fix mouse clicks, drag, and highlight in R2L lines.
dispnew.c (buffer_posn_from_coords): Fix calculation of buffer
 position for R2L lines by mirroring the pixel position wrt the
 text are box.  Improve commentary.
2010-08-20 17:19:39 +03:00
Andreas Schwab
7df6150a5f * image.c (imagemagick_clear_image): Remove debugging output. 2010-08-20 14:02:43 +02:00
Jason Rumney
cc477da7cc (set_frame_menubar): Remove call to undefined function. 2010-08-19 23:53:08 +08:00
Stefan Monnier
a2e5caf79e New post-self-insert-hook.
* src/cmds.c (Vself_insert_face, Vself_insert_face_command): Remove.
(Qpost_self_insert_hook, Vpost_self_insert_hook): New vars.
(internal_self_insert): Run post-self-insert-hook rather than handle
self-insert-face.
(syms_of_cmds): Initialize the new vars.
* lisp/facemenu.el (facemenu-self-insert-data): New var.
(facemenu-post-self-insert-function, facemenu-set-self-insert-face): New funs.
(facemenu-add-face): Use them.
2010-08-19 17:43:45 +02:00
Jason Rumney
20d60baf35 (w32_wnd_proc): Don't check context before initializing. 2010-08-19 22:51:09 +08:00
Joakim Verona
96fa176883 upstream merge 2010-08-19 09:34:21 +02:00
Joakim Verona
549a73b97b some minor cosmetic fixes in comments 2010-08-19 09:29:27 +02:00
Joakim Verona
b0c396f73b fix some accidental whitespace changes 2010-08-19 09:23:06 +02:00
Jan D
2c0ac86767 * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary". 2010-08-19 07:55:30 +02:00
Eli Zaretskii
9b93863787 xterm.c (x_draw_bar_cursor): Fix last change. 2010-08-18 22:06:11 +03:00
Eli Zaretskii
0d68907dbf bidi.c (bidi_level_of_next_char): Fix commentary regarding reordering of PDF. 2010-08-18 19:54:08 +03:00
Eli Zaretskii
9335210608 Fix display of bar cursor on right-to-left text.
xterm.c (x_draw_bar_cursor):
 w32term.c (x_draw_bar_cursor): If the character under cursor is
 R2L, draw the bar cursor on its right rather than on its left.
2010-08-18 19:42:06 +03:00
Joakim Verona
432c975420 merge from trunk, no conflicts 2010-08-18 13:11:01 +02:00
Stefan Monnier
0193499fe1 * lisp/emacs-lisp/autoload.el (make-autoload): Preload the macros's
declarations that are useful before running the macro.
* src/eval.c (Fdefmacro): Only obey one declaration.
2010-08-18 12:21:43 +02:00
Stefan Monnier
c785836ddc * casefiddle.c (casify_region): Setup gl_state. 2010-08-18 11:27:53 +02:00
Joakim Verona
3234a340f4 minor cleanup 2010-08-18 11:09:46 +02:00
Jan D
9cb728a58c * nsterm.m (ns_define_frame_cursor): Call x_update_cursor (Bug#6868). 2010-08-18 10:06:45 +02:00
Jan D
e1e18511e3 * gtkutil.c (update_frame_tool_bar): Literal stings are const char*. 2010-08-18 08:30:54 +02:00
Jan D
64cb6c7883 Use CLIPBOARD and PRIMARY on NS (Bug#6677).
* lisp/term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use
QCLIPBOARD instead of QPRIMARY (Bug#6677).

* src/nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define.
(symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard,
QPRIMARY => NXPrimaryPboard.
(ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD,
NXPrimaryPboard => QPRIMARY.
(nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection,
NXSecondaryPboard = SecondarySelection.
(syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
2010-08-18 08:16:55 +02:00
Stefan Monnier
c3554f6825 * src/gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL
is a string.
2010-08-17 23:43:47 +02:00
Joakim Verona
a8101f663e merge from trunk 2010-08-17 23:19:11 +02:00