From 4e619754b110208babdae8badcaa0b936072e726 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 4 Jan 2014 21:49:44 -0800 Subject: [PATCH] Change subword regexps back to vars. * progmodes/subword.el (subword-forward-regexp) (subword-backward-regexp): Change these back to variables. Fixes: debbugs:16296 --- lisp/ChangeLog | 6 ++++++ 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 @@ +2014-01-05 Paul Eggert + + Change subword regexps back to vars (Bug#16296). + * progmodes/subword.el (subword-forward-regexp) + (subword-backward-regexp): Change these back to variables. + 2014-01-03 Stefan Monnier * 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 @@ (defvar subword-backward-function 'subword-backward-internal "Function to call for backward subword movement.") -(defconst subword-forward-regexp +(defvar subword-forward-regexp "\\W*\\(\\([[:upper:]]*\\(\\W\\)?\\)[[:lower:][:digit:]]*\\)" "Regexp used by `subword-forward-internal'.") -(defconst subword-backward-regexp +(defvar subword-backward-regexp "\\(\\(\\W\\|[[:lower:][:digit:]]\\)\\([[:upper:]]+\\W*\\)\\|\\W\\w+\\)" "Regexp used by `subword-backward-internal'.") -- 2.39.2