diff options
author | Chong Yidong <[email protected]> | 2011-03-07 00:20:23 -0500 |
---|---|---|
committer | Chong Yidong <[email protected]> | 2011-03-07 00:20:23 -0500 |
commit | c6678f2916c22cd3b16232dc941f318c894ef56e (patch) | |
tree | de71692a9ba0cc424f658474e62f4566ccaa9373 | |
parent | 22770c84d5acd892c6a3302790f92f37f600c93e (diff) |
Revert 2010-05-25T15:54:[email protected]; regenerate release logs.
* lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Revert
2011-01-31 change.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | admin/ChangeLog | 2 | ||||
-rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
-rw-r--r-- | doc/lispintro/ChangeLog | 2 | ||||
-rw-r--r-- | doc/lispref/ChangeLog | 2 | ||||
-rw-r--r-- | doc/man/ChangeLog | 2 | ||||
-rw-r--r-- | doc/misc/ChangeLog | 2 | ||||
-rw-r--r-- | etc/ChangeLog | 2 | ||||
-rw-r--r-- | leim/ChangeLog | 2 | ||||
-rw-r--r-- | lib-src/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/ChangeLog | 7 | ||||
-rw-r--r-- | lisp/cedet/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/erc/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/mh-e/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/org/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/progmodes/cc-cmds.el | 31 | ||||
-rw-r--r-- | lisp/url/ChangeLog | 2 | ||||
-rw-r--r-- | lwlib/ChangeLog | 2 | ||||
-rw-r--r-- | msdos/ChangeLog | 2 | ||||
-rw-r--r-- | nextstep/ChangeLog | 2 | ||||
-rw-r--r-- | nt/ChangeLog | 2 | ||||
-rw-r--r-- | oldXMenu/ChangeLog | 2 | ||||
-rw-r--r-- | src/ChangeLog | 2 | ||||
-rw-r--r-- | test/ChangeLog | 2 |
24 files changed, 39 insertions, 43 deletions
@@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/admin/ChangeLog b/admin/ChangeLog index 741902d324..39a8a8f57d 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 73e2aca30f..69d3e03209 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 5056634070..70accbc066 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e91cf93e3f..a52a8e73dd 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 0c7079b291..394d580c1c 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 122a9ae292..c0bd2f2778 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/etc/ChangeLog b/etc/ChangeLog index 24e6e9cfc5..6e5bb392cc 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/leim/ChangeLog b/leim/ChangeLog index c9d7b437f2..03ffab9822 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c6d9fa73e5..73a63eeaec 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20ed72b2ce..6d711568fe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,12 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. +2011-03-07 Chong Yidong <[email protected]> + + * progmodes/cc-cmds.el (c-beginning-of-statement): Revert + 2011-01-31 change. + 2011-02-26 Eli Zaretskii <[email protected]> * international/mule-cmds.el (set-default-coding-systems): Use the diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 2f34afdb11..2d0cbb8159 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 000d48e519..9e467f4cc2 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index a983bca8e7..1c07be301b 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index db2d0e009c..7b5f9fc6a1 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 3f719aedb6..4deb5ca6af 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -2458,15 +2458,13 @@ function does not require the declaration to contain a brace block." (goto-char last) (throw 'done '(nil . nil))) - ;; Stop if we encounter a preprocessor line. Continue if we - ;; hit a naked # - ((and c-opt-cpp-prefix - (not macro-end) + ;; Stop if we encounter a preprocessor line. + ((and (not macro-end) (eq (char-after) ?#) (= (point) (c-point 'boi))) - (if (= (point) here) ; Not a macro, therefore naked #. - (forward-char) - (throw 'done '(t . macro-boundary)))) + (goto-char last) + ;(throw 'done (cons (eq (point) here) 'macro-boundary))) ; Changed 2003/3/26 + (throw 'done '(t . macro-boundary))) ;; Stop after a ';', '}', or "};" ((looking-at ";\\|};?") @@ -2582,19 +2580,12 @@ be more \"DWIM:ey\"." ;; Are we about to move backwards into or out of a ;; preprocessor command? If so, locate its beginning. (when (eq (cdr res) 'macro-boundary) - (setq macro-fence - (save-excursion - (if macro-fence - (progn - (end-of-line) - (and (not (eobp)) - (progn (c-skip-ws-forward) - (c-beginning-of-macro)) - (progn (c-end-of-macro) - (point)))) - (and (not (eobp)) - (c-beginning-of-macro) - (progn (c-end-of-macro) (point))))))) + (save-excursion + (beginning-of-line) + (setq macro-fence + (and (not (bobp)) + (progn (c-skip-ws-backward) (c-beginning-of-macro)) + (point))))) ;; Are we about to move backwards into a literal? (when (memq (cdr res) '(macro-boundary literal)) (setq range (c-ascertain-preceding-literal))) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 3b049a07a5..dc98640960 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index febd45b37f..5aa35f7144 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 1718bdeb0c..deec1a604f 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index cbdb559f7a..c0a08f844b 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/nt/ChangeLog b/nt/ChangeLog index fe1fc62f46..8e812addf0 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index f831e71c00..db1979e7e4 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/src/ChangeLog b/src/ChangeLog index 7a46109c9b..12ea037ee9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/test/ChangeLog b/test/ChangeLog index 284054fdf8..d20abc3ce8 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong <[email protected]> +2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. |