+2002-10-02 Stefan Monnier <monnier@cs.yale.edu>
+
+ * textmodes/outline.el (outline-1, outline-2, outline-3, outline-4)
+ (outline-5, outline-6, outline-7, outline-8): New faces.
+ (outline-font-lock-faces, outline-font-lock-levels): New vars.
+ (outline-font-lock-face): New fun.
+ (outline-font-lock-keywords): Use it.
+ (outline-font-lock-level): Remove.
+ (outline-mode, outline-next-preface, outline-next-heading)
+ (outline-previous-heading, outline-next-visible-heading):
+ Use shy group.
+ (outline-level) <var>: Update calling convention.
+ (outline-level) <fun>: Take advantage of it.
+ (outline-demote): Don't assume the match-data is still uptodate.
+ (outline-up-heading): Simplify and make sure the match data is
+ properly set at the end.
+
2002-10-02 Markus Rost <rost@math.ohio-state.edu>
- * progmodes/sh-script.el (sh-alias-alist): Use append instead of
- nconc.
+ * progmodes/sh-script.el (sh-alias-alist): Use append instead of nconc.
* startup.el (normal-top-level): Reset standard-value property of
`user-full-name' here.
toolbar/page-down.pbm, toolbar/page-down.xpm, toolbar/refile.pbm,
toolbar/refile.xpm, toolbar/repack.pbm, toolbar/repack.xpm,
toolbar/rescan.pbm, toolbar/rescan.xpm, toolbar/show.pbm,
- toolbar/show.xpm, toolbar/widen.pbm, toolbar/widen.xpm: Upgraded
- to mh-e version 6.1.1. Full ChangeLog available in
+ toolbar/show.xpm, toolbar/widen.pbm, toolbar/widen.xpm:
+ Upgraded to mh-e version 6.1.1. Full ChangeLog available in
http://prdownloads.sourceforge.net/mh-e/mh-e-6.1.tgz?download .
There were no user-visible changes in 6.1.1 from 6.1--only the
- section of the Makefile that installs the files into Emacs was
- changed.
+ section of the Makefile that installs the files into Emacs was changed.
+
+2002-10-01 Stefan Monnier <monnier@cs.yale.edu>
+
+ * pcvs.el (cvs-mode-find-file): Look up font-lock-face so it also
+ works when font-lock is turned off.
+
+ * jit-lock.el (jit-lock-fontify-now): Don't widen.
+ Let the jit-lock-functions do it if they want to.
2002-10-01 Juanma Barranquero <lektu@terra.es>
- * eshell/esh-module.el (eshell-load-defgroups): Add "no-byte-compile: t"
- to subdirs.el.
+ * eshell/esh-module.el (eshell-load-defgroups):
+ Add "no-byte-compile: t" to subdirs.el.
* makefile.w32-in (update-subdirs-CMD): Likewise.
(defvar outline-font-lock-keywords
'(;;
;; Highlight headings according to the level.
- (eval . (list (concat "^" outline-regexp ".+")
- 0 '(or (cdr (assq (outline-font-lock-level)
- ;; FIXME: this is silly!
- '((1 . font-lock-function-name-face)
- (2 . font-lock-variable-name-face)
- (3 . font-lock-keyword-face)
- (4 . font-lock-builtin-face)
- (5 . font-lock-comment-face)
- (6 . font-lock-constant-face)
- (7 . font-lock-type-face)
- (8 . font-lock-string-face))))
- font-lock-warning-face)
- nil t)))
+ (eval . (list (concat "^\\(?:" outline-regexp "\\).+")
+ 0 '(outline-font-lock-face) nil t)))
"Additional expressions to highlight in Outline mode.")
-(defun outline-font-lock-level ()
- (let ((count 1))
- (save-excursion
- (outline-back-to-heading t)
- (while (and (not (bobp))
- (not (eq (funcall outline-level) 1)))
- (outline-up-heading 1 t)
- (setq count (1+ count)))
- count)))
+(defface outline-1 '((t :inherit font-lock-function-name-face)) "Level 1.")
+(defface outline-2 '((t :inherit font-lock-variable-name-face)) "Level 2.")
+(defface outline-3 '((t :inherit font-lock-keyword-face)) "Level 3.")
+(defface outline-4 '((t :inherit font-lock-builtin-face)) "Level 4.")
+(defface outline-5 '((t :inherit font-lock-comment-face)) "Level 5.")
+(defface outline-6 '((t :inherit font-lock-constant-face)) "Level 6.")
+(defface outline-7 '((t :inherit font-lock-type-face)) "Level 7.")
+(defface outline-8 '((t :inherit font-lock-string-face)) "Level 8.")
+
+(defvar outline-font-lock-faces
+ [outline-1 outline-2 outline-3 outline-4
+ outline-5 outline-6 outline-7 outline-8])
+
+(defvar outline-font-lock-levels nil)
+(make-variable-buffer-local 'outline-font-lock-levels)
+
+(defun outline-font-lock-face ()
+ ;; (save-excursion
+ ;; (outline-back-to-heading t)
+ ;; (let* ((count 0)
+ ;; (start-level (funcall outline-level))
+ ;; (level start-level)
+ ;; face-level)
+ ;; (while (not (setq face-level
+ ;; (if (or (bobp) (eq level 1)) 0
+ ;; (cdr (assq level outline-font-lock-levels)))))
+ ;; (outline-up-heading 1 t)
+ ;; (setq count (1+ count))
+ ;; (setq level (funcall outline-level)))
+ ;; ;; Remember for later.
+ ;; (unless (zerop count)
+ ;; (setq face-level (+ face-level count))
+ ;; (push (cons start-level face-level) outline-font-lock-levels))
+ ;; (condition-case nil
+ ;; (aref outline-font-lock-faces face-level)
+ ;; (error font-lock-warning-face))))
+ (save-excursion
+ (goto-char (match-beginning 0))
+ (looking-at outline-regexp)
+ (condition-case nil
+ (aref outline-font-lock-faces (1- (funcall outline-level)))
+ (error font-lock-warning-face))))
(defvar outline-view-change-hook nil
"Normal hook to be run after outline visibility changes.")
;; Cause use of ellipses for invisible text.
(add-to-invisibility-spec '(outline . t))
(set (make-local-variable 'paragraph-start)
- (concat paragraph-start "\\|\\(" outline-regexp "\\)"))
+ (concat paragraph-start "\\|\\(?:" outline-regexp "\\)"))
;; Inhibit auto-filling of header lines.
(set (make-local-variable 'auto-fill-inhibit-regexp) outline-regexp)
(set (make-local-variable 'paragraph-separate)
- (concat paragraph-separate "\\|\\(" outline-regexp "\\)"))
+ (concat paragraph-separate "\\|\\(?:" outline-regexp "\\)"))
(set (make-local-variable 'font-lock-defaults)
'(outline-font-lock-keywords t nil nil backward-paragraph))
(setq imenu-generic-expression
\f
(defcustom outline-level 'outline-level
"*Function of no args to compute a header's nesting level in an outline.
-It can assume point is at the beginning of a header line."
+It can assume point is at the beginning of a header line and that the match
+data reflects the `outline-regexp'."
:type 'function
:group 'outlines)
Point must be at the beginning of a header line.
This is actually either the level specified in `outline-heading-alist'
or else the number of characters matched by `outline-regexp'."
- (save-excursion
- (if (not (looking-at outline-regexp))
- ;; This should never happen
- 1000
- (or (cdr (assoc (match-string 0) outline-heading-alist))
- (- (match-end 0) (match-beginning 0))))))
+ (or (cdr (assoc (match-string 0) outline-heading-alist))
+ (- (match-end 0) (match-beginning 0))))
(defun outline-next-preface ()
"Skip forward to just before the next heading line.
If there's no following heading line, stop before the newline
at the end of the buffer."
- (if (re-search-forward (concat "\n\\(" outline-regexp "\\)")
+ (if (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
nil 'move)
(goto-char (match-beginning 0)))
(if (and (bolp) (not (bobp)))
(defun outline-next-heading ()
"Move to the next (possibly invisible) heading line."
(interactive)
- (if (re-search-forward (concat "\n\\(" outline-regexp "\\)")
+ (if (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
nil 'move)
(goto-char (1+ (match-beginning 0)))))
(defun outline-previous-heading ()
"Move to the previous (possibly invisible) heading line."
(interactive)
- (re-search-backward (concat "^\\(" outline-regexp "\\)")
+ (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
nil 'move))
(defsubst outline-invisible-p ()
(let (found)
(save-excursion
(while (not found)
- (or (re-search-backward (concat "^\\(" outline-regexp "\\)")
+ (or (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
nil t)
(error "before first heading"))
(setq found (and (or invisible-ok (not (outline-invisible-p)))
(progn
(outline-next-heading)
(<= (funcall outline-level) level)))))
- (unless (eobp) (match-string 0))))
+ (unless (eobp)
+ (looking-at outline-regexp)
+ (match-string 0))))
(save-match-data
;; Bummer!! There is no lower heading in the buffer.
;; Let's try to invent one by repeating the first char.
(end-of-line))
(while (and (not (bobp)) (< arg 0))
(while (and (not (bobp))
- (re-search-backward (concat "^\\(" outline-regexp "\\)")
+ (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
nil 'move)
(outline-invisible-p)))
(setq arg (1+ arg)))
(while (and (not (eobp)) (> arg 0))
(while (and (not (eobp))
- (re-search-forward (concat "^\\(" outline-regexp "\\)")
+ (re-search-forward (concat "^\\(?:" outline-regexp "\\)")
nil 'move)
(outline-invisible-p)))
(setq arg (1- arg)))
If INVISIBLE-OK is non-nil, also consider invisible lines."
(interactive "p")
(outline-back-to-heading invisible-ok)
- (if (eq (funcall outline-level) 1)
- (error "Already at top level of the outline"))
- (while (and (> (funcall outline-level) 1)
- (> arg 0)
- (not (bobp)))
- (let ((present-level (funcall outline-level)))
- (while (and (not (< (funcall outline-level) present-level))
- (not (bobp)))
- (if invisible-ok
- (outline-previous-heading)
- (outline-previous-visible-heading 1)))
- (setq arg (- arg 1)))))
+ (let ((start-level (funcall outline-level)))
+ (if (eq start-level 1)
+ (error "Already at top level of the outline"))
+ (while (and (> start-level 1) (> arg 0) (not (bobp)))
+ (let ((level start-level))
+ (while (not (or (< level start-level) (bobp)))
+ (if invisible-ok
+ (outline-previous-heading)
+ (outline-previous-visible-heading 1))
+ (setq level (funcall outline-level)))
+ (setq start-level level))
+ (setq arg (- arg 1))))
+ (looking-at outline-regexp))
(defun outline-forward-same-level (arg)
"Move forward to the ARG'th subheading at same level as this one.
projects / emacs.git / commitdiff