aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Naggum1996-01-09 02:12:16 +0000
committerErik Naggum1996-01-09 02:12:16 +0000
commit9391b69806801ea8cfdf977fd1c4fdc5d0081d8a (patch)
tree019ea455994cc2636d43923053f6751cb2d0cc2d
parent88fe8140fe9134e9b0ad2a1927d365fe7be1415f (diff)
downloademacs-9391b69806801ea8cfdf977fd1c4fdc5d0081d8a.tar.gz
emacs-9391b69806801ea8cfdf977fd1c4fdc5d0081d8a.zip
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
with documentation.
-rw-r--r--src/lread.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lread.c b/src/lread.c
index a4660ab634c..f1d8ea94691 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -803,16 +803,16 @@ nil means discard it; anything else is stream for print.\n\
803\n\ 803\n\
804If there is no error, point does not move. If there is an error,\n\ 804If there is no error, point does not move. If there is an error,\n\
805point remains at the end of the last character read from the buffer.") 805point remains at the end of the last character read from the buffer.")
806 (bufname, printflag) 806 (buffer, printflag)
807 Lisp_Object bufname, printflag; 807 Lisp_Object buffer, printflag;
808{ 808{
809 int count = specpdl_ptr - specpdl; 809 int count = specpdl_ptr - specpdl;
810 Lisp_Object tem, buf; 810 Lisp_Object tem, buf;
811 811
812 if (NILP (bufname)) 812 if (NILP (buffer))
813 buf = Fcurrent_buffer (); 813 buf = Fcurrent_buffer ();
814 else 814 else
815 buf = Fget_buffer (bufname); 815 buf = Fget_buffer (buffer);
816 if (NILP (buf)) 816 if (NILP (buf))
817 error ("No such buffer."); 817 error ("No such buffer.");
818 818
@@ -867,8 +867,8 @@ nil means discard it; anything else is stream for printing it.\n\
867\n\ 867\n\
868If there is no error, point does not move. If there is an error,\n\ 868If there is no error, point does not move. If there is an error,\n\
869point remains at the end of the last character read from the buffer.") 869point remains at the end of the last character read from the buffer.")
870 (b, e, printflag) 870 (start, end, printflag)
871 Lisp_Object b, e, printflag; 871 Lisp_Object start, end, printflag;
872{ 872{
873 int count = specpdl_ptr - specpdl; 873 int count = specpdl_ptr - specpdl;
874 Lisp_Object tem, cbuf; 874 Lisp_Object tem, cbuf;
@@ -885,9 +885,9 @@ point remains at the end of the last character read from the buffer.")
885 record_unwind_protect (save_excursion_restore, save_excursion_save ()); 885 record_unwind_protect (save_excursion_restore, save_excursion_save ());
886 record_unwind_protect (save_restriction_restore, save_restriction_save ()); 886 record_unwind_protect (save_restriction_restore, save_restriction_save ());
887 887
888 /* This both uses b and checks its type. */ 888 /* This both uses start and checks its type. */
889 Fgoto_char (b); 889 Fgoto_char (start);
890 Fnarrow_to_region (make_number (BEGV), e); 890 Fnarrow_to_region (make_number (BEGV), end);
891 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, !NILP (printflag)); 891 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, !NILP (printflag));
892 892
893 return unbind_to (count, Qnil); 893 return unbind_to (count, Qnil);
@@ -1835,23 +1835,23 @@ DEFUN ("intern", Fintern, Sintern, 1, 2, 0,
1835If there is none, one is created by this function and returned.\n\ 1835If there is none, one is created by this function and returned.\n\
1836A second optional argument specifies the obarray to use;\n\ 1836A second optional argument specifies the obarray to use;\n\
1837it defaults to the value of `obarray'.") 1837it defaults to the value of `obarray'.")
1838 (str, obarray) 1838 (string, obarray)
1839 Lisp_Object str, obarray; 1839 Lisp_Object string, obarray;
1840{ 1840{
1841 register Lisp_Object tem, sym, *ptr; 1841 register Lisp_Object tem, sym, *ptr;
1842 1842
1843 if (NILP (obarray)) obarray = Vobarray; 1843 if (NILP (obarray)) obarray = Vobarray;
1844 obarray = check_obarray (obarray); 1844 obarray = check_obarray (obarray);
1845 1845
1846 CHECK_STRING (str, 0); 1846 CHECK_STRING (string, 0);
1847 1847
1848 tem = oblookup (obarray, XSTRING (str)->data, XSTRING (str)->size); 1848 tem = oblookup (obarray, XSTRING (string)->data, XSTRING (string)->size);
1849 if (!INTEGERP (tem)) 1849 if (!INTEGERP (tem))
1850 return tem; 1850 return tem;
1851 1851
1852 if (!NILP (Vpurify_flag)) 1852 if (!NILP (Vpurify_flag))
1853 str = Fpurecopy (str); 1853 string = Fpurecopy (string);
1854 sym = Fmake_symbol (str); 1854 sym = Fmake_symbol (string);
1855 1855
1856 ptr = &XVECTOR (obarray)->contents[XINT (tem)]; 1856 ptr = &XVECTOR (obarray)->contents[XINT (tem)];
1857 if (SYMBOLP (*ptr)) 1857 if (SYMBOLP (*ptr))
@@ -1866,17 +1866,17 @@ DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0,
1866 "Return the canonical symbol whose name is STRING, or nil if none exists.\n\ 1866 "Return the canonical symbol whose name is STRING, or nil if none exists.\n\
1867A second optional argument specifies the obarray to use;\n\ 1867A second optional argument specifies the obarray to use;\n\
1868it defaults to the value of `obarray'.") 1868it defaults to the value of `obarray'.")
1869 (str, obarray) 1869 (string, obarray)
1870 Lisp_Object str, obarray; 1870 Lisp_Object string, obarray;
1871{ 1871{
1872 register Lisp_Object tem; 1872 register Lisp_Object tem;
1873 1873
1874 if (NILP (obarray)) obarray = Vobarray; 1874 if (NILP (obarray)) obarray = Vobarray;
1875 obarray = check_obarray (obarray); 1875 obarray = check_obarray (obarray);
1876 1876
1877 CHECK_STRING (str, 0); 1877 CHECK_STRING (string, 0);
1878 1878
1879 tem = oblookup (obarray, XSTRING (str)->data, XSTRING (str)->size); 1879 tem = oblookup (obarray, XSTRING (string)->data, XSTRING (string)->size);
1880 if (!INTEGERP (tem)) 1880 if (!INTEGERP (tem))
1881 return tem; 1881 return tem;
1882 return Qnil; 1882 return Qnil;