aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-07-05 11:51:56 +0200
committerJuanma Barranquero2011-07-05 11:51:56 +0200
commit9173deecd801321600a6c24186ce94147ae01753 (patch)
tree8c0fe262af09cdb35848e2c3d5106ad4b7b86fe0 /src
parent869795d6b510972d846183141885569ebf0c44f4 (diff)
downloademacs-9173deecd801321600a6c24186ce94147ae01753.tar.gz
emacs-9173deecd801321600a6c24186ce94147ae01753.zip
Fix typos.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog14
-rw-r--r--src/eval.c2
-rw-r--r--src/gnutls.c2
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 @@
173 with value as argument. 173 with value as argument.
174 (init_gsettings): Check that GSETTINGS_SCHEMA exists before calling 174 (init_gsettings): Check that GSETTINGS_SCHEMA exists before calling
175 g_settings_new (Bug#8967). Do not create gsettings_obj. 175 g_settings_new (Bug#8967). Do not create gsettings_obj.
176 Remove calls to g_settings_bind. Connect something_changedCB to 176 Remove calls to g_settings_bind. Connect something_changedCB to
177 "changed". 177 "changed".
178 178
179 * xgselect.c: Add defined (HAVE_GSETTINGS). 179 * xgselect.c: Add defined (HAVE_GSETTINGS).
@@ -270,8 +270,8 @@
270 min_width/height (Bug#8919). 270 min_width/height (Bug#8919).
271 271
272 * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new. 272 * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new.
273 (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix 273 (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size.
274 indentation. 274 Fix indentation.
275 275
2762011-06-26 Eli Zaretskii <eliz@gnu.org> 2762011-06-26 Eli Zaretskii <eliz@gnu.org>
277 277
@@ -1832,7 +1832,7 @@
1832 and %.0c. Fix bug with strchr succeeding on '\0' when looking for 1832 and %.0c. Fix bug with strchr succeeding on '\0' when looking for
1833 flags. Fix bug with (format "%c" 256.0). Avoid integer overflow when 1833 flags. Fix bug with (format "%c" 256.0). Avoid integer overflow when
1834 formatting out-of-range floating point numbers with int 1834 formatting out-of-range floating point numbers with int
1835 formats. (Bug#8668) 1835 formats. (Bug#8668)
1836 1836
1837 * lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN. 1837 * lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN.
1838 1838
@@ -2796,9 +2796,9 @@
2796 :verify-hostname-error, :verify-error, and :verify-flags 2796 :verify-hostname-error, :verify-error, and :verify-flags
2797 parameters of `gnutls-boot' and documented those parameters in the 2797 parameters of `gnutls-boot' and documented those parameters in the
2798 docstring. Start callback support. 2798 docstring. Start callback support.
2799 (emacs_gnutls_handshake): Add Woe32 support. Retry handshake 2799 (emacs_gnutls_handshake): Add Woe32 support. Retry handshake
2800 unless a fatal error occured. Call gnutls_alert_send_appropriate 2800 unless a fatal error occurred. Call gnutls_alert_send_appropriate
2801 on error. Return error code. 2801 on error. Return error code.
2802 (emacs_gnutls_write): Call emacs_gnutls_handle_error. 2802 (emacs_gnutls_write): Call emacs_gnutls_handle_error.
2803 (emacs_gnutls_read): Likewise. 2803 (emacs_gnutls_read): Likewise.
2804 (Fgnutls_boot): Return handshake error code. 2804 (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,
3162 shouldn't bind any arguments, instead just call the byte-code 3162 shouldn't bind any arguments, instead just call the byte-code
3163 interpreter directly; it will push arguments as necessary. 3163 interpreter directly; it will push arguments as necessary.
3164 3164
3165 Byte-code objects with either a non-existant, or a nil value for 3165 Byte-code objects with either a non-existent, or a nil value for
3166 the `push args' slot (the default), have dynamically-bound 3166 the `push args' slot (the default), have dynamically-bound
3167 arguments, and use the argument-binding code below instead (as do 3167 arguments, and use the argument-binding code below instead (as do
3168 all interpreted functions, even lexically bound ones). */ 3168 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)
379 /* non-fatal error */ 379 /* non-fatal error */
380 return -1; 380 return -1;
381 else { 381 else {
382 /* a fatal error occured */ 382 /* a fatal error occurred */
383 return 0; 383 return 0;
384 } 384 }
385} 385}