From aaef4f91fad60716fa070b912d71b9f1ccd2e7b4 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Tue, 19 Jan 2010 14:39:22 -0500 Subject: [PATCH] replace references to obsolete c-subword-mode --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/programs.texi | 6 +++--- doc/misc/ChangeLog | 4 ++++ doc/misc/cc-mode.texi | 13 ++++++------- lisp/ChangeLog | 4 ++++ lisp/progmodes/python.el | 2 +- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8ca2b187d9..e9ab5edd57 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2010-01-19 Mark A. Hershberger + + * programs.texi (Other C Commands): Replace reference to obsolete + c-subword-mode. + 2010-01-12 Glenn Morris * trouble.texi (Checklist): Use bug-gnu-emacs rather than diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index ac955956b9..8ebbcf58ed 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1609,13 +1609,13 @@ hungry-delete feature is enabled. @table @kbd @item C-c C-w -@itemx M-x c-subword-mode -@findex c-subword-mode +@itemx M-x subword-mode +@findex subword-mode Enable (or disable) @dfn{subword mode}. In subword mode, Emacs's word commands recognize upper case letters in @samp{StudlyCapsIdentifiers} as word boundaries. This is indicated by the flag @samp{/w} on the mode line after the mode name -(e.g. @samp{C/law}). You can even use @kbd{M-x c-subword-mode} in +(e.g. @samp{C/law}). You can even use @kbd{M-x subword-mode} in non-CC Mode buffers. In the GNU project, we recommend using underscores to separate words diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 4a099bdb2c..50673dc714 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-01-19 Mark A. Hershberger + + * cc-mode.texi: Replace references to obsolete c-subword-mode. + 2010-01-18 Juanma Barranquero * ada-mode.texi (Project File Overview): Fix typo. diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 6b72c69e05..bfe09b6424 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -1012,7 +1012,7 @@ capitalized word. With prefix argument @var{n}, move @var{n} times. If @var{n} is negative, move in the opposite direction. Note that these two commands have been superseded by -@code{c-subword-mode}, which you should use instead. @xref{Subword +@code{subword-mode}, which you should use instead. @xref{Subword Movement}. They might be removed from a future release of @ccmode{}. @end table @@ -1194,10 +1194,9 @@ Toggle hungry-delete minor mode. @findex toggle-auto-hungry-state (c-) Toggle both auto-newline and hungry delete minor modes. -@item @kbd{C-c C-w} (@code{M-x c-subword-mode}) +@item @kbd{C-c C-w} (@code{M-x subword-mode}) @kindex C-c C-w -@findex c-subword-mode -@findex subword-mode (c-) +@findex subword-mode Toggle subword mode. @item @kbd{M-x c-toggle-syntactic-indentation} @@ -1694,11 +1693,11 @@ mode turn on automatically, put the following code in your @example (add-hook 'c-mode-common-hook - (lambda () (c-subword-mode 1))) + (lambda () (subword-mode 1))) @end example -As a bonus, you can also use @code{c-subword-mode} in non-@ccmode{} -buffers by typing @kbd{M-x c-subword-mode}. +As a bonus, you can also use @code{subword-mode} in non-@ccmode{} +buffers by typing @kbd{M-x subword-mode}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @node Other Commands, , Subword Movement, Commands diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f9e55700c1..2ec6621c20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-01-19 Mark A. Hershberger + + * progmodes/python.el: Replace reference to obsolete c-subward-mode. + 2010-01-18 Stephen Leake * lisp/progmodes/ada-mode.el: Fix bug#5400. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 94124ad54f..a6354eff99 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -45,7 +45,7 @@ ;; `forward-into-nomenclature' should be done separately, since it's ;; not specific to Python, and I've installed a minor mode to do the ;; job properly in Emacs 23. [CC mode 5.31 contains an incompatible -;; feature, `c-subword-mode' which is intended to have a similar +;; feature, `subword-mode' which is intended to have a similar ;; effect, but actually only affects word-oriented keybindings.] ;; Other things seem more natural or canonical here, e.g. the -- 2.20.1