X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fabbrev.c;h=30b5993f0e66f888f1cf4eede27ca2bf19229172;hb=d24ddd7fef791cbb02ddf5bd96a17b4c0f304404;hp=e18efdd1562c2e13d7207db14a03c713d9c0ce66;hpb=2e3e3f9ee27fec50f45c282d71eaddf7c673bc56;p=chise%2Fxemacs-chise.git-

diff --git a/src/abbrev.c b/src/abbrev.c
index e18efdd..30b5993 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -77,9 +77,9 @@ Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;
 
 struct abbrev_match_mapper_closure {
   struct buffer *buf;
-  struct Lisp_Char_Table *chartab;
+  Lisp_Char_Table *chartab;
   Charcount point, maxlen;
-  struct Lisp_Symbol *found;
+  Lisp_Symbol *found;
 };
 
 /* For use by abbrev_match(): Match SYMBOL's name against buffer text
@@ -91,8 +91,8 @@ abbrev_match_mapper (Lisp_Object symbol, void *arg)
   struct abbrev_match_mapper_closure *closure =
     (struct abbrev_match_mapper_closure *)arg;
   Charcount abbrev_length;
-  struct Lisp_Symbol *sym = XSYMBOL (symbol);
-  struct Lisp_String *abbrev;
+  Lisp_Symbol *sym = XSYMBOL (symbol);
+  Lisp_String *abbrev;
 
   /* symbol_value should be OK here, because abbrevs are not expected
      to contain any SYMBOL_MAGIC stuff.  */
@@ -147,7 +147,7 @@ abbrev_match_mapper (Lisp_Object symbol, void *arg)
 
 /* Match the buffer text against names of symbols in obarray.  Returns
    the matching symbol, or 0 if not found.  */
-static struct Lisp_Symbol *
+static Lisp_Symbol *
 abbrev_match (struct buffer *buf, Lisp_Object obarray)
 {
   struct abbrev_match_mapper_closure closure;
@@ -172,10 +172,10 @@ abbrev_match (struct buffer *buf, Lisp_Object obarray)
    It is an order of magnitude faster than the proper abbrev_match(),
    but then again, vi is an order of magnitude faster than Emacs.
 
-   This speed difference should be unnoticable, though.  I have tested
+   This speed difference should be unnoticeable, though.  I have tested
    the degenerated cases of thousands of abbrevs being defined, and
    abbrev_match() was still fast enough for normal operation.  */
-static struct Lisp_Symbol *
+static Lisp_Symbol *
 abbrev_oblookup (struct buffer *buf, Lisp_Object obarray)
 {
   Bufpos wordstart, wordend;
@@ -222,10 +222,11 @@ abbrev_oblookup (struct buffer *buf, Lisp_Object obarray)
 	 because of consistency with abbrev_match. */
       if (wordend < point)
 	return 0;
-      if (wordend <= wordstart)
-	return 0;
     }
 
+  if (wordend <= wordstart)
+    return 0;
+
   p = word = (Bufbyte *) alloca (MAX_EMCHAR_LEN * (wordend - wordstart));
   for (idx = wordstart; idx < wordend; idx++)
     {
@@ -281,10 +282,10 @@ If no abbrev matched, but `pre-abbrev-expand-hook' changed the buffer,
   Bufpos point;			/* position of point */
   Bufpos abbrev_start;		/* position of abbreviation beginning */
 
-  struct Lisp_Symbol *(*fun) (struct buffer *, Lisp_Object);
+  Lisp_Symbol *(*fun) (struct buffer *, Lisp_Object);
 
-  struct Lisp_Symbol *abbrev_symbol;
-  struct Lisp_String *abbrev_string;
+  Lisp_Symbol *abbrev_symbol;
+  Lisp_String *abbrev_string;
   Lisp_Object expansion, count, hook;
   Charcount abbrev_length;
   int lccount, uccount;