[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-commit] Changes to auctex/tex.el,v
From: |
Ralf Angeli |
Subject: |
[AUCTeX-commit] Changes to auctex/tex.el,v |
Date: |
Fri, 29 Dec 2006 13:39:53 +0000 |
CVSROOT: /cvsroot/auctex
Module name: auctex
Changes by: Ralf Angeli <angeli> 06/12/29 13:39:53
Index: tex.el
===================================================================
RCS file: /cvsroot/auctex/auctex/tex.el,v
retrieving revision 5.591
retrieving revision 5.592
diff -u -b -r5.591 -r5.592
--- tex.el 24 Nov 2006 06:53:21 -0000 5.591
+++ tex.el 29 Dec 2006 13:39:53 -0000 5.592
@@ -2395,6 +2395,8 @@
(regexp-quote TeX-esc)
(regexp-quote TeX-esc)
"\\)*\\)\\(%+[ \t]*\\)"))
+ (set (make-local-variable 'comment-end-skip) "[ \t]*\\(\\s>\\|\n\\)")
+ (set (make-local-variable 'comment-use-syntax) t)
;; `comment-padding' is defined here as an integer for compatibility
;; reasons because older Emacsen could not cope with a string.
(make-local-variable 'comment-padding)
@@ -3697,6 +3699,10 @@
:active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
:keys "C-c C-o C-e"
:help "Hide the environment containing point"]
+ ["Hide Current Comment" TeX-fold-comment
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :keys "C-c C-o C-c"
+ :help "Hide the comment containing point"]
"-"
["Show All in Current Buffer" TeX-fold-clearout-buffer
:active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
@@ -3889,10 +3895,7 @@
(interactive "*r\nP")
(funcall (if (save-excursion ;; check for already commented region
(goto-char beg)
- ;; `comment-forward' is not available in Emacs 20
- (if (fboundp 'comment-forward)
- (comment-forward (point-max))
- (forward-comment (point-max)))
+ (TeX-comment-forward (point-max))
(<= end (point)))
'TeX-uncomment-region 'TeX-comment-region)
beg end arg)))
@@ -4054,6 +4057,26 @@
(unless limit (setq limit (point-min)))
(TeX-forward-comment-skip (- count) limit))
+;; Taken from `comment-forward' in Emacs' CVS on 2006-12-26. Used as
+;; a compatibility function for XEmacs 21.4.
+(defun TeX-comment-forward (&optional n)
+ "Skip forward over N comments.
+Just like `forward-comment' but only for positive N
+and can use regexps instead of syntax."
+ (if (fboundp 'comment-forward)
+ (comment-forward n)
+ (setq n (or n 1))
+ (if (< n 0) (error "No comment-backward")
+ (if comment-use-syntax (forward-comment n)
+ (while (> n 0)
+ (setq n
+ (if (or (forward-comment 1)
+ (and (looking-at comment-start-skip)
+ (goto-char (match-end 0))
+ (re-search-forward comment-end-skip nil 'move)))
+ (1- n) -1)))
+ (= n 0)))))
+
(defun TeX-comment-padding-string ()
"Return comment padding as a string.
The variable `comment-padding' can hold an integer or a string.
@@ -4346,6 +4369,29 @@
(buffer-substring-no-properties
(point) (progn (skip-chars-forward "@A-Za-z") (point)))))))
+(defvar TeX-search-forward-comment-start-function nil
+ "Function to find the start of a comment.
+The function should accept an optional argument for specifying
+the limit of the search. It should return the position just
+before the comment if one is found and nil otherwise. Point
+should not be moved.")
+(make-variable-buffer-local 'TeX-search-forward-comment-start-function)
+
+(defun TeX-search-forward-comment-start (&optional limit)
+ "Search forward for a comment start from current position till LIMIT.
+If LIMIT is omitted, search till the end of the buffer.
+
+The search relies on `TeX-comment-start-regexp' being set
+correctly for the current mode.
+
+Set `TeX-search-forward-comment-start-defun' in order to override
+the default implementation."
+ (if TeX-search-forward-comment-start-function
+ (funcall TeX-search-forward-comment-start-function limit)
+ (setq limit (or limit (point-max)))
+ (when (TeX-re-search-forward-unescaped TeX-comment-start-regexp limit t)
+ (match-beginning 0))))
+
;;; Fonts
(defcustom TeX-font-list '((?\C-b "{\\bf " "}")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [AUCTeX-commit] Changes to auctex/tex.el,v,
Ralf Angeli <=