[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109945: AWK Mode: make auto-newline
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109945: AWK Mode: make auto-newline work when there's "==" in the pattern. |
Date: |
Sat, 08 Sep 2012 20:00:13 +0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109945
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-08 20:00:13 +0000
message:
AWK Mode: make auto-newline work when there's "==" in the pattern.
cc-cmds.el (c-point-syntax): Handle virtual semicolons correctly.
cc-engine.el (c-guess-basic-syntax CASE 5A.3): Test more rigorously for
"=" token.
modified:
lisp/ChangeLog
lisp/progmodes/cc-cmds.el
lisp/progmodes/cc-engine.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-09-08 15:13:14 +0000
+++ b/lisp/ChangeLog 2012-09-08 20:00:13 +0000
@@ -1,3 +1,11 @@
+2012-09-08 Alan Mackenzie <address@hidden>
+
+ AWK Mode: make auto-newline work when there's "==" in the pattern.
+ * progmodes/cc-cmds.el (c-point-syntax): Handle virtual semicolons
+ correctly.
+ * progmodes/cc-engine.el (c-guess-basic-syntax CASE 5A.3): Test
+ more rigorously for "=" token.
+
2012-09-08 Dmitry Gutov <address@hidden>
* progmodes/ruby-mode.el (ruby-match-expression-expansion): Only
=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2012-07-21 06:13:23 +0000
+++ b/lisp/progmodes/cc-cmds.el 2012-09-08 20:00:13 +0000
@@ -493,13 +493,16 @@
(insert-char ?\n 1)
;; In AWK (etc.) or in a macro, make sure this CR hasn't changed
;; the syntax. (There might already be an escaped NL there.)
- (when (or (c-at-vsemi-p (1- (point)))
- (let ((pt (point)))
- (save-excursion
- (backward-char)
- (and (c-beginning-of-macro)
- (progn (c-end-of-macro)
- (< (point) pt))))))
+ (when (or
+ (save-excursion
+ (c-skip-ws-backward (c-point 'bopl))
+ (c-at-vsemi-p))
+ (let ((pt (point)))
+ (save-excursion
+ (backward-char)
+ (and (c-beginning-of-macro)
+ (progn (c-end-of-macro)
+ (< (point) pt))))))
(backward-char)
(insert-char ?\\ 1)
(forward-char))
=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el 2012-07-17 11:40:23 +0000
+++ b/lisp/progmodes/cc-engine.el 2012-09-08 20:00:13 +0000
@@ -9579,12 +9579,12 @@
(setq tmpsymbol nil)
(while (and (> (point) placeholder)
(zerop (c-backward-token-2 1 t))
- (/= (char-after) ?=))
+ (not (looking-at "=\\([^=]\\|$\\)")))
(and c-opt-inexpr-brace-list-key
(not tmpsymbol)
(looking-at c-opt-inexpr-brace-list-key)
(setq tmpsymbol 'topmost-intro-cont)))
- (eq (char-after) ?=))
+ (looking-at "=\\([^=]\\|$\\)"))
(looking-at c-brace-list-key))
(save-excursion
(while (and (< (point) indent-point)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109945: AWK Mode: make auto-newline work when there's "==" in the pattern.,
Alan Mackenzie <=