1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 00:01:33 -08:00
Commit graph

821 commits

Author SHA1 Message Date
Andreas Schwab
a706a3bca4 Fixes: debbugs:11380
* make-docfile.c (scan_lisp_file) [DEBUG]: Also skip if and
byte-code forms.
2012-04-29 22:05:44 +02:00
Chong Yidong
2d0e8e614a Fix emacsclient/server behavior under --without-x.
* lib-src/emacsclient.c (main): Send -tty to Emacs under more circumstanced (Bug#8314).

* lisp/server.el (server-process-filter): Only try to open a window
system frame if compiled with graphical support (Bug#8314).

Fixes: debbugs:11102
2012-04-20 18:37:57 +08:00
Chong Yidong
c07a4c0b59 Merge from emacs-24 branch 2012-04-20 16:48:50 +08:00
Paul Eggert
6c94c34fe8 Merge from trunk. 2012-04-18 09:45:13 -07:00
Paul Eggert
6c91c9f0a5 Fix ChangeLog typo. 2012-04-17 16:06:33 -07:00
Paul Eggert
ae6e112df0 Merge from trunk. 2012-04-17 14:38:34 -07:00
Paul Eggert
f7752e6738 Merge from trunk. 2012-04-15 18:12:46 -07:00
Paul Eggert
15142f2797 Assume less-ancient POSIX support.
* update-game-score.c: Include <getopt.h> rather than rolling our
own decls for optarg, optind, opterr.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
2012-04-15 17:41:01 -07:00
Paul Eggert
20a14f94f6 Merge from trunk. 2012-04-15 16:55:52 -07:00
Chong Yidong
9a864fa27d Move "emacsclient -t -n" handling from emacsclient.c to server.el.
Fix its buggy logic for the Windows case (regression from 23.4).

* lib-src/emacsclient.c (decode_options): Move -t -n corner case handling
into server.el.

* lisp/server.el (server-process-filter): Handle corner case where both
tty and nowait options are present.

Fixes: debbugs:11102
2012-04-15 16:49:24 +08:00
Juanma Barranquero
75f1671a52 Fix ChangeLog typos. 2012-04-15 04:59:30 +02:00
Paul Eggert
bdf35b6a6a Merge from trunk. 2012-04-13 21:37:44 -07:00
Glenn Morris
35dc09a19c Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org 2012-04-13 18:46:06 -07:00
Juanma Barranquero
9401b32679 lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Fix typo in 2011-12-04T17:13:01Z!lekktu@gmail.com.
Call ttyname instead of passing its address.
2012-04-12 20:22:06 +02:00
Paul Eggert
9f46df23a3 Merge from trunk; add Bug#. 2012-04-09 12:51:06 -07:00
Paul Eggert
b8df54ffbe configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs.  It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable.  This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 00:45:59 -07:00
Eli Zaretskii
9078ead6ce Support building on MS-Windows with libxml2.
src/makefile.w32-in (OBJ2): Add xml.$(O).
 (GLOBAL_SOURCES): Add xml.c.
 ($(BLD)/xml.$(O)): New dependency list.
 src/xml.c (DEF_XML2_FN, LOAD_XML2_FN) [WINDOWSNT]: New macros.
 (fn_htmlReadMemory, fn_xmlReadMemory, fn_xmlDocGetRootElement)
 (fn_xmlFreeDoc, fn_xmlCleanupParser, fn_xmlCheckVersion)
 [!WINDOWSNT]: New macros.
 (init_libxml2_functions, libxml2_loaded_p): New functions.
 (parse_region): Call fn_xmlCheckVersion instead of using the macro
 LIBXML_TEST_VERSION.  Call libxml2 functions via the fn_* macros.
 (xml_cleanup_parser): New function, export for fn_xmlCleanupParser.
 Calls xmlCleanupParser only if libxml2 was loaded (or statically
 linked in).
 (Flibxml_parse_html_region, Flibxml_parse_xml_region): Call
 init_libxml2_functions before calling libxml2 functions.
 (syms_of_xml) <Qlibxml2_dll>: DEFSYM it.
 src/emacs.c: Don't include libxml/parser.h.
 (shut_down_emacs): Call xml_cleanup_parser, instead of calling
 xmlCleanupParser directly.
 src/ lisp.h [HAVE_LIBXML2]: Add prototype for xml_cleanup_parser.

 nt/configure.bat: Support building with libxml2.
 nt/INSTALL:
 nt/README.W32: Add information about libxml2.

 lisp/term/w32-win.el (dynamic-library-alist): Add libxml2 DLLs.

 lib-src/makefile.w32-in (obj): Add xml.o.
2012-04-07 16:57:36 +03:00
Eli Zaretskii
e4ecc6a217 Build test-distrib on MS-Windows and run it during the build.
lib-src/makefile.w32-in (ALL): Add $(BLD)/test-distrib.exe.
2012-04-07 13:36:54 +03:00
Eli Zaretskii
d67a9a85f5 Fix parallel build and bootstrap on MS-Windows.
nt/makefile.w32-in: (all): Don't depend on stamp_BLD and on maybe-bootstrap.
 (all-other-dirs-$(MAKETYPE)): Depend on maybe-bootstrap.
 (bootstrap-gmake): Invoke the "clean" and build targets in 2
 separate commands, so they run in that order even under "make -j".
 lib/makefile.w32-in (gnulib, all): Don't depend on stamp_BLD.
 lib-src/makefile.w32-in (ALL): Now the list of executables, not of phony
 targets.
 (.PHONY): Only make-docfile is its prerequisite now.
 (make-docfile): Don't depend on stamp_BLD.  Add a comment about
 the need in this target.
 (ctags, etags, ebrowse, hexl, movemail, emacsclient)
 (test-distrib): Phony targets removed.
 ($(BLD)/test-distrib.exe): Run test-distrib as part of the recipe.
 (all): Don't depend on stamp_BLD.
2012-04-07 13:19:22 +03:00
Andreas Schwab
e29ab36b48 Define -print-nonl client command
* lib-src/emacsclient.c (main): Handle -print-nonl command.

* lisp/server.el (server-msg-size): New constant.
(server-reply-print): New function.
(server-eval-and-print): Use it.
(server-eval-at): Use server-quote-arg and server-unquote-arg.
Handle -print-nonl.
2012-03-11 18:53:07 +01:00
Andreas Schwab
2b84f674cc * emacsclient.c (main): Handle multiple messages in a single
datagram.
2012-03-11 12:49:59 +01:00
Andreas Schwab
6b0c89847a Don't access freed memory in emacsclient
* emacsclient.c (socket_name): Add const.
(get_server_config): Add parameter config_file, use it instead of
global server_file.
(set_tcp_socket): Add parameter local_server_file, pass it down to
get_server_config.
(set_local_socket): Add parameter local_socket_name, use it
instead of global socket_name.
(set_socket): Adjust calls to set_local_socket and set_tcp_socket.
Don't clobber global server_file or socket_name.
(main): No longer reset server_file or socket_name.
2012-03-11 12:15:25 +01:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Glenn Morris
1c6e5a3260 Update short copyright year to 2012.
* etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex:
* etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
* etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex:
* etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex:
* etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex:
* etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex:
* etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex:
* etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
* etc/refcards/sk-survival.tex, etc/refcards/survival.tex:
* etc/refcards/vipcard.tex, etc/refcards/viperCard.tex:
* lib-src/ebrowse.c (version) <emacs_copyright>:
* lib-src/etags.c (print_version) <emacs_copyright>:
* lib-src/rcs2log (Copyright): Update short copyright year to 2012.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* src/emacs.c (emacs_copyright): Update short copyright year to 2012.
2012-01-04 23:45:28 -08:00
Andreas Schwab
28796b3a4a * etags.c (C_entries): Properly skip over string and character
constants inside brackets.  (Bug#10357)
2011-12-25 10:55:37 +01:00
Paul Eggert
333f9019e2 Spelling fixes. 2011-12-11 21:32:49 -08:00
Juanma Barranquero
520fca41d6 Fix emacsclient bug where "-n -c" does not open a new frame on Windows.
* lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Don't force tty = 0;
instead, treat both -c and -t as always requesting a new "tty" frame,
and let server.el decide which kind is actually required.
Reported by Uwe Siart <usenet@siart.de> in this thread:
http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00303.html

* lisp/server.el (server-delete-client): On Windows, do not try to delete
the only terminal.
(server-process-filter): On Windows, treat requests for a tty frame as
if they were for a GUI frame if the running server is in GUI mode.
2011-12-04 18:13:01 +01:00
Chong Yidong
e7308292aa * emacsclient.c (main): Condition last change on WINDOWSNT (Bug#10155). 2011-11-30 16:13:05 +08:00
Eli Zaretskii
8c9afb4694 Fix MS-Windows build with MSVC compiler.
Parts of the changes by Fabrice Popineau  <fabrice.popineau@supelec.fr>.

 lib-src/makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS).
 lib-src/emacsclient.c (main) <environ>: Remove declaration, already
 pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows.
 nt/inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs.
 (UINT64_MAX) [_WIN64]: Fix definition.
 (uintmax_t, intmax_t): Fix definitions.
 nt/inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide
 correct definitions.
 nt/config.nt (HAVE_DECL_STRTOLL): Define.
 (va_copy) [_WIN64]: Provide a better definition.
 src/s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define.
 (snprintf) [_MSC_VER]: Redirect to _snprintf.
 (strtoll) [_MSC_VER]: Redirect to _strtoi64.
 (malloc, free, realloc, calloc): Redirect to e_* only when
 compiling Emacs.
 src/lisp.h (GCTYPEBITS): Move before first use.
 (ALIGN_GCTYPEBITS) [_MSC_VER]: Define.
 (DECL_ALIGN) [_MSC_VER]: Use it, as MSVC doesn't like bit ops in
 this macro definition.
 (tzname): Redirect to _tzname for all values of _MSC_VER.

Fixes: debbugs:9960
2011-11-27 20:52:53 +02:00
Paul Eggert
b0b199744d Spelling fixes. 2011-11-26 00:26:37 -08:00
Glenn Morris
420b63ad29 * lib-src/make-docfile.c (scan_lisp_file): Treat defcustom like defvar.
* lisp/paths.el (rmail-file-name): Format doc-string for make-docfile.
2011-11-23 23:32:40 -08:00
Paul Eggert
e1dbe924b5 Spelling fixes. 2011-11-19 18:29:42 -08:00
Paul Eggert
c5e87d104b Spelling fixes. 2011-11-17 09:40:48 -08:00
Juanma Barranquero
7877f37394 Fix typos. 2011-11-16 18:47:25 +01:00
Juanma Barranquero
58179ccebd Fix typos. 2011-11-16 13:34:47 +01:00
Dan Nicolaescu
5ef215d874 * lib-src/Makefile.in (all): Make sure "all" is the first target. 2011-11-14 15:54:16 -07:00
Juanma Barranquero
657d08d30a src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall. 2011-10-27 02:59:21 +02:00
Glenn Morris
0f054abcec * lib-src/etags.c (Fortran_functions): Handle "elemental" functions. 2011-09-07 00:28:05 -07:00
Dieter Schuster
d0417b4cfa * lib-src/etags.c (Fortran_functions): Handle "pure" functions. (tiny change)
Fixes: debbugs:9359
2011-09-07 00:25:55 -07:00
Paul Eggert
e39b275c8c Merge from trunk. 2011-09-06 09:34:41 -07:00
Paul Eggert
1c262cae40 Merge from trunk. 2011-09-04 16:58:01 -07:00
Paul Eggert
86633eab8a sprintf-related integer and memory overflow issues
Fixes: debbugs:9397 debbugs:9412
2011-09-04 14:52:59 -07:00
Paul Eggert
005d87bd23 Add Bug#. 2011-08-28 17:27:35 -07:00
Paul Eggert
0c6d656d26 * update-game-score.c: Include <limits.h>
(get_user_id): Do not assume uid fits in 'int'.  Simplify.
2011-08-28 16:59:14 -07:00
Paul Eggert
644a0faa36 * movemail.c (main): Do not use sprintf when its result might not fit
in 'int'.  Instead, put the possibly-long file name into the
output of pfatal_with_name.
2011-08-28 16:57:19 -07:00
Paul Eggert
9250f75825 * etags.c (xmalloc, xrealloc): Accept size_t, not unsigned int,
to avoid potential buffer overflow issues on typical 64-bit hosts.
(whatlen_max): New static var.
(main): Avoid buffer overflow if subsidiary command length is
greater than BUFSIZ or 2*BUFSIZ + 20. Do not use sprintf when its
result might not fit in 'int'.
2011-08-28 16:55:41 -07:00
Paul Eggert
17107bb698 Integer and memory overflow issues.
* emacsclient.c (xmalloc): Accept size_t, not unsigned int, to
avoid potential buffer overflow issues on typical 64-bit hosts.
Return void *, not long *.
(get_current_dir_name): Report a failure, instead of looping
forever, if buffer size calculation overflows.  Treat malloc
failures like realloc failures, as that has better behavior and is
more consistent.  Do not check whether xmalloc returns NULL, as
that's not possible.
(message): Do not arbitrarily truncate message to 2048 bytes when
sending it to stderr; use vfprintf instead.
(get_server_config, set_local_socket)
(start_daemon_and_retry_set_socket): Do not alloca
arbitrarily-large buffers; that's not safe.
(get_server_config, set_local_socket): Do not use sprintf when its
result might not fit in 'int'.
(set_local_socket): Do not assume uid fits in 'int'.
2011-08-28 16:52:34 -07:00
Paul Eggert
70c2e72ae5 Merge from trunk. 2011-07-28 09:27:30 -07:00
Paul Eggert
044c22e545 Merge: Integer signedness and overflow and related fixes.
Fixes: debbugs:9079
2011-07-27 17:48:01 -07:00
Paul Eggert
abec06ffd2 Add Bug#. 2011-07-25 10:15:08 -07:00