mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
* lisp/outline.el: Small fixes.
(outline-font-lock-keywords, outline-minor-mode-highlight-buffer): Fall back to eol when there is no newline at the end of outline at eob. (outline-after-change-functions): Remove the temporarily added variable. (outline--fix-buttons): Remove its last use.
This commit is contained in:
parent
7469ee7e27
commit
4fad95d9fc
1 changed files with 14 additions and 13 deletions
|
|
@ -267,10 +267,13 @@ non-nil and point is located on the heading line.")
|
||||||
;; This is equivalent to adding ".*" in the regexp below.
|
;; This is equivalent to adding ".*" in the regexp below.
|
||||||
(set-match-data
|
(set-match-data
|
||||||
(list (match-beginning 0)
|
(list (match-beginning 0)
|
||||||
(save-excursion
|
(or (save-excursion
|
||||||
(save-match-data
|
(save-match-data
|
||||||
(re-search-forward
|
(re-search-forward
|
||||||
(concat ".*" outline-heading-end-regexp) nil t)))))
|
(concat ".*" outline-heading-end-regexp) nil t)))
|
||||||
|
;; Fall back to eol when there is no newline
|
||||||
|
;; at the end of outline at eob.
|
||||||
|
(pos-eol))))
|
||||||
ret)))
|
ret)))
|
||||||
(concat "^\\(?:" outline-regexp "\\).*" outline-heading-end-regexp))
|
(concat "^\\(?:" outline-regexp "\\).*" outline-heading-end-regexp))
|
||||||
0 '(if outline-minor-mode
|
0 '(if outline-minor-mode
|
||||||
|
|
@ -531,10 +534,13 @@ outline font-lock faces to those of major mode."
|
||||||
;; This is equivalent to adding ".*" in the regexp above.
|
;; This is equivalent to adding ".*" in the regexp above.
|
||||||
(set-match-data
|
(set-match-data
|
||||||
(list (match-beginning 0)
|
(list (match-beginning 0)
|
||||||
(save-excursion
|
(or (save-excursion
|
||||||
(save-match-data
|
(save-match-data
|
||||||
(re-search-forward
|
(re-search-forward
|
||||||
(concat ".*" outline-heading-end-regexp) nil t)))))
|
(concat ".*" outline-heading-end-regexp) nil t)))
|
||||||
|
;; Fall back to eol when there is no newline
|
||||||
|
;; at the end of outline at eob.
|
||||||
|
(pos-eol))))
|
||||||
ret)
|
ret)
|
||||||
(re-search-forward regexp nil t))
|
(re-search-forward regexp nil t))
|
||||||
(let ((overlay (make-overlay (match-beginning 0) (match-end 0))))
|
(let ((overlay (make-overlay (match-beginning 0) (match-end 0))))
|
||||||
|
|
@ -2030,12 +2036,7 @@ With a prefix argument, show headings up to that LEVEL."
|
||||||
from to)
|
from to)
|
||||||
(restore-buffer-modified-p modified))))
|
(restore-buffer-modified-p modified))))
|
||||||
|
|
||||||
(defvar outline-after-change-functions nil
|
|
||||||
"Hook run before updating buttons in a region in outline-mode.
|
|
||||||
Called with three arguments (BEG END DUMMY). Don't use DUMMY.")
|
|
||||||
|
|
||||||
(defun outline--fix-buttons (&optional beg end)
|
(defun outline--fix-buttons (&optional beg end)
|
||||||
(run-hook-with-args 'outline-after-change-functions beg end 0)
|
|
||||||
;; Handle whole lines
|
;; Handle whole lines
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(setq beg (if (null beg) (point-min) (goto-char beg) (pos-bol)))
|
(setq beg (if (null beg) (point-min) (goto-char beg) (pos-bol)))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue