diff options
| author | Paul Eggert | 2014-01-04 21:49:44 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-01-04 21:49:44 -0800 |
| commit | 4e619754b110208babdae8badcaa0b936072e726 (patch) | |
| tree | 91e5c97367b18c3ca09e12e32f4db30baa82af4e /lisp | |
| parent | dc300e285ab44a27dde3b0e6047b032a7100724d (diff) | |
| download | emacs-4e619754b110208babdae8badcaa0b936072e726.tar.gz emacs-4e619754b110208babdae8badcaa0b936072e726.zip | |
Change subword regexps back to vars.
* progmodes/subword.el (subword-forward-regexp)
(subword-backward-regexp): Change these back to variables.
Fixes: debbugs:16296
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/subword.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c398a34f93b..ad4c26c501f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-01-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Change subword regexps back to vars (Bug#16296). | ||
| 4 | * progmodes/subword.el (subword-forward-regexp) | ||
| 5 | (subword-backward-regexp): Change these back to variables. | ||
| 6 | |||
| 1 | 2014-01-03 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2014-01-03 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * emacs-lisp/lisp-mode.el (lisp-mode-variables): Don't bother with | 9 | * emacs-lisp/lisp-mode.el (lisp-mode-variables): Don't bother with |
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el index f45b9d1da34..f9efa3732c7 100644 --- a/lisp/progmodes/subword.el +++ b/lisp/progmodes/subword.el | |||
| @@ -93,11 +93,11 @@ | |||
| 93 | (defvar subword-backward-function 'subword-backward-internal | 93 | (defvar subword-backward-function 'subword-backward-internal |
| 94 | "Function to call for backward subword movement.") | 94 | "Function to call for backward subword movement.") |
| 95 | 95 | ||
| 96 | (defconst subword-forward-regexp | 96 | (defvar subword-forward-regexp |
| 97 | "\\W*\\(\\([[:upper:]]*\\(\\W\\)?\\)[[:lower:][:digit:]]*\\)" | 97 | "\\W*\\(\\([[:upper:]]*\\(\\W\\)?\\)[[:lower:][:digit:]]*\\)" |
| 98 | "Regexp used by `subword-forward-internal'.") | 98 | "Regexp used by `subword-forward-internal'.") |
| 99 | 99 | ||
| 100 | (defconst subword-backward-regexp | 100 | (defvar subword-backward-regexp |
| 101 | "\\(\\(\\W\\|[[:lower:][:digit:]]\\)\\([[:upper:]]+\\W*\\)\\|\\W\\w+\\)" | 101 | "\\(\\(\\W\\|[[:lower:][:digit:]]\\)\\([[:upper:]]+\\W*\\)\\|\\W\\w+\\)" |
| 102 | "Regexp used by `subword-backward-internal'.") | 102 | "Regexp used by `subword-backward-internal'.") |
| 103 | 103 | ||