1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 22:20:52 -08:00
Commit graph

36573 commits

Author SHA1 Message Date
Chris Zheng
38aaf904c7 Fix gnutls.c build on MinGW
Fixes: debbugs:19231

* gnutls.c (init_gnutls_functions, gnutls_certificate_details):
Use gnutls_sign_get_name directly because
gnutls_sign_algorithm_get_name is a macro on MinGW.
(init_gnutls_functions): Load missing gnutls_server_name_set.
2014-12-03 15:40:18 +01:00
Eli Zaretskii
dd601050e7 Allow to search for characters whose bidi directionality was overridden.
src/bidi.c (bidi_find_first_overridden): New function.
 src/xdisp.c (Fbidi_find_overridden_directionality): New function.
 (syms_of_xdisp): Defsubr it.
 src/dispextern.h (bidi_find_first_overridden): Add prototype.

 doc/lispref/display.texi (Bidirectional Display): Document
 'bidi-find-overridden-directionality'.

 etc/NEWS: Mention 'bidi-find-overridden-directionality'.
2014-12-02 16:13:47 +02:00
Jan Djärv
a92789b1fc Fixes: debbugs:9133
* nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep
to nil after release.
2014-12-02 14:30:47 +01:00
Paul Eggert
3517da701e Port better to AddressSanitizer.
These changes suffice for temacs on x86-64 with GCC 4.9.2 and
-fsanitize=address.
* alloc.c (valid_pointer_p) [ADDRESS_SANITIZER]:
Return -1 or 0, as the pipe trick doesn't work.
* alloc.c (relocatable_string_data_p, mark_object, sweep_symbols):
* data.c (Ffset):
* print.c (print_object):
When a pointer-check primitive returns -1, do not assume this
means the pointer is valid or that the underlying system has failed.
It could just be that addresses are being sanitized so Emacs can't
test for pointer validity.
* lisp.h (defined_GC_CHECK_STRING_BYTES): New constant.
(USE_STACK_STRING) [GC_CHECK_STRING_BYTES]: Now false, since the
string validity checker doesn't work on stack-based strings.
2014-11-29 23:32:29 -08:00
Glenn Morris
aa1459ae2a Fix up merged ChangeLog entries (dates, duplication, etc) 2014-11-29 13:25:50 -08:00
Paul Eggert
366c1ceb03 Improve clarity of USE_LSB_TAG definition.
Problem reported by Lee Duhem.  Suggestion by Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html
* lisp.h (USE_LSB_TAG): Define in terms of the (simpler)
VAL_MAX / 2 rather than in terms of the (more complicated)
EMACS_INT_MAX >> GCTYPEBITS, and adjust commentary to match.
2014-11-28 23:39:06 -08:00
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -08:00
Eli Zaretskii
6b765b8fac Fix bug #19201 with after-strings not being displayed.
src/xdisp.c (handle_single_display_spec): When ignoring a fringe
 bitmap display, reset the ignore_overlay_strings_at_pos_p flag.
 (next_element_from_buffer): When done with overlays, reset the
 ignore_overlay_strings_at_pos_p flag.
