From 0be0ce47418235badfb0ae9866da8523058310db Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 13 Jul 2011 00:09:28 -0400 Subject: src/buffer.c (mmap_find): Fix a typo. --- src/ChangeLog | 4 ++++ src/buffer.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 5bdc940a6f3..2721704223c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-07-13 Eli Zaretskii + + * buffer.c (mmap_find): Fix a typo. + 2011-07-13 Johan Bockgård Fix execution of x selection hooks. diff --git a/src/buffer.c b/src/buffer.c index 776888e30ac..81c537b9c6a 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4500,7 +4500,7 @@ mmap_init (void) is at END - 1. */ static struct mmap_region * -mmap_find (POINTER_TYPE *start, POINTER_TYPE *end); +mmap_find (POINTER_TYPE *start, POINTER_TYPE *end) { struct mmap_region *r; char *s = (char *) start, *e = (char *) end; -- cgit v1.2.1 From ac389d0c75f29a4c5bdf05c7180cabd96a7ae7e6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 13 Jul 2011 22:33:44 +0200 Subject: src/gnutls.c (init_gnutls_functions): Honor gnutls_log_level (bug#9059). --- src/ChangeLog | 14 +++++++++----- src/gnutls.c | 9 +++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 2721704223c..a045a7ddd21 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-07-13 Juanma Barranquero + + * gnutls.c (init_gnutls_functions): Honor gnutls_log_level (bug#9059). + 2011-07-13 Eli Zaretskii * buffer.c (mmap_find): Fix a typo. @@ -16,7 +20,7 @@ 2011-07-13 Paul Eggert - * buffer.c (Fget_buffer_create): Initialized inhibit_shrinking. + * buffer.c (Fget_buffer_create): Initialize inhibit_shrinking. The old code sometimes used this field without initializing it. * alloc.c (gc_sweep): Don't read past end of array. @@ -26,7 +30,7 @@ 2011-07-12 Andreas Schwab * character.c (Fcharacterp): Don't advertise optional ignored - argument. (Bug#4026) + argument. (Bug#4026) 2011-07-12 Lars Magne Ingebrigtsen @@ -240,7 +244,7 @@ (char_table_ascii): Uncompress the compressed values. (sub_char_table_ref): New arg is_uniprop. Callers changed. Uncompress the compressed values. - (sub_char_table_ref_and_range): Likewise. + (sub_char_table_ref_and_range): Likewise. (char_table_ref_and_range): Uncompress the compressed values. (sub_char_table_set): New arg is_uniprop. Callers changed. Uncompress the compressed values. @@ -1918,7 +1922,7 @@ (xpm_put_color_table_h): * lisp.h (struct Lisp_Hash_Table): * minibuf.c (Ftry_completion, Fall_completions, Ftest_completion): - * print.c (print): Use 'EMACS_UINT' and 'EMACS_INT' + * print.c (print): Use 'EMACS_UINT' and 'EMACS_INT' for hashes and hash indexes, instead of 'unsigned' and 'int'. * alloc.c (allocate_vectorlike): Check for overflow in vector size calculations. @@ -2215,7 +2219,7 @@ * dispnew.c (shift_glyph_matrix, scrolling_window): Mark scrolled row for fringe update if it has periodic bitmap. - (row_equal_p): Also compare left_fringe_offset, right_fringe_offset, + (row_equal_p): Also compare left_fringe_offset, right_fringe_offset, and fringe_bitmap_periodic_p. * fringe.c (get_fringe_bitmap_data): New function. diff --git a/src/gnutls.c b/src/gnutls.c index 76cfa5dcc98..3761951b866 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -143,10 +143,12 @@ static int init_gnutls_functions (Lisp_Object libraries) { HMODULE library; + Lisp_Object gnutls_log_level = Fsymbol_value (Qgnutls_log_level); + int max_log_level = 1; if (!(library = w32_delayed_load (libraries, Qgnutls_dll))) { - GNUTLS_LOG (1, 1, "GnuTLS library not found"); + GNUTLS_LOG (1, max_log_level, "GnuTLS library not found"); return 0; } @@ -189,7 +191,10 @@ init_gnutls_functions (Lisp_Object libraries) LOAD_GNUTLS_FN (library, gnutls_x509_crt_import); LOAD_GNUTLS_FN (library, gnutls_x509_crt_init); - GNUTLS_LOG2 (1, 1, "GnuTLS library loaded:", + if (NUMBERP (gnutls_log_level)) + max_log_level = XINT (gnutls_log_level); + + GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:", SDATA (Fget (Qgnutls_dll, QCloaded_from))); return 1; } -- cgit v1.2.1 From 837c31f8306d5e21689e325807ef2fff4e5bae9e Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 14 Jul 2011 01:48:35 +0200 Subject: Fstring_to_char doc clarification * editfns.c (Fstring_to_char): Clarify just what is returned (bug#6576). Text by Eli Zaretskii. --- src/ChangeLog | 5 +++++ src/editfns.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index a045a7ddd21..36a7539b888 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * editfns.c (Fstring_to_char): Clarify just what is returned + (bug#6576). Text by Eli Zaretskii. + 2011-07-13 Juanma Barranquero * gnutls.c (init_gnutls_functions): Honor gnutls_log_level (bug#9059). diff --git a/src/editfns.c b/src/editfns.c index bb36d0dee71..6df44352756 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -194,8 +194,12 @@ DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0, } DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0, - doc: /* Convert arg STRING to a character, the first character of that string. -A multibyte character is handled correctly. */) + doc: /* Return the first character in STRING. +A multibyte character is handled correctly. +The value returned is a Unicode codepoint if it is below #x110000 (in +hex). Codepoints beyond that are Emacs extensions of Unicode. In +particular, eight-bit characters are returned as codepoints in the +range #x3FFF80 through #x3FFFFF, inclusive. */) (register Lisp_Object string) { register Lisp_Object val; -- cgit v1.2.1 From 5eba16a37cacff2065186df8cb6153ccaebae298 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 14 Jul 2011 03:09:00 +0200 Subject: Fix typos. --- src/ChangeLog.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index d7903568102..f9372aa666a 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -4599,7 +4599,7 @@ 1995-08-14 Erik Naggum - * emacs.c (standard_args): Add option --eval to evalute an + * emacs.c (standard_args): Add option --eval to evaluate an expression on the command line and print the result. 1995-08-14 Richard Stallman -- cgit v1.2.1