Commit Graph

28767 Commits

Author SHA1 Message Date
Stefan Monnier
2912322b80 Merge from emacs-23 2010-04-02 21:54:24 -04:00
Dan Nicolaescu
a568f507d1 * m/intel386.h (NO_REMAP): Move definition ...
* s/msdos.h (NO_REMAP): ... here.
2010-04-02 17:24:53 -07:00
Dan Nicolaescu
4cd9f6c2f9 * m/vax.h (CRT0_DUMMIES): Remove, unused. 2010-04-02 17:20:04 -07:00
Dan Nicolaescu
c435b43224 * ecrt0.c: Remove MSDOS, m68k and __sparc__ conditionals, file not
used on those platforms.
2010-04-02 17:06:38 -07:00
Eli Zaretskii
9cb52861f2 xdisp.c (set_cursor_from_row): Improve comments. 2010-04-02 12:35:01 +03:00
Eli Zaretskii
52f4d8d5bb Fix typos and formatting in ChangeLog entries. 2010-04-02 12:12:21 +03:00
Dan Nicolaescu
42a2c62292 Remove extern errno declarations.
* xterm.c:
* xrdb.c:
* w32term.c:
* unexec.c:
* unexaix.c:
* sysdep.c:
* process.c:
* lread.c:
* keyboard.c:
* floatfns.c:
* filelock.c:
* fileio.c:
* emacs.c (main):
* ecrt0.c:
* dispnew.c:
* callproc.c:
* buffer.c: Remove errno extern declarations.
* s/netbsd.h (NEED_ERRNO): Remove.

* movemail.c:
* etags.c:
* emacsclient.c: Remove extern errno declarations.
2010-04-01 20:10:33 -07:00
Juanma Barranquero
194d44e717 Fix typos in ChangeLogs. 2010-04-02 04:22:17 +02:00
Dan Nicolaescu
8224f93d18 Remove all uses of LIBX11_SYSTEM.
* Makefile.in (LIBX11_SYSTEM): Remove.
* s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM
instead.

