Lars Magne Ingebrigtsen
4b2d9ec263
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
2010-10-18 22:32:54 +02:00
Eli Zaretskii
c3911ead5d
Fix the MSDOS build broken by latest revisions.
...
src/unexcoff.c (make_hdr): Fix prototype according to changes in
2010-10-03T13:59:56Z!dann@ics.uci.edu.
msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed
because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.
2010-10-15 20:42:54 +02:00
Eli Zaretskii
9cf66cf2ea
image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
2010-10-15 12:10:20 +02:00
Tassilo Horn
cc98b2563e
Again, fix a typo in really-oldXMenu target
2010-10-15 09:46:47 +02:00
Tassilo Horn
be98da0525
Fix variable name typo in really-oldXMenu target.
2010-10-15 09:34:26 +02:00
Juanma Barranquero
220d91b834
Merge changes from emacs-23 branch.
2010-10-14 16:32:27 +02:00
Juanma Barranquero
9d4f32e88a
src/w32*.c: Whitespace fixes and typos.
2010-10-14 14:25:35 +02:00
Juanma Barranquero
24f981c9f4
src/w32*.c: Make functions static.
...
* src/w32fns.c (w32_wnd_proc, file_dialog_callback):
* src/w32font.c (w32_generic_family):
* src/w32inevt.c (key_event):
* src/w32menu.c (fill_in_menu):
* src/w32proc.c (reader_thread, w32_executable_type, compare_env)
(merge_and_sort_env, int_from_hex, enum_locale_fn, enum_codepage_fn):
* src/w32term.c (w32_read_socket): Make static.
2010-10-14 03:33:31 +02:00
Juanma Barranquero
850690ccf5
src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
2010-10-14 01:48:09 +02:00
Juanma Barranquero
5e371708c2
src/makefile.w32-in: Simplify OBJ macros.
...
* makefile.w32-in (TLIB2): Rename from TLIBW32.
(OBJ2): New macro.
(WIN32OBJ, FONTOBJ): Remove.
(OBJ1): Redistribute object files with OBJ2.
(LIBS, $(TEMACS)): Use TLIB2.
(make-buildobj-CMD, make-buildobj-SH): Use OBJ2.
($(TLIB2), TAGS, TAGS-LISP, TAGS-gmake): Depend on OBJ2.
2010-10-14 01:08:58 +02:00
Juanma Barranquero
2e288d54f0
Rename image-library-alist' to dynamic-library-alist'.
...
* etc/NEWS: Mention `dynamic-library-alist'.
* lisp/image.el (image-library-alist): Declare as obsolete alias.
(image-type-available-p): Use `dynamic-library-alist'.
* lisp/term/w32-win.el (dynamic-library-alist):
Use instead of `image-library-alist'.
* nt/INSTALL: Refer to `dynamic-library-alist'.
* src/image.c (Vimage_library_alist)
(syms_of_image) <image-library-alist>: Move to src/emacs.c and rename.
(lookup_image_type): Use Vdynamic_library_alist.
(Finit_image_library): Doc fix.
* src/emacs.c (Vdynamic_library_alist)
(syms_of_emacs) <dynamic-library-alist>: Move from src/image.c and rename.
Doc fix.
* src/lisp.h (Vdynamic_library_alist): Declare extern.
2010-10-13 16:50:06 +02:00
Damyan Pepper
9fa828240d
Fix handling of font properties on Windows (bug#6303).
...
* src/font.c (font_filter_properties): New function, refactored from
ftfont_filter_properties.
* src/font.h (font_filter_properties): Declare.
* src/ftfont.c (ftfont_filter_properties): Use font_filter_properties.
* src/w32font.c (w32font_booleans, w32font_non_booleans): New variables.
(w32font_filter_properties): New function.
(w32font_driver): Add w32font_filter_properties.
2010-10-13 16:07:28 +02:00
Juanma Barranquero
c0943d3db2
Fix typos in docstrings, comments and ChangeLogs.
...
* etc/tutorials/TUTORIAL.es: Fix typos.
* lisp/cedet/semantic/symref/list.el (semantic-symref-list-rename-open-hits):
Fix typo in message.
(semantic-symref-list-map-open-hits): Fix typo in docstring.
* lisp/erc/erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring.
* lisp/international/mule.el (define-coding-system):
* lisp/international/titdic-cnv.el (quail-cxterm-package-ext-info):
* composite.el (compose-region): Fix typo in docstring.
* lisp/org/org-agenda.el (org-prefix-category-length)
(org-prefix-category-max-length): Fix typos in docstrings.
* src/font.c (Ffont_variation_glyphs):
* ccl.c (Fccl_execute_on_string): Fix typo in docstring.
2010-10-13 01:25:19 +02:00
Juanma Barranquero
51e4f4a88d
Fix typos in docstrings, comments and ChangeLogs.
...
* lisp/composite.el (compose-region):
* src/ccl.c (Fccl_execute_on_string): Fix typo in docstring.
2010-10-12 17:16:57 +02:00
Dan Nicolaescu
aba1381b22
Avoid using trailing / in directory variables.
...
* src/Makefile.in (lispsource, libsrc, etc, oldxmenudir, lwlibdir)
(lispdir): Remove trailing /, update all uses.
2010-10-12 07:37:33 -07:00
Kenichi Handa
ad1746f5db
Fix typos in comments
2010-10-12 21:52:05 +09:00
Juanma Barranquero
4c14013dbe
Merge changes from emacs-23 branch.
2010-10-12 01:57:49 +02:00
Jan Djärv
a2e35ef5d5
Bug#7150: Distinguishing between left and right Alt keys on NextStep/OSX.
...
* lisp/cus-start.el (all): ns-right-alternate-modifier is new.
* lisp/term/ns-win.el (ns-right-alternate-modifier): New defvar.
(ns-right-option-modifier): New alias for ns-right-alternate-modifier.
(mac-right-option-modifier): New alias for ns-right-option-modifier.
* src/nsterm.m (Qleft): Declare.
(ns_right_alternate_modifier): New variable
(NSRightAlternateKeyMask): New define.
(EV_MODIFIERS): Parse NSRightAlternateKeyMask if
ns_right_alternate_modifier isn't Qleft.
(keyDown): If ns_right_alternate_modifier isn't Qleft, use it
as emacs modifier for NSRightAlternateKeyMask.
(syms_of_nsterm): DEFVAR_LISP ns-right-alternate-modifier.
2010-10-11 21:18:08 +02:00
Lars Magne Ingebrigtsen
355cdaf37b
Fix gnutls write-before-negotiation case.
...
* gnutls.c (emacs_gnutls_write): If we're trying to write before
gnutls is ready, return EAGAIN as the errno.
2010-10-10 20:47:45 +02:00
Dan Nicolaescu
edfd76ce91
Remove #ifdef emacs / #ifndef emacs code, unused.
...
* src/vm-limit.c:
* src/unexhp9k800.c:
* src/unexelf.c:
* src/unexaix.c:
* src/termcap.c: Remove #ifdef emacs / #ifndef emacs code, unused.
2010-10-10 08:49:31 -07:00
Dan Nicolaescu
a4daeecfef
Pass CFLAGS to the linker.
...
* configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.
* lib-src/Makefile.in (PROFILING_LDFLAGS): Remove, not needed.
* msdos/sed1v2.inp (PROFILING_LDFLAGS):
* msdos/sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.
* src/Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
(PROFILING_LDFLAGS): Remove, not needed anymore.
2010-10-10 08:35:04 -07:00
Dan Nicolaescu
4cf3ad3065
* src/Makefile.in (CRT_DIR): Move near potential user.
...
(START_FILE): Move near CRT_DIR, it might use it.
2010-10-10 07:47:43 -07:00
Dan Nicolaescu
2cb72a7552
* src/Makefile.in: Use $(...) everywhere instead of ${...}
2010-10-10 07:43:05 -07:00
Dan Nicolaescu
4c62015720
Small sysdep.c cleanups.
...
* src/sysdep.c (LPASS8): Remove, unused.
(emacs_ospeed): Change from being a global to a local in the only
user: init_baud_rate.
2010-10-10 06:44:22 -07:00
Lars Magne Ingebrigtsen
bda6d2bd8f
Don't use foo() to talk about functions.
2010-10-09 16:31:56 +02:00
Lars Magne Ingebrigtsen
2e6c74c53f
(emacs_gnutls_write): Check for GNUTLS_E_AGAIN and not EINTR.
...
According to the documentation, this is correct, and it seems to
make things work.
2010-10-09 15:54:57 +02:00
Lars Magne Ingebrigtsen
b845653dc0
Make emacs_gnutls_read() return the expected on errors.
...
Also interface cleanups.
2010-10-09 15:19:30 +02:00
Chong Yidong
3625b3e282
* xterm.c (x_draw_relief_rect): Clear corner pixels.
2010-10-08 23:30:31 -04:00
Glenn Morris
613c83fc9f
Regenerate configure, src/config.in.
2010-10-08 18:59:50 -07:00
Michael Albinus
8b1c619f0b
* keyboard.c: Revert last change; it was not intended to be
...
synchronized with the trunk.
2010-10-08 14:41:49 +02:00
Michael Albinus
2e828c79a3
* dbusbind.c (xd_get_dispatch_status): Return a Lisp_Object.
...
(xd_pending_messages): Catch xd_get_dispatch_status calls.
2010-10-08 13:40:23 +02:00
Juanma Barranquero
4628bef1ee
Merge changes from emacs-23 branch.
2010-10-08 12:14:47 +02:00
Chong Yidong
389454fb57
* xterm.c (x_draw_relief_rect): If box width is larger than 1,
...
draw the outermost line using the black relief, for legibility.
Omit drawing the four corner pixels.
2010-10-08 01:02:56 -04:00
Glenn Morris
2b7c934285
ChangeLog fix.
2010-10-07 20:19:47 -07:00
Kenichi Handa
93d50df81d
coding.c (complement_process_encoding_system): Fix previous change.
2010-10-08 09:43:16 +09:00
Chong Yidong
51b403bdcb
Don't add an echo dash for the first keystroke (Bug#7137).
...
* src/keyboard.c (echo_prompt): Function moved into read_key_sequence.
(read_key_sequence): Inline echo_prompt.
(echo_dash): Add a dash only if key is continued (Bug#7137).
2010-10-04 14:16:22 -04:00
Dan Nicolaescu
3e6ae1a4ae
Remove O_RDONLY, O_WRONLY definitions, not needed.
...
* src/unexcoff.c:
* src/lread.c:
* src/fileio.c:
* src/doc.c:
* src/callproc.c:
* src/alloc.c:
* src/termcap.c: Remove O_RDONLY O_WRONLY definitions.
2010-10-04 10:22:57 -07:00
Kenichi Handa
ff06de4f50
merge emacs-23
2010-10-04 10:53:48 +09:00
Kenichi Handa
5886ec9c0c
coding.c (complement_process_encoding_system): Fix previous change.
2010-10-04 10:47:51 +09:00
Lars Magne Ingebrigtsen
c1ae068bbb
Rework the gnutls boot interface.
...
From Teodor Zlatanov.
2010-10-04 00:37:37 +02:00
Glenn Morris
e2afe435ea
* src/fileio.c (Vdirectory_sep_char): Remove.
2010-10-03 14:27:04 -07:00
Dan Nicolaescu
b5437a05ec
* src/termhooks.h: Remove #ifdef CONSP.
2010-10-03 09:21:55 -07:00
Dan Nicolaescu
4777478a50
* configure.in (NO_INLINE, noinline): Move here from src/xterm.c.
...
* src/xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in.
2010-10-03 08:39:21 -07:00
Dan Nicolaescu
a3d5088daa
Include <fcntl.h> unconditionally.
...
* src/termcap.c:
* src/sysdep.c:
* src/lread.c:
* src/keyboard.c:
* src/filelock.c:
* src/fileio.c:
* src/doc.c:
* src/callproc.c:
* src/alloc.c: Remove include guards for <fcntl.h>, process.c already
does it.
2010-10-03 08:19:34 -07:00
Dan Nicolaescu
8271973583
* src/process.c: Do not include <sys/wait.h>, syswait.h does it.
2010-10-03 07:48:21 -07:00
Dan Nicolaescu
9de940b59e
* src/sysdep.c (flush_pending_output): Remove code, does not do
...
anything on any platform.
2010-10-03 07:43:17 -07:00
Dan Nicolaescu
57507bf8b5
Remove unused code.
...
* src/sysdep.c (select_alarm, sys_select, read_input_waiting): Remove
select emulation, all systems support select.
(set_exclusive_use): Remove, the only user is in an #if 0 block.
* src/process.c (create_process): Remove #if 0 code.
2010-10-03 07:16:48 -07:00
Dan Nicolaescu
dd5ecd6bb5
Remove unused arguments for unexec.
...
The third one is never used, and the last two are always passed as zero.
* src/emacs.c (unexec): Add declaration.
(Fdump_emacs): Only pass the first two arguments to unexec.
Simplify #ifdef.
* src/unexw32.c (unexec):
* src/unexsol.c (unexec):
* src/unexhp9k800.c (unexec):
* src/unexcw.c (unexec): Remove the last 3 arguments, unused.
* src/unexelf.c (unexec): Remove the last 3 arguments, unused.
(find_section): Use const.
* src/unexmacosx.c (unexec): Remove the last 3 arguments, unused.
(unexec_error): Declare it NO_RETURN.
* src/unexcoff.c (make_hdr): Assume bss_start is always zero, remove
it as an argument, remove data_start and entry_address arguments, unused.
(unexec): Remove bss_start, data_start and
entry_address arguments.
* src/unexaix.c (make_hdr): Assume bss_start is always zero, remove
it as an argument, remove data_start and entry_address arguments, unused.
(unexec): Remove bss_start, data_start and
entry_address arguments.
2010-10-03 06:59:56 -07:00
Juanma Barranquero
e1b69165cc
src/gnutls.c: Fix typo in docstring.
2010-10-03 14:52:04 +02:00
Juanma Barranquero
7f467e1413
src/makefile.w32-in (TAGS, TAGS-LISP, TAGS-gmake): Add $(FONTOBJ).
2010-10-03 14:36:19 +02:00