[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/meta-mode.el,v
From: |
Michael Cadilhac |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/meta-mode.el,v |
Date: |
Mon, 10 Sep 2007 17:25:48 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Cadilhac <cadilhac> 07/09/10 17:25:48
Index: meta-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/meta-mode.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- meta-mode.el 10 Sep 2007 14:21:25 -0000 1.21
+++ meta-mode.el 10 Sep 2007 17:25:48 -0000 1.22
@@ -652,7 +652,7 @@
;; Ignore comments.
(while (and (looking-at comment-start) (not (bobp)))
(skip-chars-backward "\n\t\f ")
- (if (not (bobp))
+ (when (not (bobp))
(move-to-column (current-indentation)))))
(defun meta-indent-unfinished-line ()
@@ -660,7 +660,11 @@
(save-excursion
(end-of-line)
;; Skip backward the comments.
- (while (search-backward comment-start (point-at-bol) t))
+ (let ((point-not-in-string (point)))
+ (while (search-backward comment-start (point-at-bol) t)
+ (unless (meta-indent-in-string-p)
+ (setq point-not-in-string (point))))
+ (goto-char point-not-in-string))
;; Search for the end of the previous expression.
(if (search-backward ";" (point-at-bol) t)
(progn (while (and (meta-indent-in-string-p)