* configure.in: Remove all references to LIBX11_SYSTEM.
2010-04-01 16:08:14 -07:00
Eli Zaretskii
a039ec6303 msdos.c: Fix last change. 2010-04-01 18:15:16 +03:00
Eli Zaretskii
ed68db4d2c Remove support for DJGPP v1.x (bug#5813).
src/:
 w16select.c (__dpmi_int): Remove DJGPP v1.x compatibility.
 s/msdos.h: 
 unexec.c (make_hdr, copy_text_and_data): 
 sysdep.c (wait_for_termination, sys_subshell): 
 msdos.c (dos_set_window_size, msdos_set_cursor_shape)
 (IT_set_terminal_modes): 
 (__write, _rename, gethostname, gettimeofday, alarm, fork, kill)
 (dos_ttraw, dos_ttcooked, run_msdos_command, abort): Remove DJGPP
 v1.x code and tests of the value of __DJGPP__.
 (nice, pause, sigsetmask, sigblock): Remove DJGPP v1.x
 compatibility code.
 lread.c: 
 gmalloc.c (memalign): 
 fileio.c (Fcopy_file, check_executable, Ffile_modes): 
 emacs.c (main): 
 dosfns.c (init_dosfns): 
 dired.c (file_name_completion_stat): Remove tests of __DJGPP__.

 msdos/:
 sed3.inp:
 sed2.inp:
 sed1.inp:
 mainmake: Files removed.
2010-04-01 17:59:46 +03:00
Eli Zaretskii
814062c766 Fix bug #5816.
xdisp.c (set_cursor_from_row): Fix cursor positioning when the
 string with `cursor' property comes from an `after-string' overlay.
2010-04-01 15:37:28 +03:00
Glenn Morris
0dc2e11dfd Cosmetic change to src/Makefile.in.
* Makefile.in (LIBTIFF, LIBJPEG, LIBPNG, LIBGIF, LIBXPM, XFT_LIBS):
Define as Makefile variables.
(LIBX): Use above variables rather than directly using autoconf.
2010-04-01 00:10:31 -07:00
Chong Yidong
6521c534c4 [merge] Fix last set of Nextstep changes.
* nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
* nsterm.h: Fix prototype.
2010-03-31 18:28:12 -04:00
Dan Nicolaescu
1d29df5994 Clean up BSD_SYSTEM use.
* xterm.c:
* process.c:
* emacs.c: Use HAVE_SYS_IOCTL_H instead of BSD_SYSTEM as a guard
for including <sys/ioctl.h>.
* sysdep.c (wait_without_blocking): Remove BSD_SYSTEM case, this
code is only used for MSDOS.
2010-03-31 13:39:03 -07:00
Juri Linkov
1546c55901 Rename image-extension-data' to image-metadata'.
http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01456.html

* image.c: Add `Qextension_data'.
(syms_of_image): Initialize and staticpro `Qextension_data'.
(Fimage_metadata): Rename from `Fimage_extension_data'.
(gif_load): Put GIF extension data to the property
`Qextension_data'.

* image.el (image-animated-p): Use `image-metadata' instead of
`image-extension-data'.  Get GIF extenstion data from metadata
property `extension-data'.
2010-03-31 17:55:01 +03:00
Eli Zaretskii
52c3078336 Fix highlight of trailing whitespace is right-to-left lines.
xdisp.c (highlight_trailing_whitespace): Support highlight of
 trailing whitespace in right-to-left rows.
2010-03-31 17:28:16 +03:00
Chong Yidong
95b1abcfaf Fix last set of Nextstep changes.
* nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
* nsterm.h: Fix prototype.
2010-03-31 10:27:50 -04:00
Eli Zaretskii
4a217bedd4 Fix bug #5703.
w32fns.c (x_create_tip_frame): Copy `parms' before we modify it
 in this function.
2010-03-31 12:08:40 +03:00
Stefan Monnier
855a0da7fd Get rid of the direct_output optimizations.
* keyboard.c (nonundocount): Remove extern declaration.
(command_loop_1): Remove brittle optimisation for cheap and common operations.
* xdisp.c (redisplay_internal): Don't bother checking
redisplay_performed_directly_p any more.
* sysdep.c (init_sys_modes): Don't call direct_output_forward_char any more.
* dispnew.c (redisplay_performed_directly_p)
(direct_output_for_insert, direct_output_forward_char):
* dispextern.h (redisplay_performed_directly_p)
(direct_output_for_insert, direct_output_forward_char): Remove.
* cmds.c (nonundocount): Make it static.
2010-03-31 00:14:08 -04:00
Chong Yidong
4f103e0430 * nsterm.h: Fix last change. 2010-03-31 00:00:23 -04:00
Stefan Monnier
857387516c Merge from emacs-23 branch 2010-03-30 22:37:57 -04:00
Stefan Monnier
75d1428c57 (keys_of_window): Remove redundant/overridden bindings. 2010-03-30 22:08:05 -04:00
Chong Yidong
a6d676d9f4 * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930). 2010-03-30 19:26:38 -04:00
Eli Zaretskii
82043cfbb3 Restore original behavior of move_it_in_display_line_to when !bidi_p.
xdisp.c (BUFFER_POS_REACHED_P, move_it_in_display_line_to):
 Restore original behavior when the iterator is not bidi_p.
2010-03-30 15:16:49 -04:00
Dan Nicolaescu
b5dd0ae7be * xdisp.c (syms_of_xdisp): Use intern_c_string instead of intern. 2010-03-30 10:40:04 -07:00
Jan Djärv
67fee863be xdisp.c (note_mouse_highlight): Don't do highlight if pointer is invisible (Bug#5766). 2010-03-30 19:26:58 +02:00
Eli Zaretskii
bd924a5d6c Fix a crash of I-search in a bidi-reordered buffer.
bidi.c (bidi_cache_iterator_state): Invalidate the cache if we
 are outside the range of cached character positions.
