aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-10-01 09:57:19 +0000
committerJuanma Barranquero2007-10-01 09:57:19 +0000
commit88852d458258f2ccdbc2e4b2733329d5dc916335 (patch)
tree6d5c42970ee23296abfdee881b1aa91dce3f4e9c /src
parent2742fe306859d828cbeff3ae0371e2217b09cd4c (diff)
downloademacs-88852d458258f2ccdbc2e4b2733329d5dc916335.tar.gz
emacs-88852d458258f2ccdbc2e4b2733329d5dc916335.zip
(Fload): Fix typo in docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lread.c16
2 files changed, 12 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e71218880bc..1ace8bec331 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12007-10-01 Juanma Barranquero <lekktu@gmail.com>
2
3 * lread.c (Fload): Fix typo in docstring.
4
12007-10-01 Micha,Ak(Bl Cadilhac <michael@cadilhac.name> 52007-10-01 Micha,Ak(Bl Cadilhac <michael@cadilhac.name>
2 6
3 * floatfns.c (Fexpt): Manually check for overflows, so that a power 7 * floatfns.c (Fexpt): Manually check for overflows, so that a power
diff --git a/src/lread.c b/src/lread.c
index a4bb0fa5899..d2709dead4c 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -502,7 +502,7 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii,
502 502
503/* Read until we get an acceptable event. */ 503/* Read until we get an acceptable event. */
504 retry: 504 retry:
505 do 505 do
506 val = read_char (0, 0, 0, (input_method ? Qnil : Qt), 0, 506 val = read_char (0, 0, 0, (input_method ? Qnil : Qt), 0,
507 NUMBERP (seconds) ? &end_time : NULL); 507 NUMBERP (seconds) ? &end_time : NULL);
508 while (INTEGERP (val) && XINT (val) == -2); /* wrong_kboard_jmpbuf */ 508 while (INTEGERP (val) && XINT (val) == -2); /* wrong_kboard_jmpbuf */
@@ -645,7 +645,7 @@ DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0,
645 645
646 646
647 647
648/* Value is non-zero if the file asswociated with file descriptor FD 648/* Value is non-zero if the file associated with file descriptor FD
649 is a compiled Lisp file that's safe to load. Only files compiled 649 is a compiled Lisp file that's safe to load. Only files compiled
650 with Emacs are safe to load. Files compiled with XEmacs can lead 650 with Emacs are safe to load. Files compiled with XEmacs can lead
651 to a crash in Fbyte_code because of an incompatible change in the 651 to a crash in Fbyte_code because of an incompatible change in the
@@ -741,7 +741,7 @@ DEFUN ("load", Fload, Sload, 1, 5, 0,
741 doc: /* Execute a file of Lisp code named FILE. 741 doc: /* Execute a file of Lisp code named FILE.
742First try FILE with `.elc' appended, then try with `.el', 742First try FILE with `.elc' appended, then try with `.el',
743then try FILE unmodified (the exact suffixes in the exact order are 743then try FILE unmodified (the exact suffixes in the exact order are
744determined by `load-suffixes'). Environment variable references in 744determined by `load-suffixes'). Environment variable references in
745FILE are replaced with their values by calling `substitute-in-file-name'. 745FILE are replaced with their values by calling `substitute-in-file-name'.
746This function searches the directories in `load-path'. 746This function searches the directories in `load-path'.
747 747
@@ -912,7 +912,7 @@ Return t if the file exists and loads successfully. */)
912 tmp)) 912 tmp))
913 : found) ; 913 : found) ;
914 914
915 /* Check fore the presence of old-style quotes and warn about them. */ 915 /* Check for the presence of old-style quotes and warn about them. */
916 specbind (Qold_style_backquotes, Qnil); 916 specbind (Qold_style_backquotes, Qnil);
917 record_unwind_protect (load_warn_old_style_backquotes, file); 917 record_unwind_protect (load_warn_old_style_backquotes, file);
918 918
@@ -2718,7 +2718,7 @@ read1 (readcharfun, pch, first_in_list)
2718 } 2718 }
2719 default: 2719 default:
2720 default_label: 2720 default_label:
2721 if (c <= 040) goto retry; 2721 if (c <= 040) goto retry;
2722 if (c == 0x8a0) /* NBSP */ 2722 if (c == 0x8a0) /* NBSP */
2723 goto retry; 2723 goto retry;
2724 { 2724 {
@@ -3873,7 +3873,7 @@ init_lread ()
3873 Vload_path = Fcons (tem, Vload_path); 3873 Vload_path = Fcons (tem, Vload_path);
3874 } 3874 }
3875 3875
3876 /* Add site-list under the installation dir, if it exists. */ 3876 /* Add site-lisp under the installation dir, if it exists. */
3877 tem = Fexpand_file_name (build_string ("site-lisp"), 3877 tem = Fexpand_file_name (build_string ("site-lisp"),
3878 Vinstallation_directory); 3878 Vinstallation_directory);
3879 tem1 = Ffile_exists_p (tem); 3879 tem1 = Ffile_exists_p (tem);
@@ -3933,7 +3933,7 @@ init_lread ()
3933 /* NORMAL refers to the lisp dir in the source directory. */ 3933 /* NORMAL refers to the lisp dir in the source directory. */
3934 /* We used to add ../lisp at the front here, but 3934 /* We used to add ../lisp at the front here, but
3935 that caused trouble because it was copied from dump_path 3935 that caused trouble because it was copied from dump_path
3936 into Vload_path, aboe, when Vinstallation_directory was non-nil. 3936 into Vload_path, above, when Vinstallation_directory was non-nil.
3937 It should be unnecessary. */ 3937 It should be unnecessary. */
3938 Vload_path = decode_env_path (0, normal); 3938 Vload_path = decode_env_path (0, normal);
3939 dump_path = Vload_path; 3939 dump_path = Vload_path;
@@ -3992,7 +3992,7 @@ init_lread ()
3992} 3992}
3993 3993
3994/* Print a warning, using format string FORMAT, that directory DIRNAME 3994/* Print a warning, using format string FORMAT, that directory DIRNAME
3995 does not exist. Print it on stderr and put it in *Message*. */ 3995 does not exist. Print it on stderr and put it in *Messages*. */
3996 3996
3997void 3997void
3998dir_warning (format, dirname) 3998dir_warning (format, dirname)