7 files changed, 22 insertions, 26 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20ed72b2ce6..6d711568fea 100644
--- 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 2f34afdb112..2d0cbb8159b 100644
--- 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 000d48e5198..9e467f4cc25 100644
--- 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 a983bca8e7a..1c07be301b1 100644
--- 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 db2d0e009c0..7b5f9fc6a15 100644
--- 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 3f719aedb62..4deb5ca6afe 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 3b049a07a50..dc98640960b 100644
--- 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.