2010-03-30 19:29:02 +03:00
Juanma Barranquero
3580374b8a * makefile.w32-in ($(BLD)/bidi.$(O)): Add dependency on w32gui.h. 2010-03-30 14:15:45 +02:00
Eli Zaretskii
a8d11bd341 bidi.c: Update to GPLv3. 2010-03-30 13:02:24 +03:00
Eli Zaretskii
b118e65f9d bidi.c: Update Copyright years. 2010-03-30 12:55:42 +03:00
Eli Zaretskii
a7b0282034 Initial support for bidirectional editing.
Makefile.in (obj): Include bidi.o.
 (bidi.o): New target.
 makefile.w32-in (OBJ1): Add $(BLD)/bidi.$(O).
 ($(BLD)/bidi.$(O)): New target.
 bidi.c: New file.
 buffer.h (struct buffer): New members bidi_display_reordering
 and bidi_paragraph_direction.
 buffer.c (init_buffer_once): Initialize bidi_display_reordering
 and bidi_paragraph_direction.
 (syms_of_buffer): Declare Lisp variables bidi-display-reordering
 and bidi-paragraph-direction.
 (Fbuffer_swap_text): Swap the values of
 bidi_display_reordering and bidi_paragraph_direction.
 dispextern.h (BIDI_MAXLEVEL, BIDI_AT_BASE_LEVEL): New macros.
 (bidi_type_t, bidi_dir_t): New types.
 (bidi_saved_info, bidi_stack, bidi_it): New structures.
 (struct it): New members bidi_p, bidi_it, paragraph_embedding,
 prev_stop, base_level_stop, and eol_pos.
 (bidi_init_it, bidi_get_next_char_visually): New prototypes.
 (IT_STACK_SIZE): Enlarge to 5.
 (struct glyph_row): New member reversed_p.
 <string_buffer_position>: Update prototype.
 (PRODUCE_GLYPHS): Set the reversed_p flag in the iterator's
 glyph_row if bidi_it.paragraph_dir == R2L.
 (struct glyph): New members resolved_level and bidi_type.
 dispnew.c (direct_output_forward_char): Give up if we need bidi
 processing or buffer's direction is right-to-left.
 (prepare_desired_row): Preserve the reversed_p flag.
 (row_equal_p): Compare the reversed_p attributes as well.
 xdisp.c (init_iterator): Initialize it->bidi_p.  Call
 bidi_init_it and set it->paragraph_embedding from the current
 buffer's value of bidi_paragraph_direction.
 (reseat_1): Initialize bidi_it.first_elt.
 (set_iterator_to_next, next_element_from_buffer): Use the value of
 paragraph_embedding to determine the paragraph direction.
 (set_iterator_to_next): Under bidi reordering, call
 bidi_get_next_char_visually.  Call bidi_paragraph_init if the
 new_paragraph flag is set in the bidi iterator.
 (next_element_from_buffer): If bidi_it.first_elt is set,
 initialize paragraph direction and find the first character to
 display in the visual order.  If reseated to a middle of a line,
 prime the bidi iterator starting at the line's beginning.  Handle
 the situation where we overstepped stop_charpos due to
 non-linearity of the bidi iteration.  Likewise for when we back up
 beyond the previous stop_charpos.  When moving across stop_charpos,
 record it in prev_stop.
 (display_line): Set row->end and it->start for the next row to the
 next character in logical order.  Always extend reversed_p rows to
 the end of line, even if they end at ZV.  Copy the reversed_p flag
 to the next glyph row.  Keep calling set_cursor_from_row for
 bidi-reordered rows even if we already have a possible candidate
 for cursor position.  Set row_end after all the row's glyphs have
 been produced, by looping over the glyphs.  Record the position
 after EOL in it->eol_pos, and use it to set end_pos of the last
 row produced for a continued line.
 <Qright_to_left, Qleft_to_right>: New variables.
 (syms_of_xdisp): Initialize and staticpro them.
 (string_buffer_position_lim): New function.
 (string_buffer_position): Most of code moved to
 string_buffer_position_lim.  Last argument and return value are
 now EMACS_INT; all callers changed.
 (set_cursor_from_row): Rewritten to support bidirectional text and
 reversed glyph rows.
 (text_outside_line_unchanged_p, try_window_id): Disable
 optimizations if we are reordering bidirectional text and the
 paragraph direction can be affected by the change.
 (append_glyph, append_composite_glyph)
 (produce_image_glyph, append_stretch_glyph): Set the
 resolved_level and bidi_type members of each glyph.
 (append_glyph): If the glyph row is reversed, prepend the glyph
 rather than appending it.
 (handle_stop_backwards): New function.
 (reseat_1, pop_it, push_it): Set prev_stop and base_level_stop.
 (reseat): call handle_stop_backwards to recompute prev_stop and
 base_level_stop for the new position.
 (handle_invisible_prop): Under bidi iteration, skip invisible text
 using bidi_get_next_char_visually.  If we are `reseat'ed, init the
 paragraph direction.  Update IT->prev_stop after skipping
 invisible text.
 (move_it_in_display_line_to): New variables prev_method
 and prev_pos.  Compare for strict equality in
 BUFFER_POS_REACHED_P.
 (try_cursor_movement): Examine all the candidate rows that occlude
 point, to return the best match.  If rows are bidi-reordered
 and point moved backwards, back up to the row that is not a
 continuation line, and start looking for a suitable row from
 there.
 term.c (append_glyph): Reverse glyphs by pre-pending them,
 rather than appending, if the glyph_row's reversed_p flag is set.
 Set the resolved_level and bidi_type members of each glyph.
 .gdbinit (pbiditype): New command.
 (pgx): Use it to display bidi level and type of the glyph.
 (pitx): Display some bidi information about the iterator.
 (prowlims, pmtxrows): New commands.
 files.el: Make bidi-display-reordering safe variable for boolean
 values.
 mule.texi (International): Mention support of bidirectional editing.
 (Bidirectional Editing): New section.
 HELLO: Reorder Arabic and Hebrew into logical order, and
 insert RLM before the opening paren, to make the display more
 reasonable.  Add setting for bidi-display-reordering in the local
 variables section.
 NEWS: Mention initial support for bidirectional editing.
2010-03-30 05:13:07 -04:00
Eli Zaretskii
4d6ea387e7 Removed src/ChangeLog.bidi from bzr. 2010-03-30 05:02:07 -04:00
Dan Nicolaescu
32a8894e5b Remove all uses of C_DEBUG_SWITCH and LIBS_DEBUG.
* s/usg5-4.h (LIBS_DEBUG):
* s/irix6-5.h (C_DEBUG_SWITCH):
* s/gnu-linux.h (LIBS_DEBUG):
* s/darwin.h (LIBS_DEBUG):
* s/bsd-common.h (LIBS_DEBUG):
* s/aix4-2.h (LIBS_DEBUG, C_DEBUG_SWITCH):
* m/iris4d.h (LIBS_DEBUG):
* m/hp800.h (LIBS_DEBUG): Remove definitions.

* Makefile.in (LIBES): Remove reference to LIBS_DEBUG.
(LIBS_DEBUG): Remove definition.

* configure.in: Remove all references to C_DEBUG_SWITCH.
2010-03-29 19:47:23 -07:00
Chong Yidong
9ae6e18924 Clean up unneeded ns_set_icon_type calls.
Patch from Adrian Robert, see
http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01391.html

* xdisp.c (x_consider_frame_title, update_window_cursor): Remove
HAVE_NS conditionals.
(prepare_menu_bars)[HAVE_NS]: Call ns_set_doc_edited.

* nsfns.m (x_implicitly_set_name): If frame-title-format is t, use
filename for the title.
(ns_set_doc_edited): Do nothing if the selected window is a
minibuffer window.

* nsterm.h: Add prototypes for ns_set_name_as_filename and
ns_set_doc_edited.

* nsterm.m: Remove unneeded prototype.
2010-03-29 19:48:44 -04:00
Eli Zaretskii
f4b6ba46b8 Support MS-Windows build and reversed rows in GUI frames; add initial docs.
doc/emacs/mule.texi (International): Mention support of
 bidirectional editing.
 (Bidirectional Editing): New section.
 etc/HELLO: Reorder Arabic and Hebrew into logical order, and
 insert RLM before the opening paren, to make the display more
 reasonable.  Add setting for bidi-display-reordering in the local
 variables section.
 lisp/files.el: Make bidi-display-reordering safe variable for
 boolean values.
 src/xdisp (append_glyph): If the glyph row is reversed, prepend the
 glyph rather than appending it.
 src/makefile.w32-in (OBJ1): Add $(BLD)/bidi.$(O).
 ($(BLD)/bidi.$(O)): New target.
2010-03-29 08:26:24 -04:00
Glenn Morris
25c72475f4 Close bug#5336.
* Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
in the DOC file.
2010-03-28 11:55:20 -07:00
Eli Zaretskii
c0546589ab Fix glyph_row reversed_p flag in empty lines between paragraphs.
bidi.c (bidi_get_next_char_visually): Improve commentary.
 dispextern.h (PRODUCE_GLYPHS): Set the reversed_p flag in the
 iterator's glyph_row here.
 xdisp.c (handle_invisible_prop, set_iterator_to_next)
 (next_element_from_buffer): Don't set the reversed_p flag in the
 iterator's glyph_row here.
2010-03-28 11:18:10 -04:00
Eli Zaretskii
e7dbdb6dfc Merge from mainline. 2010-03-28 09:04:11 -04:00
Chong Yidong
649dbf36cd * process.c (Fmake_network_process): Don't apply Bug#5173 fix for Windows. 2010-03-26 20:45:32 -04:00
YAMAMOTO Mitsuharu
cad4261fd3 Don't call turn_on_atimers around `connect' (Bug#5723). 2010-03-25 17:56:15 +09:00
Helmut Eller
cd591dbccd Call select' for interrupted connect' rather than creating new socket (Bug#5173). 2010-03-25 17:48:52 +09:00
Chong Yidong
f79a01db38 * xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730). 2010-03-24 17:25:46 -04:00
Stefan Monnier
e867cb5d30 Merge from `emacs-23'. 2010-03-24 14:02:56 -04:00
Juanma Barranquero
9a5d0c6844 Fix typos in Changelog. 2010-03-24 01:18:03 +01:00
Dan Nicolaescu
814fb70858 * s/gnu-linux.h (LIBS_SYSTEM): Remove, same as default. 2010-03-22 19:47:41 -07:00
Dan Nicolaescu
38e3487ce8 * s/netbsd.h: Remove commented out code. 2010-03-22 19:42:25 -07:00
Dan Nicolaescu
5845f0ed5a Simplify LIBS_MACHINE definitions.
* m/hp800.h (LIBS_MACHINE): Remove, same as default.
* m/iris4d.h (LIBS_MACHINE): Likewise.
* m/ibmrs6000.h (LIBS_MACHINE): Rename to LIBS_SYSTEM and move ...
* s/aix4-2.h (LIBS_SYSTEM): ... here.
2010-03-22 19:39:19 -07:00
Dan Nicolaescu
df7734b220 Remove dead code dealing with POSIX_SIGNALS.
* atimer.c (set_alarm): Remove dead code, all USG systems define
POSIX_SIGNALS.
* data.c (arith_error): Likewise.
* keyboard.c (input_available_signal, handle_user_signal)
(interrupt_signal): Likewise.
* process.c (sigchld_handler): Likewise.
(create_process): Remove if 0 code.  Remove HPUX conditional when
!defined (POSIX_SIGNALS), it cannot be true.
* syssignal.h: Remove USG5_4 and USG conditionals when
!POSIX_SIGNALS, they cannot be true.
2010-03-22 12:51:59 -07:00
Jan Djärv
93318cbd40 bug #5736: Allow X-resource menuBar to take on/off as documented.
* frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).

* xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER.

* dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new.

* xresources.texi (Table of Resources): Clarify toolBar number
for Gtk+.

* frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736).
2010-03-22 08:26:56 +01:00