2014-11-27 18:35:27 +02:00
Oscar Fuentes
1ed5c2d9bc Replace uses of _W64 with MINGW_W64
This is the `master' branch follow-up to the change made previously on
the emacs-24 branch (81e0cca7bb).

    * src/w32.c: Use MINGW_W64 instead of _W64.

    * src/w32heap.c: Likewise.
2014-11-27 04:03:07 +01:00
Ted Zlatanov
ba4502fe14 Merge branch 'emacs-24'
Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c
2014-11-26 21:31:11 -05:00
Lars Magne Ingebrigtsen
fc4d2c7784 Only send SNI if the host name is not an IP address
* gnutls.c (gnutls_ip_address_p): New function.
(Fgnutls_boot): Only send SNI if the host name is not an IP address.
2014-11-26 23:11:57 +01:00
Toke Høiland-Jørgensen
ccae04f205 * gnutls.c (Fgnutls_boot): Send the server name over
Fixes: debbugs:18208

* gnutls.c (Fgnutls_boot): Send the server name over (bug#18208).
2014-11-26 22:56:57 +01:00
Paul Eggert
92f6486a11 Fix gnutls problems caught by static checking.
* gnutls.c (Fgnutls_boot): Remove unused local.
(Fgnutls_boot): Fix pointer signedness.
2014-11-25 09:23:33 -08:00
Paul Eggert
50cc807377 Use usual GNU style for white space. 2014-11-25 09:23:33 -08:00
Eli Zaretskii
73cad916c8 Fix bug #19141 with UNCs in w32-shell-execute.
src/w32fns.c (Fw32_shell_execute): Convert forward slashes in
 DOCUMENT to backslashes, if DOCUMENT is a file.
2014-11-25 19:04:14 +02:00
Lars Magne Ingebrigtsen
88871ef611 (gnutls_certificate_details): Reversed check in last checkin. 2014-11-25 16:13:10 +01:00
Lars Magne Ingebrigtsen
d3739fec53 Make gnutls.c compile on older gnutls installations
* gnutls.c (gnutls_certificate_details): Don't include certain
certificate details on older gnutls versions (bug#19168).
(syms_of_gnutls): Export gnutls_peer_status_warning_describe.
2014-11-25 16:04:47 +01:00
Ted Zlatanov
2428e38d76 * gnutls.c (Fgnutls_boot): Minor logging fixes. 2014-11-25 09:48:37 -05:00
Ted Zlatanov
8608c1009d Use a simple list of symbols in GnuTLS peer verification.
* gnutls.c (Fgnutls_peer_status_warning_describe): Add function to describe a
peer verification warning symbol.
(Fgnutls_peer_status): Use it.
(Fgnutls_boot): Use it.
2014-11-25 09:07:13 -05:00
Ted Zlatanov
10f2f8aafa * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p. 2014-11-25 05:15:23 -05:00
Ulrich Müller
ed54567c7c Use consistent paxctl and setfattr flags for temacs.
* Makefile.in (temacs$(EXEEXT)): Use consistent flag settings
for paxctl and setfattr. Fixes temacs startup failure with
grsecurity/PaX enabled Linux kernel (bug#19067).
2014-11-25 07:47:11 +01:00
Paul Eggert
f24c8f98ec Fix white-space problems in ChangeLogs. 2014-11-24 17:16:27 -08:00
Lars Magne Ingebrigtsen
d71a2d495f * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. 2014-11-24 15:42:34 +01:00
Glenn Morris
3e3b940fc1 * src/keyboard.c: Fix comment typo. 2014-11-23 23:49:39 -08:00
Glenn Morris
e01ec2ed08 * src/emacs.c (main) <--version>: Make use of PACKAGE_NAME. 2014-11-23 17:11:51 -08:00
Glenn Morris
825351bcce Reduce nt and src Makefile duplication wrt emacs.res
* nt/Makefile.in (../src/emacs.res): New target.

* src/Makefile.in (emacs.res): Use ../nt rule, rather than duplicating it.
(ntsource, WINDRES, EMACS_MANIFEST): Remove, now unused.
2014-11-23 16:16:57 -08:00
Lars Magne Ingebrigtsen
8c4475f9ce * gnutls.c: Fix Windows function definition of gnutls_x509_crt_get_fingerprint. 2014-11-23 23:55:58 +01:00
Lars Magne Ingebrigtsen
1653296fa2 Typo fix from previous check-in 2014-11-23 23:09:00 +01:00
Lars Magne Ingebrigtsen
1aafa6b682 gnutls.c windows compilation fix
* gnutls.c: Fixed Windows function definition of
gnutls_x509_crt_get_fingerprint.
2014-11-23 23:06:17 +01:00
Lars Magne Ingebrigtsen
a85950469e Add functions to gnutls.c for exporting certificate details
* gnutls.c (gnutls_hex_string, gnutls_certificate_details)
(Fgnutls_peer_status): New functions to export TLS certificate
details to Emacs Lisp.

* process.h: Added more fields to Lisp_Process to track
certificate details.

* gnutls.c (Fgnutls_boot): Save certificate for later inspection.
2014-11-23 14:52:04 +01:00
Jan D
0b1d7cd596 Fixes: debbugs:19149
* gtkutil.c (gtk_adjustment_configure): Don't use 2.14 functions (Bug#19149).
2014-11-23 14:30:52 +01:00
Jan D
4ad0a30855 Fixes: debbugs:19149
* gtkutil.c (gtk_adjustment_configure): Define for Gtk+ < 2.14.
(xg_set_toolkit_horizontal_scroll_bar_thumb): Remove wrong version
check for gtk_adjustment_configure (Bug#19149).
2014-11-23 11:57:19 +01:00
Glenn Morris
84e2f13cd5 Further reduce number of versioned files storing Emacs version number.
* configure.ac (comma_version, comma_space_version) [mingw32]:
New output variables.
(nt/emacs.rc, nt/emacsclient.rc) [mingw32]: New output files.

* make-dist: Update nt/ for *.rc -> *.rc.in changes.

* nt/emacs.rc.in, nt/emacsclient.rc.in: Rename from nt/emacs.rc, emacsclient.rc.
Let configure generate the real files, and set the version numbers.

* lib-src/Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc
now being in the build directory, not the source directory.

* nt/Makefile.in (distclean): Delete *.rc.
(emacs.res): Update deps for nt/emacsclient.rc now being in the
build directory, not the source directory.

* admin/admin.el (set-version): No more need to update nt/*.rc.

* admin/authors.el (authors-renamed-files-alist): Add .rc.in files.
2014-11-22 14:07:48 -08:00
Glenn Morris
d00c866167 * src/Makefile.in (emacs.res): Add dependency on icons/hand.cur. Use $<. 2014-11-22 13:40:25 -08:00
“Martin
db67afbd8c Don't shrink frame when using desktop-save-mode (Bug#19048).
* w32fns.c (x_set_tool_bar_lines): Always call
x_change_tool_bar_height (Bug#19048).
(x_change_tool_bar_height): Mark frame as garbaged since
adjust_frame_size might not have done that.
* xfns.c (x_set_tool_bar_lines): Always call
x_change_tool_bar_height (Bug#19048).
(x_change_tool_bar_height): Mark frame as garbaged since
adjust_frame_size might not have done that.
2014-11-22 17:59:59 +01:00
Ulf Jasper
c39443c1d6 'libxml-parse(html|xml)-region': new optional param 'discard-comments'.
* doc/lispref/text.texi (Parsing HTML/XML): Document new optional parameter
'discard-comments' of 'libxml-parse(html|xml)-region'.

* src/xml.c (parse_region): Take care of new optional parameter
'discard-comments' of 'libxml-parse(html|xml)-region'.
(Flibxml_parse_html_region, Flibxml_parse_xml_region): New
optional parameter 'discard-comments'.

* test/automated/libxml-tests.el
(libxml-tests--data-comments-preserved): Renamed from
'libxml-tests--data'.
(libxml-tests--data-comments-discarded): New.
(libxml-tests): Check whether 'libxml-parse-xml-region' is
discarding comments correctly.
2014-11-21 16:31:30 +01:00
Paul Eggert
342bc0e04b .gitignore cleanup.
* .gitignore: Merge contents of subsidiary files and organize the
result so as to avoid duplication.  Remove no-longer needed entries.
* admin/charsets/.gitignore, admin/unidata/.gitignore:
* doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
* leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
* lisp/calc/.gitignore, lisp/calendar/.gitignore:
* lisp/cedet/.gitignore, lisp/emulation/.gitignore:
* lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
* lisp/international/.gitignore, lisp/language/.gitignore:
* lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
* lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
* lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
* lisp/play/.gitignore, lisp/progmodes/.gitignore:
* lisp/term/.gitignore, lisp/textmodes/.gitignore:
* lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
Remove; no longer needed.
2014-11-17 17:58:28 -08:00
Oscar Fuentes
81e0cca7bb Define MINGW_W64 and use it instead of _W64
... for detecting MinGW-w64. _W64 is not specific of MinGW-w64, it is
defined for compatibility with MS VC++.

	* nt/inc/ms-w32.h: Define MINGW_W64.

	* admin/CPP-DEFINES: Mention MINGW_W64.

	* nt/addpm.c: Use it.

	* nt/addsection.c: Use it.

	* nt/preprep.c: Use it.

	* src/w32.c: Use MINGW_W64 instead of _W64

	* src/w32term.c: Likewise.
2014-11-17 23:10:00 +01:00
Paul Eggert
1c7b6b3e0a Spelling fixes. 2014-11-16 22:27:36 -08:00
Paul Eggert
0921dbc3ab Improve time stamp handling, and be more consistent about it.
This implements a suggestion made in:
http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00587.html
Among other things, this means timer.el no longer needs to
autoload the time-date module.
* doc/lispref/os.texi (Time of Day, Time Conversion, Time Parsing)
(Processor Run Time, Time Calculations):
Document the new behavior, plus be clearer about the old behavior.
(Idle Timers): Take advantage of new functionality.
* etc/NEWS: Document the changes.
* lisp/allout-widgets.el (allout-elapsed-time-seconds): Doc fix.
* lisp/arc-mode.el (archive-ar-summarize):
* lisp/calendar/time-date.el (seconds-to-time, days-to-time, time-since):
* lisp/emacs-lisp/timer.el (timer-relative-time, timer-event-handler)
(run-at-time, with-timeout-suspend, with-timeout-unsuspend):
* lisp/net/tramp.el (tramp-time-less-p, tramp-time-subtract):
* lisp/proced.el (proced-time-lessp):
* lisp/timezone.el (timezone-time-from-absolute):
* lisp/type-break.el (type-break-schedule, type-break-time-sum):
Simplify by using new functionality.
* lisp/calendar/cal-dst.el (calendar-next-time-zone-transition):
Do not return time values in obsolete and undocumented (HI . LO)
format; use (HI LO) instead.
* lisp/calendar/time-date.el (with-decoded-time-value):
Treat 'nil' as current time.  This is mostly for XEmacs.
(encode-time-value, with-decoded-time-value): Obsolete.
(time-add, time-subtract, time-less-p): Use no-op autoloads, for
XEmacs.  Define only if XEmacs, as they're now C builtins in Emacs.
* lisp/ldefs-boot.el: Update to match new time-date.el
* lisp/proced.el: Do not require time-date.
* src/editfns.c (invalid_time): New function.
Use it instead of 'error ("Invalid time specification")'.
(time_add, time_subtract, time_arith, Ftime_add, Ftime_less_p)
(decode_float_time, lisp_to_timespec, lisp_time_struct):
New functions.
(make_time_tail, make_time): Remove.  All uses changed to use
new functions or plain list4i.
(disassemble_lisp_time): Return effective length if successful.
Check that LOW is an integer, if it's combined with other components.
(decode_time_components): Decode into struct lisp_time, not
struct timespec, so that we can support a wide set of times
regardless of whether time_t is signed.  Decode plain numbers
as seconds since the Epoch, and nil as the current time.
(lisp_time_argument, lisp_seconds_argument, Ffloat_time):
Reimplement in terms of new functions.
(Fencode_time): Just use list2i.
(syms_of_editfns): Add time-add, time-subtract, time-less-p.
* src/keyboard.c (decode_timer): Don't allow the new formats (floating
point or nil) in timers.
* src/systime.h (LO_TIME_BITS): New constant.  Use it everywhere in
place of the magic number '16'.
(struct lisp_time): New type.
(decode_time_components): Use it.
(lisp_to_timespec): New decl.
2014-11-16 20:41:22 -08:00
Lars Magne Ingebrigtsen
d1b04a9e7a Implement an `inhibit-read-only' text property
* doc/lispref/text.texi (Special Properties): Mention `inhibit-read-only'.

* src/buffer.c (Fbarf_if_buffer_read_only): Don't raise an error if
the text at POSITION (new optional argument) has the
`inhibit-read-only' text property set.

