diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2011-07-05 11:51:56 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2011-07-05 11:51:56 +0200 |
| commit | 9173deecd801321600a6c24186ce94147ae01753 (patch) | |
| tree | 8c0fe262af09cdb35848e2c3d5106ad4b7b86fe0 /src | |
| parent | 869795d6b510972d846183141885569ebf0c44f4 (diff) | |
| download | emacs-9173deecd801321600a6c24186ce94147ae01753.tar.gz | |
Fix typos.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/gnutls.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1cc0b5a4dc0..dc62da2035b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -173,7 +173,7 @@ with value as argument. (init_gsettings): Check that GSETTINGS_SCHEMA exists before calling g_settings_new (Bug#8967). Do not create gsettings_obj. - Remove calls to g_settings_bind. Connect something_changedCB to + Remove calls to g_settings_bind. Connect something_changedCB to "changed". * xgselect.c: Add defined (HAVE_GSETTINGS). @@ -270,8 +270,8 @@ min_width/height (Bug#8919). * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new. - (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix - indentation. + (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. + Fix indentation. 2011-06-26 Eli Zaretskii <eliz@gnu.org> @@ -1832,7 +1832,7 @@ and %.0c. Fix bug with strchr succeeding on '\0' when looking for flags. Fix bug with (format "%c" 256.0). Avoid integer overflow when formatting out-of-range floating point numbers with int - formats. (Bug#8668) + formats. (Bug#8668) * lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN. @@ -2796,9 +2796,9 @@ :verify-hostname-error, :verify-error, and :verify-flags parameters of `gnutls-boot' and documented those parameters in the docstring. Start callback support. - (emacs_gnutls_handshake): Add Woe32 support. Retry handshake - unless a fatal error occured. Call gnutls_alert_send_appropriate - on error. Return error code. + (emacs_gnutls_handshake): Add Woe32 support. Retry handshake + unless a fatal error occurred. Call gnutls_alert_send_appropriate + on error. Return error code. (emacs_gnutls_write): Call emacs_gnutls_handle_error. (emacs_gnutls_read): Likewise. (Fgnutls_boot): Return handshake error code. diff --git a/src/eval.c b/src/eval.c index e8a3f947f9d..90d0df61858 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3162,7 +3162,7 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs, shouldn't bind any arguments, instead just call the byte-code interpreter directly; it will push arguments as necessary. - Byte-code objects with either a non-existant, or a nil value for + Byte-code objects with either a non-existent, or a nil value for the `push args' slot (the default), have dynamically-bound arguments, and use the argument-binding code below instead (as do all interpreted functions, even lexically bound ones). */ diff --git a/src/gnutls.c b/src/gnutls.c index 55c7ff01c0c..76cfa5dcc98 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -379,7 +379,7 @@ emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte) /* non-fatal error */ return -1; else { - /* a fatal error occured */ + /* a fatal error occurred */ return 0; } } |