1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Commit graph

36556 commits

Author SHA1 Message Date
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
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
Lars Magne Ingebrigtsen
d71a2d495f * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. 2014-11-24 15:42:34 +01: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
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
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
Paul Eggert
9bcde6cdca * .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1. 2014-11-14 12:25:10 -08:00
Dmitry Antipov
a5cbb7d9cc Attempt to allocate less font entity objects in xfont_list_pattern
* xfont.c (xfont_list_pattern): Do not allocate font entity object
for each candidate font but attempt to reuse it from previous improper
candidate, if any.
2014-11-14 13:40:24 +03:00
Jan Djärv
6688117e79 Fixes: 19036
* nsfns.m (x_set_foreground_color, x_set_background_color)
(x_set_cursor_color, Fxw_color_values): Block/unblock input,
use SET_FRAME_GARBAGED instead of redraw_frame (Bug#19036).
2014-11-14 08:41:53 +01:00
Paul Eggert
911ad4a15e Avoid undefined behavior in color table hashing.
* image.c (CT_HASH_RGB) [COLOR_TABLE_SUPPORT]: Remove, replacing with ...
(ct_hash_rgb) [COLOR_TABLE_SUPPORT]: New function.  All uses changed.
This function avoids undefined behavior with signed shift overflow.
2014-11-12 22:35:22 -08:00
Glenn Morris
c832df2ec2 Merge from emacs-24; up to 117698 2014-11-09 23:39:35 -08:00
Stefan Monnier
eca1ea9655 * lisp/help.el (view-lossage): Include the actual commands run.
* src/keyboard.c (command_loop_1): Record this-command in recent-keys.
(Frecent_keys): Rewrite. and add optional `include-cmds' arg.
2014-11-09 21:58:52 -05:00
Eli Zaretskii
ea75a0e069 Fix bug #18982 with assertion violations when reverting buffers.
src/fileio.c (Finsert_file_contents): Invalidate buffer caches also
 when the inserted text does not need decoding.
2014-11-09 18:40:43 +02:00
Eli Zaretskii
2ae1e0d427 Fix bug #18995 with compiling w32heap.c with -funroll-loops.
src/w32heap.c (allocate_heap): Set the lower limit of heap at 8MB.
2014-11-09 17:57:37 +02:00
Jan Djärv
d29658759a * nsterm.h (EmacsScroller): judge returns bool.
* nsterm.m (ns_set_vertical_scroll_bar): Release bar.
(ns_judge_scroll_bars): Only set removed if judge returns true.
(judge): Returns bool == condemned.  Remove self from window.
(setPosition:portion:whole:): Remove raise SIGIO.

Fixes: debbugs:18757
2014-11-09 14:47:02 +01:00
Jan Djärv
1af3b1135a Clean up merge error.
* nsterm.m (ns_set_vertical_scroll_bar)
(ns_set_horizontal_scroll_bar): Cleanup merge error.
2014-11-09 11:23:46 +01:00
Paul Eggert
f862694141 * xgselect.c (xg_select): Don't assume n_gfds is nonnegative
merely because tmo_in_millisec is nonnegative.  The 1st call
to g_main_context_query could succeed while the 2nd one fails.
2014-11-08 20:19:54 -08:00
Paul Eggert
0cd3403ff4 * frame.c (Fcan_run_window_configuration_change_hook): Return a value. 2014-11-08 20:04:12 -08:00
Glenn Morris
089c6aab18 Merge from emacs-24; up to 117689 2014-11-08 13:32:10 -08:00
Jan Djärv
d244e9bf03 * nsterm.m (ns_set_vertical_scroll_bar): Don't call bar setPosition: unless
needed (Bug#18757).

Fixes: debbugs:18993
2014-11-08 20:40:17 +01:00
Glenn Morris
416148257a Merge from emacs-24; up to 117687 2014-11-08 10:21:38 -08:00
Jan Djärv
86b1c771e1 Attempt to fix NS hang. Will probably cause merge conflicts.
* nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA.
(run): Ditto.  Only use non-system event loop if OSX version is
exactly 10.9.

Fixes: debbugs:18993
2014-11-08 17:32:37 +01:00
Martin Rudalics
c936cbbc83 Run `window-configuration-change-hook' only after all faces have been realized.
* frame.c (adjust_frame_size): Call x_set_window_size only if
f->can_x_set_window_size is set.
(make_frame): Initialize f->can_x_set_window_size and
f->can_run_window_configuration_change_hook.
(Fcan_run_window_configuration_change_hook): New function.
* frame.h (frame): Split `official' into `can_x_set_window_size'
and `can_run_window_configuration_change_hook'.
* nsfns.m (Fx_create_frame): Set f->can_x_set_window_size.
* w32fns.c (Fx_create_frame, x_create_tip_frame): Set
f->can_x_set_window_size.
* window.c (run_window_configuration_change_hook): Return
immediately if either f->can_x_set_window_size or
f->can_run_window_configuration_change_hook are false.
(Fset_window_configuration): Instead of f->official set
f->can_x_set_window_size.
* xfns.c (Fx_create_frame, x_create_tip_frame): Set
f->can_x_set_window_size.
* faces.el (face-set-after-frame-default): Enable running
`window-configuration-change-hook'.
2014-11-08 12:11:50 +01:00