[Emacs-diffs] /srv/bzr/emacs/trunk r103567: * lisp/progmodes/gud.el (gdb-script-syntax-propertize-function):

[Stefan Monnier]

------------------------------------------------------------
revno: 103567
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2011-03-06 15:55:52 -0500
message:
  * lisp/progmodes/gud.el (gdb-script-syntax-propertize-function):
  Don't change the syntax of a \n that closes a comment.
modified:
  lisp/ChangeLog
  lisp/progmodes/gud.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-06 20:19:39 +0000
+++ b/lisp/ChangeLog    2011-03-06 20:55:52 +0000
@@ -1,3 +1,8 @@
+2011-03-06  Stefan Monnier  <address@hidden>
+
+       * progmodes/gud.el (gdb-script-syntax-propertize-function):
+       Don't change the syntax of a \n that closes a comment (bug#8169).
+
 2011-03-06  Chong Yidong  <address@hidden>
 
        * emacs-lisp/package-x.el (package-archive-upload-base): Make it a
@@ -25,8 +30,8 @@
 
 2011-03-06  Jay Belanger  <address@hidden>
 
-       * calc/calc-ext.el (calc-init-extensions): Rename
-       calc-logunits-dblevel and calc-logunits-nplevel to calc-dblevel
+       * calc/calc-ext.el (calc-init-extensions):
+       Rename calc-logunits-dblevel and calc-logunits-nplevel to calc-dblevel
        and calc-nplevel, respectively.  Add keybindings for calc-spn,
        calc-midi and calc-freq.  Add autoloads for calcFunc-spn,
        calcFunc-midi, calcFunc-freq, calc-spn, calc-midi and calc-freq.

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2011-03-04 16:19:56 +0000
+++ b/lisp/progmodes/gud.el     2011-03-06 20:55:52 +0000
@@ -3127,7 +3127,9 @@
    ("^document\\s-.*\\(\n\\)" (1 "< b"))
    ("^end\\(\\>\\)"
     (1 (ignore
-        (unless (eq (match-beginning 0) (point-min))
+        (when (and (> (match-beginning 0) (point-min))
+                   (eq 1 (nth 7 (save-excursion
+                                  (syntax-ppss (1- (match-beginning 0)))))))
           ;; We change the \n in front, which is more difficult, but results
           ;; in better highlighting.  If the doc is empty, the single \n is
           ;; both the beginning and the end of the docstring, which can't be