diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-03-07 15:29:03 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-03-07 15:29:03 -0500 |
| commit | 7600cf45994d0c1d6fb42d8b0ddf725d9600bd1d (patch) | |
| tree | 17255811745787c147cce24e73983658669a8f5c /lisp/progmodes/cc-cmds.el | |
| parent | fa7062f6539a628343802d7d7dbf86befe3c2626 (diff) | |
| download | emacs-7600cf45994d0c1d6fb42d8b0ddf725d9600bd1d.tar.gz | |
Fix a cc-cmds.el patch from acm that I applied incorrectly (Bug#7595).
* lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect
application of patch from Alan Mackenzie (Bug#7595).
Diffstat (limited to 'lisp/progmodes/cc-cmds.el')
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 5ac30bc28ce..0f873e678c3 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -2564,19 +2564,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))) |