aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2002-09-11 09:32:07 +0000
committerJuanma Barranquero2002-09-11 09:32:07 +0000
commit4679af47c14f53c45f500ac9e9d4fd07d96d1baa (patch)
treeadce5f2cb0597deb54e21a27e2d35a11ad68de53
parentcf681de6e5fe3919f94e742662d0aaefe296f286 (diff)
downloademacs-4679af47c14f53c45f500ac9e9d4fd07d96d1baa.tar.gz
emacs-4679af47c14f53c45f500ac9e9d4fd07d96d1baa.zip
(uncomment-region): Fix let/let* use.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/newcomment.el28
2 files changed, 18 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28f9c38ebb0..0fd83a53e1a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12002-09-11 Juanma Barranquero <lektu@terra.es>
2
3 * newcomment.el (uncomment-region): Fix let/let* use.
4
12002-09-11 Simon Josefsson <jas@extundo.com> 52002-09-11 Simon Josefsson <jas@extundo.com>
2 6
3 * gud.el (gud-gdb-massage-args): Don't secretly add -fullname. 7 * gud.el (gud-gdb-massage-args): Don't secretly add -fullname.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 01cf5bdaa86..51dd4c5c20e 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -622,22 +622,22 @@ comment markers."
622 (save-excursion 622 (save-excursion
623 (goto-char beg) 623 (goto-char beg)
624 (setq end (copy-marker end)) 624 (setq end (copy-marker end))
625 (let ((numarg (prefix-numeric-value arg)) 625 (let* ((numarg (prefix-numeric-value arg))
626 (ccs comment-continue) 626 (ccs comment-continue)
627 (srei (comment-padright ccs 're)) 627 (srei (comment-padright ccs 're))
628 (sre (and srei (concat "^\\s-*?\\(" srei "\\)"))) 628 (sre (and srei (concat "^\\s-*?\\(" srei "\\)")))
629 spt) 629 spt)
630 (while (and (< (point) end) 630 (while (and (< (point) end)
631 (setq spt (comment-search-forward end t))) 631 (setq spt (comment-search-forward end t)))
632 (let* ((ipt (point)) 632 (let ((ipt (point))
633 ;; Find the end of the comment. 633 ;; Find the end of the comment.
634 (ept (progn 634 (ept (progn
635 (goto-char spt) 635 (goto-char spt)
636 (unless (comment-forward) 636 (unless (comment-forward)
637 (error "Can't find the comment end")) 637 (error "Can't find the comment end"))
638 (point))) 638 (point)))
639 (box nil) 639 (box nil)
640 (box-equal nil)) ;Whether we might be using `=' for boxes. 640 (box-equal nil)) ;Whether we might be using `=' for boxes.
641 (save-restriction 641 (save-restriction
642 (narrow-to-region spt ept) 642 (narrow-to-region spt ept)
643 643