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.3 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.3 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.3 From 5eba16a37cacff2065186df8cb6153ccaebae298 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 14 Jul 2011 03:09:00 +0200 Subject: Fix typos. --- admin/charsets/mule-charsets.el | 2 +- lisp/ChangeLog | 6 ++++++ lisp/ChangeLog.6 | 2 +- lisp/emacs-lisp/testcover.el | 2 +- lisp/follow.el | 46 ++++++++++++++++++++--------------------- lisp/gnus/ChangeLog.2 | 2 +- lisp/jka-cmpr-hook.el | 2 +- lisp/winner.el | 2 +- src/ChangeLog.6 | 2 +- test/eshell.el | 2 +- 10 files changed, 37 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el index 59969c3df28..9ac08bef724 100644 --- a/admin/charsets/mule-charsets.el +++ b/admin/charsets/mule-charsets.el @@ -1,4 +1,4 @@ -;; mule-charsets.el -- Generate Mule-orignal charset maps. +;; mule-charsets.el -- Generate Mule-original charset maps. ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b78a6a4c580..4aa24d499e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-07-14 Juanma Barranquero + + * follow.el (follow-debug-message, follow-redisplay): + * jka-cmpr-hook.el (with-auto-compression-mode): + Fix typos in docstrings. + 2011-07-13 Lars Magne Ingebrigtsen * subr.el (with-silent-modifications): Clarify somewhat what the diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 2f73c290231..7ba9261ccf0 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -6892,7 +6892,7 @@ (find-file-noselect): Use it if new optional argument `rawfile' is non-nil. - * startup.el (command-line-1): Add option --eval to evalute an + * startup.el (command-line-1): Add option --eval to evaluate an expression on the command line and print the result. 1995-08-14 Richard Stallman diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index 2f168180cf6..4c83e7e2e0d 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -28,7 +28,7 @@ ;; * Use `testcover-mark-all' to add overlay "splotches" to the Lisp file's ;; buffer to show where coverage is lacking. Normally, a red splotch ;; indicates the form was never evaluated; a brown splotch means it always -;; evaluted to the same value. +;; evaluated to the same value. ;; * Use `testcover-next-mark' (bind it to a key!) to jump to the next spot ;; that has a splotch. diff --git a/lisp/follow.el b/lisp/follow.el index 9bf472e547c..94a542f1016 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -118,7 +118,7 @@ ;; (setq pixel-vertical-clip-threshold 30) -;; The correct way to cofigurate Follow mode, or any other mode for +;; The correct way to configurate Follow mode, or any other mode for ;; that matter, is to create one or more functions that do ;; whatever you would like to do. These functions are then added to ;; a hook. @@ -189,7 +189,7 @@ ;; positions in the text? Here are two simple methods to use: ;; ;; 1) Use multiple frames; `follow' mode only affects windows displayed -;; in the same frame. (My apoligies to you who can't use frames.) +;; in the same frame. (My apologies to you who can't use frames.) ;; ;; 2) Bind `follow-mode' to key so you can turn it off whenever ;; you want to view two locations. Of course, `follow' mode can @@ -209,15 +209,15 @@ ;; ;; Follow mode does this in three places: ;; 1) After each user command. -;; 2) After a process output has been perfomed. +;; 2) After a process output has been performed. ;; 3) When a scrollbar has been moved. ;; ;; This will cover most situations. (Let me know if there are other ;; situations that should be covered.) ;; ;; Note that only the selected window is checked, for the reason of -;; efficiency and code complexity. (I.e. it is possible to make a -;; non-selected windows unaligned. It will, however, pop right back +;; efficiency and code complexity. (I.e. it is possible to make a +;; non-selected window unaligned. It will, however, pop right back ;; when it is selected.) ;;}}} @@ -244,7 +244,7 @@ ;; (funcall (symbol-function 'set) 'bar ...) ;; ;; Note: When this file is interpreted, `eval-when-compile' is -;; evaluted. Since it doesn't hurt to evaluate it, but it is a bit +;; evaluated. Since it doesn't hurt to evaluate it, but it is a bit ;; annoying, we test if the byte-compiler has been loaded. This can, ;; of course, lead to some occasional unintended evaluation... ;; @@ -456,7 +456,7 @@ Used by `follow-window-size-change'.") ;; the variable is not set. (defsubst follow-debug-message (&rest args) - "Like message, but only active when `follow-debug' is non-nil." + "Like `message', but only active when `follow-debug' is non-nil." (if (and (boundp 'follow-debug) follow-debug) (apply 'message args))) @@ -1000,7 +1000,7 @@ Note that this handles the case when the cache has been set to nil." res)) -;; Make sure WIN always starts at the beginning of an whole screen +;; Make sure WIN always starts at the beginning of a whole screen ;; line. If WIN is not aligned the start is updated which probably ;; will lead to a redisplay of the screen later on. ;; @@ -1057,8 +1057,8 @@ Return the selected window." win)) -;; Lets select a window showing the end. Make sure we only select it if it -;; it wasn't just moved here. (i.e. M-> shall not unconditionally place +;; Lets select a window showing the end. Make sure we only select it if +;; it wasn't just moved here. (I.e. M-> shall not unconditionally place ;; the point in the selected window.) ;; ;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max'; @@ -1134,7 +1134,7 @@ Otherwise, return nil." "Reposition the WINDOWS around WIN. Should the point be too close to the roof we redisplay everything from the top. WINDOWS should contain a list of windows to -redisplay, it is assumed that WIN is a member of the list. +redisplay; it is assumed that WIN is a member of the list. Should WINDOWS be nil, the windows displaying the same buffer as WIN, in the current frame, are used. Should WIN be nil, the selected window is used. @@ -1231,7 +1231,7 @@ should be a member of WINDOWS, starts at position START." (setq done t res (point))) ((= win-start start) ; Perfect match, use this value (setq done t res (point))) - ((< win-start start) ; Walked to far, use preious result + ((< win-start start) ; Walked to far, use previous result (setq done t)) (t ; Store result for next iteration (setq res (point)))))) @@ -1241,12 +1241,12 @@ should be a member of WINDOWS, starts at position START." ;;{{{ Avoid tail recenter ;; This sets the window internal flag `force_start'. The effect is that -;; windows only displaying the tail isn't recentered. +;; windows only displaying the tail aren't recentered. ;; Has to be called before every redisplay... (Great isn't it?) ;; ;; XEmacs doesn't recenter the tail, GOOD! ;; -;; A window displaying only the tail, is a windows whose +;; A window displaying only the tail, is a window whose ;; window-start position is equal to (point-max) of the buffer it ;; displays. ;; @@ -1487,12 +1487,12 @@ non-first windows in Follow mode." ;;;; Scroll-bar support code. ;; Why is it needed? Well, if the selected window is in follow mode, -;; all its follower stick to it blindly. If one of them is scrolled, +;; all its followers stick to it blindly. If one of them is scrolled, ;; it immediately returns to the original position when the mouse is ;; released. If the selected window is not a follower of the dragged ;; window the windows will be unaligned. -;; The advices doesn't get compiled. Aestetically, this might be a +;; The advices don't get compiled. Aesthetically, this might be a ;; problem but in practical life it isn't. ;; Discussion: Now when the other windows in the chain follow the @@ -1700,8 +1700,8 @@ magic stuff before the real process filter is called." ;;}}} ;;{{{ Start/stop interception of processes. -;; Normally, all new processed are intercepted by our `set-process-filter'. -;; This is needed to intercept old processed that were started before we were +;; Normally, all new processes are intercepted by our `set-process-filter'. +;; This is needed to intercept old processes that were started before we were ;; loaded, and processes we have forgotten by calling ;; `follow-stop-intercept-process-output'. @@ -1749,7 +1749,7 @@ report this using the `report-emacs-bug' function." ;; The following section is a naive method to make buffers with ;; process output to work with Follow mode. Whenever the start of the -;; window displaying the buffer is moved, we moves it back to its +;; window displaying the buffer is moved, we move it back to its ;; original position and try to select a new window. (If we fail, ;; the normal redisplay functions of Emacs will scroll it right ;; back!) @@ -1767,7 +1767,7 @@ report this using the `report-emacs-bug' function." ;; If input is pending, the `sit-for' below won't redraw the ;; display. In that case, calling `follow-avoid-tail-recenter' may - ;; provoke the process hadnling code to sceduling a redisplay. + ;; provoke the process handling code to schedule a redisplay. ;(or (input-pending-p) ; (follow-avoid-tail-recenter)) @@ -1788,7 +1788,7 @@ report this using the `report-emacs-bug' function." (inhibit-read-only t)) (save-excursion (goto-char (process-mark proc)) - ;; `insert-before-markers' just in case the users next + ;; `insert-before-markers' just in case the user's next ;; command is M-y. (insert-before-markers output) (set-marker (process-mark proc) (point))) @@ -1848,7 +1848,7 @@ report this using the `report-emacs-bug' function." (t (follow-debug-message "filter: nothing"))) - ;; Here we have slected a window. Make sure the + ;; Here we have selected a window. Make sure the ;; windows are aligned and the point is visible ;; in the selected window. (if (and (not (follow-pos-visible @@ -1866,7 +1866,7 @@ report this using the `report-emacs-bug' function." ;; return to the original window. (if return-to-orig-win (select-window orig-win)) - ;; Restore the orignal buffer, unless the filter explicitly + ;; Restore the original buffer, unless the filter explicitly ;; changed buffer or killed the old buffer. (if (and (eq buf (current-buffer)) (buffer-name old-buffer)) diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 4882032f284..779c84296f4 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -9243,7 +9243,7 @@ (nnmaildir--with-nntp-buffer, nnmaildir--with-work-buffer, nnmaildir--with-nov-buffer, nnmaildir--with-move-buffer, nnmaildir--group-ls): New macros/functions. Use them. - (nnmaildir--unlink): Evalutate argument only once. + (nnmaildir--unlink): Evaluate argument only once. 2002-03-27 Jesper Harder diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index fda9804bbb8..e1cf2a661ed 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -340,7 +340,7 @@ Return the new status of auto compression (non-nil means on)." (t (jka-compr-uninstall))))) (defmacro with-auto-compression-mode (&rest body) - "Evalute BODY with automatic file compression and uncompression enabled." + "Evaluate BODY with automatic file compression and uncompression enabled." (declare (indent 0)) (let ((already-installed (make-symbol "already-installed"))) `(let ((,already-installed (jka-compr-installed-p))) diff --git a/lisp/winner.el b/lisp/winner.el index e5855ad8aac..70038362c2e 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -145,7 +145,7 @@ You may want to include buffer names such as *Help*, *Apropos*, ;;; Saved configurations -;; This variable contains the window cofiguration rings. +;; This variable contains the window configuration rings. ;; The key in this alist is the frame. (defvar winner-ring-alist nil) 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 diff --git a/test/eshell.el b/test/eshell.el index 3b392e84c24..8a9e62a759a 100644 --- a/test/eshell.el +++ b/test/eshell.el @@ -396,7 +396,7 @@ (eshell-command-result-p "+ ${+ 1 2} 3" "6\n")) (eshell-deftest var interp-lisp - "Interpolate Lisp form evalution" + "Interpolate Lisp form evaluation" (eshell-command-result-p "+ $(+ 1 2) 3" "6\n")) (eshell-deftest var interp-concat -- cgit v1.3