1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Commit Graph

1245 Commits

Author SHA1 Message Date
Glenn Morris
904a432cf4 * autogen/update_autogen (msg): Remove function; use `exec' instead. 2011-03-23 00:58:05 -07:00
Glenn Morris
9bb73912f7 * autogen/update_autogen: Fix typo. 2011-03-22 23:40:56 -07:00
Glenn Morris
8cc1d51933 Replace mkinstalldirs with `install-sh -d', as automake recommends.
* Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
(sync-from-gnulib): Don't sync mkinstalldirs.

* make-dist: Don't distribute mkinstalldirs.

* leim/Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
Use `install-sh -d' rather than mkinstalldirs.

* configure.in, doc/emacs/Makefile.in: Update comments.

* admin/notes/copyright: Remove mkinstalldirs.
2011-03-22 20:09:55 -07:00
Paul Eggert
c9c49752e1 Fix more problems found by GCC 4.5.2's static checks. 2011-03-22 18:01:59 -07:00
Paul Eggert
8af8e70ee5 Merge from mainline. 2011-03-22 10:33:16 -07:00
Glenn Morris
34cb1cc610 copy_autogen tweaks.
* autogen/copy_autogen: Work from ./ or ../.
Fix time-stamps.
* autogen.sh: Doc fix.
2011-03-21 20:28:41 -07:00
Paul Eggert
6e5fa6bfce Merge from trunk and from gnulib stdio. 2011-03-20 22:34:48 -07:00
Paul Eggert
cbd350f1f3 * .bzrignore: Add lib/stdio.h. 2011-03-20 22:05:49 -07:00
Paul Eggert
d5cad867ec [ChangeLog]
fakemail: Remove dependency on ignore-value.
* Makefile.in (GNULIB_MODULES): Add stdio.
* lib/stdio.in.h, m4/stdio_h.m4: New files, automatically
imported from gnulib.
[lib-src/ChangeLog]
fakemail: Remove dependency on ignore-value.
This undoes some of the recent fakemail-related changes.
It is made possible due to recent changes to gnulib's stdio module.
* Makefile.in (fakemail${EXEEXT}): Do not depend on ignore-value.h.
* fakemail.c: Do not include ignore-value.h.
(put_line): Do not use ignore_value.
2011-03-20 22:04:41 -07:00
Glenn Morris
66b874939b (Re)move autotools generated files from the repository.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00225.html

* autogen/: New directory, to be excluded from releases.
* autogen/copy_autogen, autogen/update_autogen: New scripts.
* autogen/README: New file.
* autogen/aclocal.m4, autogen/config.in, autogen/configure:
* autogen/Makefile.in: Add auto-updated generated files.

* autogen.sh: No longer a no-op, now it tests for autotools
and runs them as necessary.

* configure.in: Defaule maintainer-mode to on.

* aclocal.m4, configure, lib/Makefile.in: Remove files.

* src/config.in: Remove file.

* INSTALL.BZR, admin/make-tarball.txt: Update instructions.
2011-03-20 16:58:23 -07:00
Juanma Barranquero
0a19a6f875 Fix typos. 2011-03-19 04:58:45 +01:00
Paul Eggert
401bf9b470 process.c: Use socklen_t, not int, for socket lengths. 2011-03-17 20:30:24 -07:00
Paul Eggert
1ef6de0565 Update for gnulib, adding Solaris 9+10 fixes. 2011-03-13 10:39:04 -07:00
Jan D
0afb4571a7 Updates for compiling with Gtk+ 3.0 (--with-x-toolkit=gtk3).
* configure.in: Require 3.0 for --with-gtk3.  Add HAVE_GTK3.

* doc/emacs/xresources.texi (GTK resources): ~/.emacs.d/gtkrc does not work
for Gtk+ 3.

* src/gtkutil.c: Include gtkx.h if HAVE_GTK3.  If ! HAVE_GTK3, define
gdk_window_get_screen, gdk_window_get_geometry,
gdk_x11_window_lookup_for_display and GDK_KEY_g.
(xg_set_screen): Use DEFAULT_GDK_DISPLAY.
(xg_get_pixbuf_from_pixmap): New function.
(xg_get_pixbuf_from_pix_and_mask): Change parameters from GdkPixmap
to Pixmap, take frame as parameter, remove GdkColormap parameter.
Call xg_get_pixbuf_from_pixmap instead of
gdk_pixbuf_get_from_drawable.
(xg_get_image_for_pixmap): Do not make GdkPixmaps, call
xg_get_pixbuf_from_pix_and_mask with Pixmap parameters instead.
(xg_check_special_colors): Use GtkStyleContext and its functions
for HAVE_GTK3.
(xg_prepare_tooltip, xg_hide_tooltip): Call gdk_window_get_screen.
(xg_prepare_tooltip, create_dialog, menubar_map_cb)
(xg_update_frame_menubar, xg_tool_bar_detach_callback)
(xg_tool_bar_attach_callback, xg_update_tool_bar_sizes): Call
gtk_widget_get_preferred_size.
(xg_frame_resized): gdk_window_get_geometry only takes 5
parameters.
(xg_win_to_widget, xg_event_is_for_menubar): Call
gdk_x11_window_lookup_for_display.
(xg_set_widget_bg): New function.
(delete_cb): New function.
(xg_create_frame_widgets): connect delete-event to delete_cb.
Call xg_set_widget_bg.  Only set backgrund pixmap for ! HAVE_GTK3
(xg_set_background_color): Call xg_set_widget_bg.
(xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
(xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3.
Only call gtk_range_set_update_policy if ! HAVE_GTK3.
(xg_make_tool_item): Only connect xg_tool_bar_item_expose_callback
if ! HAVE_GTK3.
(update_frame_tool_bar): Call gtk_widget_hide.
(xg_initialize): Use GDK_KEY_g.

* src/xmenu.c (menu_position_func): Call gtk_widget_get_preferred_size.

* src/xsmfns.c (gdk_set_sm_client_id): Define to gdk_set_sm_client_id
if ! HAVE_GTK3
(x_session_initialize): Call gdk_x11_set_sm_client_id.

* src/xterm.c (XFillRectangle): Use cairo routines for HAVE_GTK3.
(x_term_init): Disable Xinput(2) with GDK_CORE_DEVICE_EVENTS.
Load ~/emacs.d/gtkrc only for ! HAVE_GTK3.

* src/xterm.h (DEFAULT_GDK_DISPLAY): New define.
(GDK_WINDOW_XID, gtk_widget_get_preferred_size): New defines
for ! HAVE_GTK3.
(GTK_WIDGET_TO_X_WIN): Use GDK_WINDOW_XID.
2011-03-08 09:34:55 +01:00
Glenn Morris
870d9cf691 * configure.in (FREETYPE_LIBS): Actually set it to something.
This was needed for linking a lucid toolkit build on a recent
Debian testing system.  Without this, it failed with:
ftfont.o: undefined reference to symbol 'FT_New_Face'
2011-03-05 17:42:13 -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
Glenn Morris
2b0c733045 Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org. 2011-02-27 17:07:29 -08:00
Eli Zaretskii
03382788bd .bzrignore: Ignore new lib/*.in-h files. 2011-02-26 11:35:07 +02:00
Eli Zaretskii
945d8b4444 Fix the MS-DOS configury due to new gnulib modules.
config.bat: Rename stdint.in.h and sys_stat.in.h.  Call
 depfiles.bat even if lib/deps already exist.
 msdos/depfiles.bat: Create a dummy .Po file only if a file by the same
 name does not already exist in the deps/ subdirectory.
2011-02-26 11:27:05 +02:00
Paul Eggert
36f13e1667 Simplify symlink portability workaround. 2011-02-25 12:05:36 -08:00
Paul Eggert
d3af8a57b4 Elaborate my most-recent ChangeLog entry. 2011-02-25 02:03:28 -08:00
Paul Eggert
4394ee0474 Merge from mainline. 2011-02-24 23:36:37 -08:00
Paul Eggert
9411886d38 Regenerate. 2011-02-24 23:23:41 -08:00
Paul Eggert
a07b892ff1 Merge from mainline. 2011-02-24 22:42:06 -08:00
Glenn Morris
1e8dbdc6e8 Replace some obsolete autoconf syntax.
* configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(),
AC_CONFIG_COMMANDS(), and AC_OUTPUT sans arguments.
2011-02-23 20:28:17 -08:00
Glenn Morris
6e81c8191f Fix typo "comand". 2011-02-22 23:15:55 -08:00
Glenn Morris
0105dc3e03 Fix spelling of "supersede". 2011-02-22 21:10:10 -08: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
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
Paul Eggert
9441f0e4fc Merge from mainline. 2011-02-21 15:46:32 -08:00
Paul Eggert
ba01e9d785 [ChangeLog]
* lib/min-max.h: New file, for "min" and "max".
[lib-src/ChangeLog]
New file "lib/min-max.h".
* ebrowse.c (min, max): Define them by including <min-max.h>
instead of defining it ourselves.
* pop.c (min): Likewise.
2011-02-21 15:22:34 -08:00
Christoph Scholtes
9f8370e63f Add stdint.h for MS-Windows.
nt/inc/stdint.h: New file, to support compilation with tool chains
 that do not have stdint.h (e.g. MSVC).
 lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
 $(EMACS_ROOT)/nt/inc/stdint.h.
2011-02-21 22:16:43 +02: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
Eli Zaretskii
e1e6b4fb85 Followup for 2011-02-20T18:50:26Z!eliz@gnu.org.
lib/makefile.w32-in ($(BLD)/md5.$(O)): Don't depend on
 $(EMACS_ROOT)/nt/inc/sys/stat.h.
2011-02-20 23:09:45 +02:00
Paul Eggert
6cac9cb117 * configure.in (C_WARNINGS_SWITCH): Do not prepend -Wno-pointer-sign. 2011-02-20 11:46:08 -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
5fa4ac767c Import filemode module from gnulib.
* .bzrignore: Add lib/sys/.
* Makefile.in (GNULIB_MODULES): Add filemode.
* lib/Makefile.am (MOSTLYCLEANDIRS): New macro.
* lib/filemode.c: Renamed from src/filemode.c and regenerated
from gnulib.  This adds support for some more file types, e.g.,
Cray DMF migrated files.
* lisp/emacs-lisp/find-gc.el (find-gc-source-files): Remove filemode.c.
* lib/filemode.h, lib/sys_stat.in.h, m4/filemode.m4, m4/st_dm_mode.m4:
* m4/sys_stat_h.m4: New files, generated from gnulib.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
Regenerate.

2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-20 02:51:50 -08:00
Paul Eggert
61353ac8cd Merge: Import crypto/md5 and stdint modules from gnulib. 2011-02-20 00:48:52 -08:00
Eli Zaretskii
219463da10 Fix generation of auto-dependency files in lib/.
.bzrignore: Add lib/deps/.
 config.bat: Generate *.Po files in lib/deps.
 msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
 rules.
 msdos/depfiles.bat: New file.
2011-02-19 18:53:10 +02:00
Eli Zaretskii
152be435b9 Update .bzrignore for files produced by the MS-DOS build.
.bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
2011-02-19 18:12:18 +02: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
5f90be1bb7 Import simpler crypto/md5 module from gnulib, plus stdint module.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
* src/config.in: Regenerate.
* lib/md5.c, lib/md5.h: Regenerate with simpler version, which
assumes C99-style <stdint.h>, supplied by the stdint module.
* lib/stdint.in.h, m4/longlong.m4, m4/stdint.m4: New files,
generated from gnulib.
* src/deps.mk (fns.o): Do not depend on md5.h, fixing a typo in
the earlier patch.
2011-02-18 23:28:29 -08:00
Paul Eggert
942f733fd1 Import crypto/md5 module from gnulib.
* Makefile.in (MAKEFILE_MODULES): Add crypto/md5.
* admin/notes/copyright: Remove src/md5.c and src/md5.h as
special cases.
* src/Makefile.in (base_obj): Remove md5.o, since this file
is in lib now.
* src/deps.mk (md5.o): Remove.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
Regenerate.
* lib/md5.c: Regenerate.  This renames the file from src/md5.c,
and adds some porting improvements from gnulib.
* lib/md5.h: Regenerate, likwise; rename from src/md5.h.
* m4/md5.m4: New file, from gnulib.

2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-18 00:07:03 -08:00
Paul Eggert
37b3d30244 Merge from mainline. 2011-02-17 23:44:39 -08:00
Paul Eggert
7d315eb678 Import IRIX 6.5 getloadavg fixes from gnulib.
* configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.
2011-02-17 23:41:43 -08:00
Paul Eggert
0ca2f89e09 Merge from mainline. 2011-02-15 17:35:20 -08:00
Paul Eggert
1f5d53eb53 Import getloadavg module from gnulib. 2011-02-15 16:33:44 -08:00