diff options
| author | Paul Eggert | 2016-04-11 09:07:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-04-11 09:07:16 -0700 |
| commit | 435da5d2955ce35be4785b7d46566ed9b42ea9fb (patch) | |
| tree | 581fac64374d0997e53bba0ae3cbd4968fa55121 /lisp/play | |
| parent | 7c9e6254bbac949aa5493ab1741d2523a7d595b7 (diff) | |
| parent | b134c206bc07dbbb9e74b3be2db269c4f1196e40 (diff) | |
| download | emacs-435da5d2955ce35be4785b7d46566ed9b42ea9fb.tar.gz emacs-435da5d2955ce35be4785b7d46566ed9b42ea9fb.zip | |
Merge from origin/emacs-25
b134c20 Sync with gnulib
bb30fa9 Fix last change on 2016-01-02
488a72f ; Spelling fixes
9b1aab9 Port run-prolog EMACS to SWI-Prolog 7.2.3
0e7bcec Avoid crashes due to unreasonably large or small text scaling
85f257c Improve documentation of 'with-eval-after-load'
668c7bc Improve handling of non-ASCII characters in Git log messages
b570769 Remove undefined behavior in OS X dumper.
97211f3 Fix clipping of xwidgets
e87fbc0 Improve Lisp-level documentation of tooltips
9f1786e Faces names should not end in "-face".
3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings.
a1f221b Comint and compile no longer set EMACS
5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2...
a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
c93ae7a Allow to customize names of executables used by grep.el
f6497c6 Set locale encoding to UTF-8 when run from OS X GUI.
7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
a3f1ac2 Avoid infinite loop in 'studlify-word'
f36df4b Don’t recommend obsolete EMACS env var
fb0b531 * lisp/emacs-lisp/package.el: Change from a few days ago need...
Diffstat (limited to 'lisp/play')
| -rw-r--r-- | lisp/play/studly.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/play/studly.el b/lisp/play/studly.el index f6aae4548b1..ff1bf03e118 100644 --- a/lisp/play/studly.el +++ b/lisp/play/studly.el | |||
| @@ -25,10 +25,10 @@ | |||
| 25 | (setq begin (point)) | 25 | (setq begin (point)) |
| 26 | (while (and (<= (point) end) | 26 | (while (and (<= (point) end) |
| 27 | (not (looking-at "\\W*\\'"))) | 27 | (not (looking-at "\\W*\\'"))) |
| 28 | (forward-word 1) | 28 | (forward-word-strictly 1) |
| 29 | (backward-word 1) | 29 | (backward-word-strictly 1) |
| 30 | (setq begin (max (point) begin)) | 30 | (setq begin (max (point) begin)) |
| 31 | (forward-word 1) | 31 | (forward-word-strictly 1) |
| 32 | (let ((offset 0) | 32 | (let ((offset 0) |
| 33 | (word-end (min (point) end)) | 33 | (word-end (min (point) end)) |
| 34 | c) | 34 | c) |
| @@ -55,7 +55,7 @@ | |||
| 55 | "Studlify-case the current word, or COUNT words if given an argument." | 55 | "Studlify-case the current word, or COUNT words if given an argument." |
| 56 | (interactive "*p") | 56 | (interactive "*p") |
| 57 | (let ((begin (point)) end rb re) | 57 | (let ((begin (point)) end rb re) |
| 58 | (forward-word count) | 58 | (forward-word-strictly count) |
| 59 | (setq end (point)) | 59 | (setq end (point)) |
| 60 | (setq rb (min begin end) re (max begin end)) | 60 | (setq rb (min begin end) re (max begin end)) |
| 61 | (studlify-region rb re))) | 61 | (studlify-region rb re))) |