mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 17:30:54 -08:00
Code Issues Projects Releases Wiki Activity
98871 commits 243 branches 194 tags 7.8 GiB
Commit graph

9597 commits

Author SHA1 Message Date
Paul Eggert
5489860be1 * xdisp.c: Rename or move local decls to avoid shadowing. 
(init_iterator, handle_fontified_prop, handle_single_display_spec):
(message_dolog, message_with_string, redisplay_internal):
(redisplay_window, try_window_reusing_current_matrix, try_window_id):
(compute_line_metrics, highlight_trailing_whitespace, cursor_row_p):
(display_line, display_string, rows_from_pos_range):
(mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
Rename or move local decls.
 2011-03-05 23:50:01 -08:00
Paul Eggert
6c0dea8a89 Merge: Work around some portability problems with symlinks. 2011-03-01 21:25:09 -08:00
Paul Eggert
ba46f4d85a Merge from mainline. 2011-03-01 17:52:03 -08:00
Chong Yidong
52eb77a6ad Avoid recording dead buffers in buffer-list frame param (Bug#7898). 
* src/frame.c (store_frame_param): Don't store value directly in
buffer_list and buried_buffer_list; copy the list and remove dead
buffers.
 2011-02-27 17:57:22 -05:00
Eli Zaretskii
4824410fa8 Implement stub emulation of `readlink' for MS-DOS. 
src/msdos.c (readlink) [DJGPP < 2.04]: New stub function.
 src/msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype.
 2011-02-27 21:51:35 +02:00
Eli Zaretskii
0f7bb05d28 Implement stubs of readlink' and symlink' for MS-Windows. 
src/w32.c (symlink, readlink): New stub functions.
 nt/inc/unistd.h (readlink, symlink): Declare prototypes.
 2011-02-27 21:48:31 +02:00
Eli Zaretskii
40be44e2a9 Emulate `readlink' for DJGPP versions before 2.04. 
src/msdos.c (readlink) [DJGPP < 2.04]: New stub function.
 src/msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype.
 2011-02-27 21:46:39 +02:00
Paul Eggert
c783d15b93 * scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG. 
This avoids a gcc warning in some configurations.
 2011-02-26 23:50:33 -08:00
Paul Eggert
76c1cebcc9 * frame.c (x_set_screen_gamma): Rename local to avoid shadowing. 2011-02-26 23:47:34 -08:00
Paul Eggert
0ff162fccf * frame.h: Avoid gcc -Wmissing-prototypes diagnostics. 
(set_menu_bar_lines, x_get_resource_string): New decls.
* msdos.c (set_menu_bar_lines): Omit decl.
 2011-02-26 23:30:02 -08:00
Paul Eggert
fdb0b28bf6 * dispextern.h (struct glyph): Make u.img_id int, not unsigned. 
It's always given int values and used as an int.  This suppresses
a gcc "comparison of unsigned expression >= 0" warning in some
configurations.
 2011-02-26 18:41:48 -08:00
Paul Eggert
27786b2f70 * dispnew.c: Rename locals to avoid shadowing. 
(update_text_area, scrolling_window, update_frame_1): Rename locals.
 2011-02-26 16:48:14 -08:00
Paul Eggert
d2d37ddc91 * dispnew.c: Fix problem uncovered by gcc -Wunused-variable. 
(adjust_frame_glyphs_for_window_redisplay): Make 'w' local to the
contexts that actually need it.
 2011-02-26 15:05:14 -08:00
Paul Eggert
09ad5a9148 * dispnew.c: Fix problems uncovered by gcc -Wstrict-prototypes. 
(copy_glyph_row_contents): Remove; not used.
(frame_row_to_window, check_current_matrix_flags):
(window_change_signal): Now static, since they're not used elsewhere.
(check_current_matrix_flags): Surround with "#if 0", since its
only use is in a comment.  Maybe both the comment and the "#if 0"
stuff should be removed?
 2011-02-26 14:54:33 -08:00
Eli Zaretskii
003fa8b6f4 Fix Sed scripts and srs/s/msdos.h for gnulib additions. Not tested yet. 
src/s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
 (lstat): Define for DJGPP < 2.04.
 msdos/sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T)
 (BITSIZEOF_WINT_TGNULIB_FCHMODAT, GNULIB_FSTATAT, GNULIB_FUTIMENS)
 (GNULIB_LCHMOD, GNULIB_LSTAT, GNULIB_MBTOWC, GNULIB_MKDIRAT)
 (GNULIB_MKFIFO, GNULIB_MKFIFOAT, GNULIB_MKNOD, GNULIB_MKNODAT)
 (GNULIB_STAT, GNULIB_UTIMENSAT, GNULIB_WCTOMB, HAVE_FCHMODAT)
 (HAVE_FSTATAT, HAVE_FUTIMENS, HAVE_INTTYPES_H, HAVE_LCHMOD)
 (HAVE_LONG_LONG_INT, HAVE_LSTAT, HAVE_MKDIRAT, HAVE_MKFIFO)
 (HAVE_MKFIFOAT, HAVE_MKNOD, HAVE_MKNODAT)
 (HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WCHAR_T)
 (HAVE_SIGNED_WINT_T, HAVE_STDINT_H, HAVE_SYS_BITYPES_H)
 (HAVE_SYS_INTTYPES_H, HAVE_SYS_TYPES_H)
 (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_UTIMENSAT, HAVE_WCHAR_H)
 (MKDIR_P, NEXT_AS_FIRST_DIRECTIVE_STDINT_H)
 (NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H, NEXT_STDINT_H)
 (NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
 (REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
 (REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
 (WCHAR_T_SUFFIX, WINT_T_SUFFIX): New edits.
 ($(MKDIR_P)): Replace with equivalent DOS command.
 msdos/sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
 (HAVE_LONG_LONG_INT, HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WINT_T)
 (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_WCHAR_H, HAVE_INTTYPES_H): New
 edits.
 2011-02-26 14:55:10 +02:00
Paul Eggert
d9d0d182da * fileio.c (Fmake_symbolic_link): Treat ENOSYS specially, and 
generate a special message for it.  Suggested by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00995.html>.
 2011-02-25 13:20:06 -08:00
Paul Eggert
36f13e1667 Simplify symlink portability workaround. 2011-02-25 12:05:36 -08:00
Paul Eggert
a07b892ff1 Merge from mainline. 2011-02-24 22:42:06 -08:00
Paul Eggert
b18947669c * dired.c (Ffile_attributes): Increase size of modes from 10 to 12 2011-02-24 22:30:50 -08:00
Ben Key
2c6584e817 Fix handling of bar cursors in NS terminal. 
* nsterm.m (ns_draw_window_cursor): Obey the cursor_width argument
directly, for bar cursors.

* xdisp.c (set_frame_cursor_types): Don't write an undefined value
into the frame's cursor_width.
 2011-02-23 15:41:43 -05:00
Stefan Monnier
617a0e834a * src/print.c (print_object): Never print old-style backquotes. 
Obey escapeflag for hash tables as well.
 2011-02-23 10:14:21 -05:00
Glenn Morris
cce7d53002 Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org. 2011-02-22 20:19:28 -08:00
Kenichi Handa
9c02aefc95 merge emacs-23 2011-02-23 10:56:49 +09:00
Paul Eggert
ae0d725005 [ChangeLog] 
Work around some portability problems with symlinks.
* Makefile.in (GNULIB_MODULES): Add lstat, readlink, symlink.
* configure.in (lstat, HAVE_LSTAT): Remove special hack.
* lib/lstat.c, lib/readlink.c, lib/stat.c, lib/symlink.c:
* m4/dos.m4, m4/lstat.m4, m4/readlink.m4, m4/stat.m4, m4/symlink.m4:
New files, automatically generated from gnulib.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
* lib/stdlib.in.h, m4/gl-comp.m4, m4/stdlib_h.m4: Regenerate.

2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
[src/ChangeLog]
Work around some portability problems with symlinks.
* fileio.c (Frename_file, Fmake_symbolic_link, Ffile_symlink_p):
Simplify the code by assuming that the readlink and symlink calls
exist, even if they always fail on this host.
(Ffile_readable_p): Likewise, for fifos.
* config.in: Regenerate.
 2011-02-22 11:30:07 -08:00
Paul Eggert
8d40723d1e * dired.c (Ffile_attributes): Simplify and avoid #ifdef. 2011-02-22 10:32:51 -08:00
Wolfgang Jenkner
aa0f73d190 * src/lread.c (openp): Correct Boolean typo in last commit. 2011-02-22 13:02:11 -05:00
Adrian Robert
bdaa0745ee * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified key to emacs, treat as unmodified (go to input manager processing). 2011-02-22 16:13:54 +02:00
Juanma Barranquero
2f8f196d1f src/ChangeLog: Fix typos. 2011-02-22 14:27:23 +01:00
Kenichi Handa
e3b300a497 Fix font size handling. 2011-02-22 10:58:03 +09:00
Paul Eggert
f68c809d7e [ChangeLog] 
Assume S_ISLNK etc. work, since gnulib supports this.
* Makefile.in (GNULIB_MODULES): Add sys_stat.
* configure.in: Check for lstat and set HAVE_LSTAT=0 if not.
Pretend to be using the gnulib lstat module for benefit of sys/stat.h.
* configure, lib/Makefile.in, lib/gnulib.mk: Regenerate.
[lib-src/ChangeLog]
Assume S_ISLNK etc. work, since gnulib supports this.
* etags.c (S_ISREG): Remove.
[src/ChangeLog]
Assume S_ISLNK etc. work, since gnulib supports this.
* config.in: Regenerate.
* dired.c (lstat): Remove.
(file_name_completion): Assume S_ISDIR works.
(file_name_completion_stat): Assume S_ISLNK works.
Do not bother calling stat unless lstat says it's a symlink.
* fileio.c (S_ISLNK, S_ISFIFO, S_ISREG, lstat): Remove.
(Fcopy_file): Assume S_ISREG and S_ISLNK work.
(check_writable, Ffile_writable_p, Fset_file_times):
Assume S_ISDIR works.
(Ffile_readable_p): Use S_IFIFO, not S_ISFIFO, to guess whether
fifos exist.
(Ffile_regular_p, Finsert_file_contents): Assumes S_ISREG works.
* filelock.c (S_ISLNK): Remove.
* lread.c (openp): Assume S_ISDIR works.
* xrdb.c (S_ISDIR): Remove.
 2011-02-21 17:55:20 -08:00
Kenichi Handa
2e15a2cf4d merge emacs-23 2011-02-22 09:22:09 +09:00
Eli Zaretskii
25c51af3a9 Adapt MS-Windows build to import of filemode.c from gnulib. 
nt/inc/sys/stat.h (S_ISUID, S_ISGID, S_ISVTX, S_IRGRP, S_IROTH)
 (S_IWGRP, S_IWOTH, S_IXGRP, S_IXOTH, S_ISSOCK, S_ISLNK, S_ISCTG)
 (S_ISDOOR, S_ISMPB, S_ISMPC, S_ISNWK, S_ISPORT, S_ISWHT)
 (S_TYPEISMQ, S_TYPEISSEM, S_TYPEISSHM, S_TYPEISTMO): Define.
 (lstat): Define to stat.
 lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
 src/makefile.w32-in and adapt.  Depend on stamp_BLD.
 (GNULIBOBJS): Add $(BLD)/filemode.$(O).
 src/makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to
 lib/makefilw.w32-in.
 ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h.
 (GLOBAL_SOURCES): Remove filemode.c.
 (OBJ1): Remove $(BLD)/filemode.$(O).
 lib-src/makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
 ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
 Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
 2011-02-21 22:00:19 +02:00
Paul Eggert
5c185672d6 Import filemode module from gnulib. 2011-02-21 09:56:37 -08:00
Paul Eggert
2763cfc268 Merge from mainline. 2011-02-20 11:31:01 -08:00
Christoph Scholtes
32159fc37e Fix the MS-Windows build due to import of md5 from gnulib. 
src/makefile.w32-in: Remove md5.$(O).
 ($(BLD)/md5.$(O)): Remove prerequisites, moved to
 lib/makefile.w32-in.
 ($(BLD)/fns.$(O)): Depend on $(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
 lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
 src/makefile.w32-in.
 2011-02-20 20:50:26 +02:00
Paul Eggert
cfd812fa03 Import filemode module from gnulib. 
* Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib.
* deps.mk (dired.o): Depend on ../lib/filemode.h, too.
(filemode.o): Remove; this is now in ../lib.
* dired.c: Include <filemode.h>.
(filemodestring): Remove now-redundant decl.
* config.in: Regenerate.

2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 2011-02-20 02:53:22 -08:00
Paul Eggert
61353ac8cd Merge: Import crypto/md5 and stdint modules from gnulib. 2011-02-20 00:48:52 -08:00
Eli Zaretskii
f601db19da Finish fixing the MS-DOS build. Everything builds and works. 
src/termcap.c (tputs): Don't declare baud_rate.
 msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed2v2.inp (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.
 2011-02-19 21:41:00 +02:00
Chong Yidong
f6ed3dbe85 * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. 
See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00715.html
 2011-02-19 12:34:50 -05:00
Eli Zaretskii
9d9d12cdf3 Initial version of fix for the MS-DOS build, not yet tested. 
config.bat: Configure in `lib'.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 src/s/msdos.h (strtold): Define to _strtold.
 admin/admin.el (set-version): Add msdos/sed2v2.inp.
 2011-02-19 17:57:35 +02:00
Paul Eggert
ff05203ec6 * deps.mk (fns.o): Depend on ../lib/md5.h. 2011-02-19 01:51:59 -08:00
Paul Eggert
f12f551b2c Merge from mainline. 2011-02-18 22:25:05 -08:00
Stefan Monnier
cbe81f1d96 * alloc.c (make_unibyte_string): Don't SET_UNIBYTE redundantly. 
* process.c (Fstart_process, Fmake_serial_process)
(Fmake_network_process, server_accept_connection):
Use empty_unibyte_string.
 2011-02-18 12:37:30 -05:00
Stefan Monnier
aa56f3613e * lisp/files.el (cd): Make completion obey cd-path. 
* lread.c (Qdir_ok): New constant.
(syms_of_lread): Initialize it.
(openp): Don't ignore directories if the predicate returns dir-ok.

Fixes: debbugs:7924
 2011-02-18 12:18:16 -05:00
Eli Zaretskii
42af913dd4 xdisp.c (display_line): Fix the change made for bug#7939. 2011-02-18 17:11:10 +02:00
Eli Zaretskii
d6de49a103 Fix bug #7840 with default terminal and keyboard encodings. 
terminal.c (create_terminal): Use default-keyboard-coding-system
 and default-terminal-coding-system to initialize coding systems of
 the new terminal.
 2011-02-18 16:48:28 +02:00
Paul Eggert
37b3d30244 Merge from mainline. 2011-02-17 23:44:39 -08:00
Stefan Monnier
b286858c7a Don't GC-scan stack data redundantly. 
* src/alloc.c (Fgarbage_collect): When using stack scanning, don't
redundantly scan byte-code stacks, catchlist, and handlerlist.
* src/bytecode.c (BYTE_MAINTAIN_TOP): New macros.
(struct byte_stack): Only define `top' and `bottom' if used.
(mark_byte_stack): Only define if used.
(BEFORE_POTENTIAL_GC, AFTER_POTENTIAL_GC): Nullify if BYTE_MAINTAIN_TOP
is not set.
(Fbyte_code): Don't set `bottom' unless BYTE_MAINTAIN_TOP is set.
* src/lisp.h (BYTE_MARK_STACK): New macro.
(mark_byte_stack): Only declare if BYTE_MARK_STACK is set.
* src/term.c (OUTPUT_IF): Use OUTPUT.
 2011-02-17 21:07:36 -05:00
Jan Djärv
124c9ff0e5 Fix KVAR/BVAR, 
* nsfns.m (Fx_create_frame, ns_set_name_as_filename)
(Fns_read_file_name): Replace B_ with BVAR.

* nsterm.m (ns_term_init): Use KVAR.
 2011-02-17 11:19:29 +01:00
Kenichi Handa
dbc0543206 Fix font-size handling bug. 2011-02-17 16:47:29 +09:00