Mercurial > emacs
changeset 106981:e3fcbe16deae
merge conflict
author | Mark A. Hershberger <mhershberger@intrahealth.org> |
---|---|
date | Sun, 24 Jan 2010 23:52:26 -0500 |
parents | 66e0d01014c6 (diff) ffa16c09e01d (current diff) |
children | 38312121c181 |
files | admin/revdiff doc/emacs/ChangeLog doc/misc/ChangeLog lisp/ChangeLog |
diffstat | 6 files changed, 24 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Sun Jan 24 21:52:03 2010 -0500 +++ b/doc/emacs/ChangeLog Sun Jan 24 23:52:26 2010 -0500 @@ -1,3 +1,8 @@ +2010-01-24 Mark A. Hershberger <mah@everybody.org> + + * programs.texi (Other C Commands): Replace reference to obsolete + c-subword-mode. + 2010-01-21 Glenn Morris <rgm@gnu.org> * trouble.texi (Bugs): Fix PROBLEMS keybinding.
--- a/doc/emacs/programs.texi Sun Jan 24 21:52:03 2010 -0500 +++ b/doc/emacs/programs.texi Sun Jan 24 23:52:26 2010 -0500 @@ -1609,13 +1609,13 @@ @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
--- a/doc/misc/ChangeLog Sun Jan 24 21:52:03 2010 -0500 +++ b/doc/misc/ChangeLog Sun Jan 24 23:52:26 2010 -0500 @@ -1,7 +1,11 @@ -2010-01-21 Katsumi Yamaoka <yamaoka@jpl.org> +2010-01-24 Mark A. Hershberger <mah@everybody.org> * gnus.texi (Score File Format): Fix typo. +2010-01-21 Katsumi Yamaoka <yamaoka@jpl.org> + + * cc-mode.texi: Replace references to obsolete c-subword-mode. + 2010-01-18 Juanma Barranquero <lekktu@gmail.com> * ada-mode.texi (Project File Overview): Fix typo.
--- a/doc/misc/cc-mode.texi Sun Jan 24 21:52:03 2010 -0500 +++ b/doc/misc/cc-mode.texi Sun Jan 24 23:52:26 2010 -0500 @@ -1012,7 +1012,7 @@ 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 @@ @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 @@ @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
--- a/lisp/ChangeLog Sun Jan 24 21:52:03 2010 -0500 +++ b/lisp/ChangeLog Sun Jan 24 23:52:26 2010 -0500 @@ -1,3 +1,7 @@ +2010-01-24 Mark A. Hershberger <mah@everybody.org> + + * progmodes/python.el: Replace reference to obsolete c-subward-mode. + 2010-01-24 Dan Nicolaescu <dann@ics.uci.edu> Remove support for adding --signoff on commit.
--- a/lisp/progmodes/python.el Sun Jan 24 21:52:03 2010 -0500 +++ b/lisp/progmodes/python.el Sun Jan 24 23:52:26 2010 -0500 @@ -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