1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-02 10:11:05 -08:00
Commit graph

29141 commits

Author SHA1 Message Date
Dan Nicolaescu
eb697db597 Move UNEXEC definition to autoconf.
* configure.in (unxec): Do not define and substitute.
(UNEXEC_OBJ): New output variable, replaces cpp UNEXEC.

* msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.

* src/s/usg5-4.h (UNEXEC): Remove, move to configure.in.
* src/s/sol2-10.h (UNEXEC):
* src/s/irix6-5.h (UNEXEC):
* src/s/hpux10-20.h (UNEXEC):
* src/s/gnu-linux.h (UNEXEC):
* src/s/darwin.h (UNEXEC):
* src/s/cygwin.h (UNEXEC):
* src/s/bsd-common.h (UNEXEC):
* src/s/aix4-2.h (UNEXEC):
* src/m/alpha.h (UNEXEC): Likewise.
* src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.
2010-06-03 15:16:02 -07:00
Juanma Barranquero
aa3830c497 Remove obsolete pre-unicode2 macros.
* character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove.
* composite.c (composition_reseat_it):
* data.c (Faset):
* fns.c (Ffillarray):
* regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD.
  [!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH.
2010-06-03 21:02:32 +02:00
Juri Linkov
d234d13e4b * src/buffer.c (Fother_buffer): Add CHECK_FRAME.
(Fswitch_to_buffer): Remove unused variable `err'.
2010-06-03 21:50:00 +03:00
Glenn Morris
72c02b8ad5 * src/s/sol2-10.h: Comment fix. 2010-06-02 22:57:11 -07:00
Glenn Morris
bb24a66d2d * src/m/ibms390.h: Comment fix. 2010-06-02 22:55:05 -07:00
Glenn Morris
e23dc1e2f0 Remove NO_SOCK_SIGIO references.
* src/m/template.h (NO_SOCK_SIGIO): Remove, no longer used.

* nextstep/DEV-NOTES: Remove out-of-date information.
2010-06-02 22:50:48 -07:00
Glenn Morris
b282c2e75e Regenerate src/config.in. 2010-06-02 22:47:09 -07:00
Glenn Morris
05b09564d2 m/hp800.h simplification.
* src/m/hp800.h (alloca) [__NetBSD__ && __GNUC__]: No need to define it,
now that AH_BOTTOM does it.
2010-06-02 22:41:49 -07:00
Glenn Morris
824e29787c HAVE_ALLOCA not needed since alloca.s was removed.
* src/m/hp800.h (HAVE_ALLOCA):
* src/m/ibms390x.h (HAVE_ALLOCA): Do not define, no longer needed.

* msdos/sed2v2.inp: Do not edit HAVE_ALLOCA.

* admin/CPP-DEFINES: Remove HAVE_ALLOCA.
2010-06-02 22:35:54 -07:00
Glenn Morris
0d4bcf4ddd NOT_C_CODE is always true now.
* configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.

* m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h:
Remove NOT_C_CODE tests, it is always true now.

* nt/config.nt: Remove NOT_C_CODE tests, it is always true now.

* admin/CPP-DEFINES: Remove NOT_C_CODE.
2010-06-02 22:29:02 -07:00
Dan Nicolaescu
08a494a3b0 Fix config.h includes.
* src/xsettings.c:
* src/xgselect.c:
* src/nsterm.m:
* src/nsselect.m:
* src/nsimage.m:
* src/nsfont.m:
* src/nsfns.m:
* src/dbusbind.c: Use #include <config.h> instead of "config.h" as all
other files do.
2010-06-01 21:29:53 -07:00
Dan Nicolaescu
75934b1d0f * src/gmalloc.c: Remove BROKEN_PROTOTYPES reference, unused. 2010-06-01 19:47:43 -07:00
Dan Nicolaescu
9f32a766dc * src/s/sol2-6.h: Remove obsolete comments. 2010-06-01 19:43:47 -07:00
Dan Nicolaescu
c55d2abfc7 Remove unnecessary alloca.h includes.
* src/keymap.c: Do not include alloca.h, config.h does that.
* src/sysdep.c: Likewise.  Do not define fwrite, not used.
2010-06-01 19:40:59 -07:00
Dan Nicolaescu
8923d6176b Fix alloca definition when using gcc on non-gnu systems.
* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).
2010-06-01 19:32:43 -07:00
Stefan Monnier
fd67a7000e Merge from emacs-23 2010-05-31 22:34:49 -04:00
Stefan Monnier
06ac62b4db * sysdep.c (child_setup_tty): Move the non-canonical initialization to
the HAVE_TERMIO where it belongs.

Fixes: debbugs:6149
2010-05-31 21:49:15 -04:00
Stefan Monnier
1ab8293c36 * src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
of bug#6305).
2010-05-31 15:35:04 -04:00
Juanma Barranquero
b925d23104 src/ChangeLog: Add missing bug id. 2010-05-31 17:30:13 +02:00
Juanma Barranquero
a73f9c9dfd src/ChangeLog: Fix typos. 2010-05-31 01:09:32 +02:00
Eli Zaretskii
6dcfd25383 Fix crash reported in bug #6306.
bidi.c (bidi_move_to_visually_next): Make sure the sentinel
 state is always cached.
2010-05-30 22:01:51 +03:00
Eli Zaretskii
06fa4a2352 Fix cursor motion in bidi-reordered continued lines.
xdisp.c (try_cursor_movement): Backup to non-continuation line
 only after finding point's row.  Fix the logic.  Rewrite the loop
 over continuation lines in bidi-reordered buffers.  Return
 CURSOR_MOVEMENT_MUST_SCROLL upon failure to find a suitable row,
 rather than CURSOR_MOVEMENT_CANNOT_BE_USED.
2010-05-29 15:51:01 +03:00
Eli Zaretskii
6d26bbb23e Finish debugging of cursor motion in bidi-reordered lines.
xdisp.c (try_cursor_movement): Fix the logic.  Rewrite the loop
 over continuation lines in bidi-reordered buffers.  Return
 CURSOR_MOVEMENT_MUST_SCROLL upon failure to find a suitable row,
 rather than CURSOR_MOVEMENT_CANNOT_BE_USED.
2010-05-29 13:49:21 +03:00
Michael Albinus
f5783df3a7 * fileio.c (Fdelete_file): Pass TRASH arg to handler call. 2010-05-28 16:57:11 +02:00
Eli Zaretskii
a85cde3870 Prevent unnecessary scrolling in bidi-reordered buffers.
xdisp.c (try_cursor_movement): back up to non-continuation line only
 after finding point's row..
2010-05-28 15:00:47 +03:00
Kenichi Handa
0ad1627dbe merge trunk 2010-05-28 15:45:43 +09:00
Kenichi Handa
7d56b2ddfe Handle face-ignored-fonts 2010-05-28 15:42:43 +09:00
Glenn Morris
3e8bf1ef8f Move some old ChangeLog entries to the right files. 2010-05-27 20:52:19 -07:00
Glenn Morris
e58d4ff7f4 * src/Makefile.in (LIBES): Remove $LOADLIBES, it is never set. 2010-05-27 20:29:09 -07:00
Chong Yidong
f1a5d776c4 Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
* src/fileio.c (Fdelete_file): Change meaning of optional arg to mean
whether to trash.
(internal_delete_file, Frename_file): Callers changed.
(delete_by_moving_to_trash): Doc fix.
(Fdelete_directory_internal): Don't move to trash.

* src/callproc.c (delete_temp_file):
* src/buffer.c (Fkill_buffer): Callers changed.

* src/lisp.h: Update prototype.

* lisp/diff.el (diff-sentinel):
* lisp/epg.el (epg--make-temp-file, epg-decrypt-string)
(epg-verify-string, epg-sign-string, epg-encrypt-string):
* lisp/jka-compr.el (jka-compr-partial-uncompress)
(jka-compr-call-process, jka-compr-write-region):
* lisp/server.el (server-sentinel): Remove optional arg from
delete-file, reverting 2010-05-03 change.

* lisp/dired.el (dired-delete-file): New arg TRASH.
(dired-internal-do-deletions): New arg TRASH.  Use progress
reporter.
(dired-do-flagged-delete, dired-do-delete): Use trash.

* lisp/files.el (delete-directory): New arg TRASH.

* lisp/speedbar.el (speedbar-item-delete): Allow trashing.

* lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file)
(ange-ftp-rename-remote-to-remote)
(ange-ftp-rename-local-to-remote)
(ange-ftp-rename-remote-to-local, ange-ftp-load)
(ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from
`delete-file'.
(ange-ftp-delete-directory): Add optional arg to `delete-file', to
allow trashing.

* lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to
handle new TRASH arg of `delete-file'.

* lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory)
(tramp-fish-handle-delete-file)
(tramp-fish-handle-make-symbolic-link)
(tramp-fish-handle-process-file): Use null TRASH arg in
`tramp-compat-delete-file' call.

* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH
arg in `tramp-compat-delete-file' call.

* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg.
(tramp-gvfs-handle-write-region): Use null TRASH arg in
`tramp-compat-delete-file' call.

* lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg.
(tramp-imap-do-copy-or-rename-file): Use null TRASH arg in
`tramp-compat-delete-file' call.

* lisp/net/tramp-smb.el (tramp-smb-handle-copy-file)
(tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
(tramp-smb-handle-write-region): Use null TRASH arg in
tramp-compat-delete-file call.
(tramp-smb-handle-delete-directory): Use tramp-compat-delete-file.
(tramp-smb-handle-delete-file): Rename arg.

* lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH.
(tramp-handle-make-symbolic-link, tramp-handle-load)
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-do-copy-or-rename-file-directly)
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-handle-process-file, tramp-handle-call-process-region)
(tramp-handle-shell-command, tramp-handle-file-local-copy)
(tramp-handle-insert-file-contents, tramp-handle-write-region)
(tramp-delete-temp-file-function): Use null TRASH arg in
tramp-compat-delete-file call.
2010-05-27 19:30:11 -04:00
Chong Yidong
f44a59e61a Fix redisplay crash (Bug#6177).
* xdisp.c (redisplay_window): After redisplay, check if point is
still valid before setting it (Bug#6177).
2010-05-27 11:49:01 -04:00
Chong Yidong
5ca3929b19 * xdisp.c (redisplay_window): After redisplay, check if point is
still valid before setting it (Bug#6177).
2010-05-27 11:42:50 -04:00
Glenn Morris
81ac4f3536 Do not preprocess src/Makefile.in.
* configure.in: Do not preprocess src/Makefile.in.
(cpp_undefs, CPP_NEED_TRADITIONAL): Remove.
(AC_EGREP_CPP): Test no longer needed.
* configure: Regenerate.

* config.bat: Do not preprocess src/Makefile.in.

* make-dist: No more Makefile.c files.

* INSTALL, src/README: Makefiles are not preprocessed.

* src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk:
Convert comments to Makefile format.

* lib-src/Makefile.in (distclean): No more Makefile.c.
* src/Makefile.in (bootstrap-clean): No more Makefile.c.

* admin/notes/cpp: Remove file.

* admin/quick-install-emacs (AVOID): No more Makefile.c files.

* etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can
no longer occur.
2010-05-26 22:43:27 -07:00
Glenn Morris
90278cb611 Replace YMF_PASS_LDFLAGS with autoconf.
* configure.in (YMF_PASS_LDFLAGS): Remove.
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
* configure: Regenerate.

* src/Makefile.in (YMF_PASS_LDFLAGS): Remove.
(temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.

* msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
2010-05-25 23:41:58 -07:00
Glenn Morris
ccd89fb3d6 Remove some NS_IMPL_GNUSTEP build dead code.
* configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
(GNUSTEP_MAKEFILES): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
stuff to here.

* src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
Remove.
(TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.

* msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
No longer present.

Comments:
See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html.
Nothing from gui.make was used at all in src/Makefile.in.  The only
thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only
set shared _after_ sourcing base.make, it was always empty.  We can
move the remaining flags, set in configure, to the standard variable
LD_SWITCH_SYSTEM_TEMACS.
2010-05-25 20:42:07 -07:00
Glenn Morris
4710f4fcc5 * src/Makefile.in: Fix comment typo. 2010-05-25 20:36:05 -07:00
Kenichi Handa
b705058384 Fix for finding a static composition. 2010-05-26 10:14:51 +09:00
Glenn Morris
c345fe9020 Relocate NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
* src/Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
Move before TEMACS_LDFLAGS.
(TEMACS_LDFLAGS): Use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
(temacs${EXEEXT}): Do not use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
2010-05-24 21:25:15 -07:00
Glenn Morris
2e0689abaf Do not include config.h in src/Makefile.in.
* src/Makefile.in (NOT_C_CODE): No longer define.
(config.h): No longer include.
2010-05-24 21:17:52 -07:00
Glenn Morris
8009a5e891 Move some stuff from LD_SWITCH_SYSTEM to LD_SWITCH_SYSTEM_TEMACS.
* configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff...
(LD_SWITCH_SYSTEM_TEMACS): ... to here.

* src/Makefile.in (LD_SWITCH_SYSTEM_TEMACS): Move definition after some
variables it may reference.
2010-05-24 20:53:12 -07:00
Glenn Morris
e545800352 Remove LD_SWITCH_SYSTEM_EXTRA.
* configure.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Put darwin stuff from LD_SWITCH_SYSTEM_EXTRA
here instead.

* src/Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.

* msdos/sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.
2010-05-24 20:46:15 -07:00
Kenichi Handa
cdf522217c merge trunk 2010-05-25 10:03:44 +09:00
Stefan Monnier
171eda5358 Merge from emacs-23 2010-05-24 20:54:13 -04:00
Kenichi Handa
8a2b8c4f7c merge trunk 2010-05-25 09:35:50 +09:00
Kenichi Handa
10f72a3793 Fix bidi-composition interaction in backward scanning.. 2010-05-25 09:32:24 +09:00
Stefan Monnier
dd9b52a693 * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Add delete-backward-char.
2010-05-24 17:01:10 -04:00
Stefan Monnier
66a9f7f460 * process.c (Fmake_network_process): Set :host to nil if it's not used.
Suggested by Masatake YAMATO <yamato@redhat.com>.
2010-05-24 16:46:41 -04:00
Juanma Barranquero
6ec0221e12 * dispextern.h: Fix typo in previous change. 2010-05-23 21:02:25 +02:00
Eli Zaretskii
d8c315d13d dispextern.h (init_iterator): Sync prototype with changed definition. 2010-05-23 19:57:15 +03:00
Eli Zaretskii
1111783029 Redesign bidi-aware edge positions of glyph rows, fix bug #6036.
dispextern.h (struct glyph_row): New members minpos and maxpos.
 (MATRIX_ROW_START_CHARPOS, MATRIX_ROW_START_BYTEPOS)
 (MATRIX_ROW_END_CHARPOS, MATRIX_ROW_END_BYTEPOS): Reference minpos
 and maxpos members instead of start.pos and end.pos, respectively.
 xdisp.c (display_line): Compare IT_CHARPOS with the position in
 row->start.pos, rather than with MATRIX_ROW_START_CHARPOS.
 (cursor_row_p): Use row->end.pos rather than MATRIX_ROW_END_CHARPOS.
 (try_window_reusing_current_matrix, try_window_id): Use
 ROW->minpos rather than ROW->start.pos.
 (init_from_display_pos, init_iterator): Use EMACS_INT for
 character and byte positions.
 (find_row_edges): Renamed from find_row_end.  Accept additional
 arguments for minimum and maximum buffer positions seen by
 display_line for this row.  Don't use iterator to find the
 position following the maximum one; instead, increment the
 position found by display_line directly.  Fix logic; eol_pos
 should be tested before the rest.  Handle the case of characters
 delivered from display vector (bug#6036).  Fix tests related to
 it->method.  Handle the truncated_on_right_p rows.
 (RECORD_MAX_MIN_POS): New macro.
 (display_line): Use it to record the minimum and maximum buffer
 positions for glyphs in the row being assembled.  Record the
 position of the newline that terminates the line.  If word wrap is
 in effect, restore minimum and maximum positions seen up to the
 wrap point, when iterator returns to it.
 (try_window_reusing_current_matrix): Give up if in bidi-reordered
 row and cursor not already at point.  Restore original pre-bidi
 code for unidirectional buffers.
 dispnew.c (increment_row_positions, check_matrix_invariants):
 Increment and check row->start.pos and row->end.pos, in addition
 to MATRIX_ROW_START_CHARPOS and MATRIX_ROW_END_CHARPOS.
 .gdbinit (prowlims): Display row->minpos and row->maxpos.
 Display truncated_on_left_p and truncated_on_right_p flags.
 Formatting fixes.
 (pmtxrows): Display the ordinal number of each row.  Don't display
 rows beyond the last one.
 bidi.c (bidi_cache_iterator_state): Don't zero out new_paragraph:
 it is not copied by bidi_copy_it.
2010-05-22 22:32:21 +03:00