diff options
| author | Paul Eggert | 2016-09-12 08:18:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-09-12 08:18:56 -0700 |
| commit | 6d6d9cd607601f41501b8f64230150ae26b8d500 (patch) | |
| tree | 224cdc33e4cad3bb5d55fe1889ec4207705a50bb /src/casefiddle.c | |
| parent | 6fdecd4a4988986c82203388d21e6d62908490d7 (diff) | |
| download | emacs-6d6d9cd607601f41501b8f64230150ae26b8d500.tar.gz emacs-6d6d9cd607601f41501b8f64230150ae26b8d500.zip | |
* src/casefiddle.c (casify_word): Simplify.
Diffstat (limited to 'src/casefiddle.c')
| -rw-r--r-- | src/casefiddle.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/casefiddle.c b/src/casefiddle.c index 59b5bbcf43e..2d32f498d0c 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c | |||
| @@ -378,24 +378,12 @@ character positions to operate on. */) | |||
| 378 | static Lisp_Object | 378 | static Lisp_Object |
| 379 | casify_word (enum case_action flag, Lisp_Object arg) | 379 | casify_word (enum case_action flag, Lisp_Object arg) |
| 380 | { | 380 | { |
| 381 | Lisp_Object beg, end; | ||
| 382 | ptrdiff_t newpoint; | ||
| 383 | EMACS_INT iarg; | ||
| 384 | |||
| 385 | CHECK_NUMBER (arg); | 381 | CHECK_NUMBER (arg); |
| 386 | iarg = XINT (arg); | 382 | ptrdiff_t farend = scan_words (PT, XINT (arg)); |
| 387 | 383 | if (!farend) | |
| 388 | newpoint = scan_words (PT, iarg); | 384 | farend = XINT (arg) <= 0 ? BEGV : ZV; |
| 389 | if (!newpoint) | 385 | ptrdiff_t newpoint = max (PT, farend); |
| 390 | newpoint = iarg > 0 ? ZV : BEGV; | 386 | casify_region (flag, make_number (PT), make_number (farend)); |
| 391 | |||
| 392 | XSETFASTINT (beg, PT); | ||
| 393 | XSETFASTINT (end, newpoint); | ||
| 394 | if (PT > newpoint) | ||
| 395 | newpoint = PT; | ||
| 396 | |||
| 397 | casify_region (flag, beg, end); | ||
| 398 | |||
| 399 | SET_PT (newpoint); | 387 | SET_PT (newpoint); |
| 400 | return Qnil; | 388 | return Qnil; |
| 401 | } | 389 | } |