Revert 2010-05-25T15:54:53Z!juri@jurta.org; regenerate release logs.

* lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Revert
2011-01-31 change.

diff --git a/ChangeLog b/ChangeLog
index 0c70bf296a84e056f311f033561317678380e9dc..4b3dcc3af640d05901a38fd523761c8238b760a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 741902d3249a1b7b0f523db2da49b9198e9646d6..39a8a8f57d52ca44d994bbebdf006fa584b0606e 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 73e2aca30f09b6760ccd3e74600037ac83462ff9..69d3e03209c2e9b67ec35cff74e5ef15de656e95 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 50566340701c6d630e4b2cb55d260b61432af3bd..70accbc0669bc3986597a82e3c657b35356adbcf 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e91cf93e3f050eeb874a1f4b15e6b21df94a8687..a52a8e73dd1601f7fa262bf84f50c85d06d7019d 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 0c7079b29130e1bc17a6b74b4a0fae4c5cb43aae..394d580c1c9e29defdb3e1bf87c0921453337c2f 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 122a9ae2920896fba6c89bd6959533d7fd7a4178..c0bd2f2778cfd64ee50646e6c038a7a6a737339f 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 24e6e9cfc53b64e4c05eeef6335656ebefd86441..6e5bb392cc8fefdc32bd844f235b6b38772d51ac 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/leim/ChangeLog b/leim/ChangeLog
index c9d7b437f270cf9f84e32ee6769d95a199bc30c5..03ffab982207d3be0edbf00f773e6274d451b05e 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c6d9fa73e53cbdbdbf6180c038db1b6435cb91b8..73a63eeaec46cbbebf8828e564b6b408c37e6627 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20ed72b2ce6cae82a2252537ef22766fcb415ca9..6d711568fea1d205d1a85c4128fe2d671fe8c759 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * progmodes/cc-cmds.el (c-beginning-of-statement): Revert
+       2011-01-31 change.
+
 2011-02-26  Eli Zaretskii  <eliz@gnu.org>
 
        * international/mule-cmds.el (set-default-coding-systems): Use the

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 2f34afdb112085691dd973a6eeac98aff27a5a3b..2d0cbb8159b321278a96c179a5e91671e584f124 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 000d48e51985e988a51dc1488244ac0735fa70c1..9e467f4cc25ea7f35d1b0f0e488173fe601fa240 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index a983bca8e7a305e924b8d915c33c381cf000fb07..1c07be301b1a3172d482bbb26841467cbe6c9823 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index db2d0e009c04042c4ea26ed50ecaf4c70c944dd2..7b5f9fc6a15c1b244d21ecd4d1b61e3d26f73114 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 3f719aedb62e651b11e9c3a25692a4f4de46daab..4deb5ca6afe068ac5f7e978c6eec2043dff41983 100644 (file)
--- 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 3b049a07a5069f0b51c1b850201fb7c2ddf6b80f..dc98640960b90dc3afc9c67ad63dac884ae472f5 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index febd45b37f149f3c5ba7aa3115eee94c78ca75ce..5aa35f714466c2e89bffecbf7d528a71a0192437 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 1718bdeb0c1dd1801bedfba85fd69b8b362f51cb..deec1a604f5f4d589b4e3d06426604d353135e91 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index cbdb559f7a5399e59eb135aefae7d91cc753a212..c0a08f844ba18f722cefe7140aa1bbaee50bb300 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/nt/ChangeLog b/nt/ChangeLog
index fe1fc62f46f1ce08d41bce841cd47970a5f27f56..8e812addf0277aeabe61998f66cbc19ca78706e4 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index f831e71c001a300aaaf7f0c1de20c1294e85b0e6..db1979e7e413ab1bbc36264585eb6bc5435ca656 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 7a46109c9b13a7b3e1d2fe601905115de175469c..12ea037ee91aea1d398129b46e8537da7ef16f82 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 

diff --git a/test/ChangeLog b/test/ChangeLog
index 284054fdf8ee78b0971e63db59ecec01ae9f0fb5..d20abc3ce87afc4c29119e43444cd72ad974b256 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.