GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
#include <config.h>
register int i, c, len;
register int inword = flag == CASE_DOWN;
+ /* If the case table is flagged as modified, rescan it. */
+ if (NILP (XCHAR_TABLE (current_buffer->downcase_table)->extras[1]))
+ Fset_case_table (current_buffer->downcase_table);
+
while (1)
{
- if (XTYPE (obj) == Lisp_Int)
+ if (INTEGERP (obj))
{
c = XINT (obj);
if (c >= 0 && c <= 0400)
{
if (inword)
- XFASTINT (obj) = DOWNCASE (c);
+ XSETFASTINT (obj, DOWNCASE (c));
else if (!UPPERCASEP (c))
- XFASTINT (obj) = UPCASE1 (c);
+ XSETFASTINT (obj, UPCASE1 (c));
}
return obj;
}
- if (XTYPE (obj) == Lisp_String)
+ if (STRINGP (obj))
{
obj = Fcopy_sequence (obj);
len = XSTRING (obj)->size;
return casify_object (CASE_CAPITALIZE, obj);
}
+/* Like Fcapitalize but change only the initials. */
+
DEFUN ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0,
"Convert the initial of each word in the argument to upper case.\n\
Do not change the other letters of each word.\n\
{
return casify_object (CASE_CAPITALIZE_UP, obj);
}
-
-/* Like Fcapitalize but change only the initials. */
-
-Lisp_Object
-upcase_initials (obj)
- Lisp_Object obj;
-{
- return casify_object (CASE_CAPITALIZE_UP, obj);
-}
\f
/* flag is CASE_UP, CASE_DOWN or CASE_CAPITALIZE or CASE_CAPITALIZE_UP.
b and e specify range of buffer to operate on. */
register int i;
register int c;
register int inword = flag == CASE_DOWN;
+ int start, end;
if (EQ (b, e))
/* Not modifying because nothing marked */
return;
+ /* If the case table is flagged as modified, rescan it. */
+ if (NILP (XCHAR_TABLE (current_buffer->downcase_table)->extras[1]))
+ Fset_case_table (current_buffer->downcase_table);
+
validate_region (&b, &e);
- modify_region (current_buffer, XFASTINT (b), XFASTINT (e));
- record_change (XFASTINT (b), XFASTINT (e) - XFASTINT (b));
+ start = XFASTINT (b);
+ end = XFASTINT (e);
+ modify_region (current_buffer, start, end);
+ record_change (start, end - start);
- for (i = XFASTINT (b); i < XFASTINT (e); i++)
+ for (i = start; i < end; i++)
{
c = FETCH_CHAR (i);
if (inword && flag != CASE_CAPITALIZE_UP)
inword = SYNTAX (c) == Sword;
}
- signal_after_change (XFASTINT (b),
- XFASTINT (e) - XFASTINT (b),
- XFASTINT (e) - XFASTINT (b));
+ signal_after_change (start, end - start, end - start);
}
DEFUN ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r",
the region to operate on. When used as a command, the text between\n\
point and the mark is operated on.\n\
See also `capitalize-region'.")
- (b, e)
- Lisp_Object b, e;
+ (beg, end)
+ Lisp_Object beg, end;
{
- casify_region (CASE_UP, b, e);
+ casify_region (CASE_UP, beg, end);
return Qnil;
}
These arguments specify the starting and ending character numbers of\n\
the region to operate on. When used as a command, the text between\n\
point and the mark is operated on.")
- (b, e)
- Lisp_Object b, e;
+ (beg, end)
+ Lisp_Object beg, end;
{
- casify_region (CASE_DOWN, b, e);
+ casify_region (CASE_DOWN, beg, end);
return Qnil;
}
and the rest of it is lower case.\n\
In programs, give two arguments, the starting and ending\n\
character positions to operate on.")
- (b, e)
- Lisp_Object b, e;
+ (beg, end)
+ Lisp_Object beg, end;
{
- casify_region (CASE_CAPITALIZE, b, e);
+ casify_region (CASE_CAPITALIZE, beg, end);
return Qnil;
}
+/* Like Fcapitalize_region but change only the initials. */
+
DEFUN ("upcase-initials-region", Fupcase_initials_region,
Supcase_initials_region, 2, 2, "r",
"Upcase the initial of each word in the region.\n\
Subsequent letters of each word are not changed.\n\
In programs, give two arguments, the starting and ending\n\
character positions to operate on.")
- (b, e)
- Lisp_Object b, e;
-{
- casify_region (CASE_CAPITALIZE_UP, b, e);
- return Qnil;
-}
-
-/* Like Fcapitalize_region but change only the initials. */
-
-Lisp_Object
-upcase_initials_region (b, e)
- Lisp_Object b, e;
+ (beg, end)
+ Lisp_Object beg, end;
{
- casify_region (CASE_CAPITALIZE_UP, b, e);
+ casify_region (CASE_CAPITALIZE_UP, beg, end);
return Qnil;
}
\f
{
Lisp_Object val;
int farend;
+ int iarg;
CHECK_NUMBER (arg, 0);
- farend = scan_words (point, XINT (arg));
+ iarg = XINT (arg);
+ farend = scan_words (point, iarg);
if (!farend)
- farend = XINT (arg) > 0 ? ZV : BEGV;
+ farend = iarg > 0 ? ZV : BEGV;
*newpoint = point > farend ? point : farend;
- XFASTINT (val) = farend;
+ XSETFASTINT (val, farend);
return val;
}
{
Lisp_Object beg, end;
int newpoint;
- XFASTINT (beg) = point;
+ XSETFASTINT (beg, point);
end = operate_on_word (arg, &newpoint);
casify_region (CASE_UP, beg, end);
SET_PT (newpoint);
{
Lisp_Object beg, end;
int newpoint;
- XFASTINT (beg) = point;
+ XSETFASTINT (beg, point);
end = operate_on_word (arg, &newpoint);
casify_region (CASE_DOWN, beg, end);
SET_PT (newpoint);
{
Lisp_Object beg, end;
int newpoint;
- XFASTINT (beg) = point;
+ XSETFASTINT (beg, point);
end = operate_on_word (arg, &newpoint);
casify_region (CASE_CAPITALIZE, beg, end);
SET_PT (newpoint);
HCoop / bpt / emacs.git / blobdiff