aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/rx.el5
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad4c26c501f..d68d7ea88c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12014-01-05 Paul Eggert <eggert@cs.ucla.edu> 12014-01-05 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Fix misspelling of 'chinese' in rx (Bug#16237).
4 * emacs-lisp/rx.el (rx-categories): Correct spelling of
5 chinese-two-byte.
6
3 Change subword regexps back to vars (Bug#16296). 7 Change subword regexps back to vars (Bug#16296).
4 * progmodes/subword.el (subword-forward-regexp) 8 * progmodes/subword.el (subword-forward-regexp)
5 (subword-backward-regexp): Change these back to variables. 9 (subword-backward-regexp): Change these back to variables.
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 7adf46ebffd..f6934c38d29 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -258,7 +258,8 @@ regular expressions.")
258 (not-at-end-of-line . ?<) 258 (not-at-end-of-line . ?<)
259 (not-at-beginning-of-line . ?>) 259 (not-at-beginning-of-line . ?>)
260 (alpha-numeric-two-byte . ?A) 260 (alpha-numeric-two-byte . ?A)
261 (chinse-two-byte . ?C) 261 (chinese-two-byte . ?C)
262 (chinse-two-byte . ?C) ;; A typo in Emacs 21.1-24.3.
262 (greek-two-byte . ?G) 263 (greek-two-byte . ?G)
263 (japanese-hiragana-two-byte . ?H) 264 (japanese-hiragana-two-byte . ?H)
264 (indian-two-byte . ?I) 265 (indian-two-byte . ?I)
@@ -1045,7 +1046,7 @@ CHAR
1045 `not-at-end-of-line' (\\c<) 1046 `not-at-end-of-line' (\\c<)
1046 `not-at-beginning-of-line' (\\c>) 1047 `not-at-beginning-of-line' (\\c>)
1047 `alpha-numeric-two-byte' (\\cA) 1048 `alpha-numeric-two-byte' (\\cA)
1048 `chinse-two-byte' (\\cC) 1049 `chinese-two-byte' (\\cC)
1049 `greek-two-byte' (\\cG) 1050 `greek-two-byte' (\\cG)
1050 `japanese-hiragana-two-byte' (\\cH) 1051 `japanese-hiragana-two-byte' (\\cH)
1051 `indian-tow-byte' (\\cI) 1052 `indian-tow-byte' (\\cI)