mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

*** empty log message ***

Browse Source
This commit is contained in:
Stefan Monnier 2005-11-20 18:09:09 +00:00
parent 1c4b7278d6
commit 3cc4b07630
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-20 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (blink-matching-open):
* paren.el (show-paren-function): Allow new paren-class info.
2005-11-20 Chong Yidong <cyd@stupidchicken.com>
* faces.el: Revert 2005-11-17 change. :ignore-defface is now

29
lisp/newcomment.el
View File

@ -478,19 +478,22 @@ Point is assumed to be just at the end of a comment."
(if (bolp)
;; comment-end = ""
(progn (backward-char) (skip-syntax-backward " "))
(let ((end (point)))
(beginning-of-line)
(save-restriction
(narrow-to-region (point) end)
(if (re-search-forward (concat comment-end-skip "\\'") nil t)
(goto-char (match-beginning 0))
;; comment-end-skip not found probably because it was not set right.
;; Since \\s> should catch the single-char case, we'll blindly
;; assume we're at the end of a two-char comment-end.
(goto-char (point-max))
(backward-char 2)
(skip-chars-backward (string (char-after)))
(skip-syntax-backward " "))))))
(cond
((save-restriction
(beginning-of-line)
(narrow-to-region (point) end)
(re-search-forward (concat comment-end-skip "\\'") nil t))
(goto-char (match-beginning 0)))
;; comment-end-skip not found. Maybe we're at EOB which implicitly
;; closes the comment.
((eobp) (skip-syntax-backward " "))
(t
;; else comment-end-skip was not found probably because it was not
;; set right. Since \\s> should catch the single-char case, we'll
;; blindly assume we're at the end of a two-char comment-end.
(backward-char 2)
(skip-chars-backward (string (char-after)))
(skip-syntax-backward " ")))))
;;;;
;;;; Commands