* src/callint.c (Fcall_interactively): Pass in nil as argument to
Fbarf_if_buffer_read_only.

* src/fileio.c (Finsert_file_contents): Ditto.

* src/insdel.c (prepare_to_modify_buffer_1): Pass start region in.

* src/intervals.h (INTERVAL_WRITABLE_P): Check the `inhibit-read-only'
text property.

* src/textprop.c (verify_interval_modification): Check buffer
readedness after the last interval.
2014-11-16 23:41:55 +01:00
Stefan Monnier
8679082639 * src/frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).
* lisp/window.el (handle-select-window): Deactivate shift-region.
2014-11-16 00:30:12 -05:00
Stefan Monnier
9075fcc193 Merge from emacs-24 2014-11-16 00:22:20 -05:00
Jan D
a6b42789b5 Backport: Fix for 18993.
* nsterm.m (ns_send_appdefined): Check for application defined
event on Cocoa (Bug#18993).  Backport from trunk.
2014-11-15 19:20:37 +01:00
Jan D
0d9bf9725a Redo the fix, the old takes too much CPU.
Fixes: 18993

* nsterm.m (ns_send_appdefined): Check for application defined
event on Cocoa (Bug#18993).
(run): Restore code before the previous 18993 fix.
2014-11-15 19:09:58 +01:00
Eli Zaretskii
1fb97e79d2 Fix bug #19060 with inaccurate pixel-based scrolling.
src/window.c (window_scroll_pixel_based): Avoid truncation/rounding
 errors in computing the number of pixels to scroll.  Suggested by
 Kelly Dean <kelly@prtime.org>.
2014-11-15 19:04:17 +02:00
Jan D
b8c9a4e36d Fix getting frame size wrong when restoring desktop.
* nsmenu.m (update_frame_tool_bar): If tool bar changes height,
call updateFrameSize.
2014-11-15 14:35:15 +01:00
Jan D
836c444db7 Fixes: 18757
* nsterm.m (setFrame:): Remove call to display (Bug#18757).
2014-11-15 13:39:30 +01:00
Eli Zaretskii
71e866c066 src/window.h (WINDOW_FRAME_LINE_HEIGHT): Fix a typo in a comment.
Reported by Kelly Dean <kelly@prtime.org>.
2014-11-15 11:25:16 +02:00
David Reitter
658b768a65 Time-out NS event loop
OS X 10.10 will, at times, not send us the application-defined
event that is used to terminate the event loop.  As a workaround,
we define a timeout and react accordingly.  Leaving it in place
for other OSX and NS versions as a safety net.

Partial revert of 2014-11-08T16:32:37Z!jan.h.d@swipnet.se.

Fixes debbugs:18993
2014-11-14 18:07:31 -05:00