mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-24 19:03:29 +00:00
Code Issues Releases Activity

(outline-invent-heading): New fun.

Browse Source 
(outline-promote, outline-demote): Use it.
(outline-move-subtree-down): Remove unused vars `re' and `txt'.
(outline-end-of-subtree): Remove unused var `opoint'.
This commit is contained in:
Stefan Monnier 2005-08-26 15:31:59 +00:00
parent 8248b7cace
commit 797d92ed1f
2 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/ChangeLog
View File

@ -1,14 +1,21 @@
2005-08-26 Stefan Monnier <monnier@iro.umontreal.ca>
* outline.el (outline-invent-heading): New fun.
(outline-promote, outline-demote): Use it.
(outline-move-subtree-down): Remove unused vars `re' and `txt'.
(outline-end-of-subtree): Remove unused var `opoint'.
2005-08-26 David Reitter <david.reitter@gmail.com>
* menu-bar.el (truncate-lines, write-file, print-buffer)
(ps-print-buffer-faces, ps-print-buffer, split-window): Disable
menu items when the frame they refer to is invisible, or when they
refer to a buffer and the minibuffer is selected.
(ps-print-buffer-faces, ps-print-buffer, split-window):
Disable menu items when the frame they refer to is invisible, or when
they refer to a buffer and the minibuffer is selected.
2005-08-26 Pavel Kobiakov <pk_at_work@yahoo.com>
* progmodes/flymake.el (flymake-highlight-err-lines): Use
save-excursion around flymake-highlight-line to preserve point.
* progmodes/flymake.el (flymake-highlight-err-lines):
Use save-excursion around flymake-highlight-line to preserve point.
2005-08-26 Eli Zaretskii <eliz@gnu.org>

52
lisp/outline.el
View File

@ -453,6 +453,20 @@ If INVISIBLE-OK is non-nil, an invisible heading line is ok too."
(save-excursion (newline-and-indent)))
(run-hooks 'outline-insert-heading-hook)))
(defun outline-invent-heading (head up)
(save-match-data
;; Let's try to invent one by repeating or deleting the last char.
(let ((new-head (if up (substring head 0 -1)
(concat head (substring head -1)))))
(if (string-match (concat "\\`\\(?:" outline-regexp "\\)")
new-head)
;; Why bother checking that it is indeed higher/lower level ?
new-head
;; Didn't work, so ask what to do.
(read-string (format "%s heading for `%s': "
(if up "Parent" "Demoted") head)
head nil nil t)))))
(defun outline-promote (&optional children)
"Promote headings higher up the tree.
If prefix argument CHILDREN is given, promote also all the children.
@ -481,18 +495,8 @@ in the region."
(outline-up-heading 1 t)
(and (= (1- level) (funcall outline-level))
(match-string-no-properties 0))))
;; Bummer!! There is no lower level heading.
;; Let's try to invent one by deleting the last char.
(save-match-data
(let ((new-head (substring head 0 -1)))
(if (string-match (concat "\\`\\(?:" outline-regexp "\\)")
new-head)
;; Why bother checking that it is indeed lower level ?
new-head
;; Didn't work, so ask what to do.
(read-string (format "Parent heading for `%s': "
head)
head nil nil t)))))))
;; Bummer!! There is no lower level heading.
(outline-invent-heading head 'up))))
(unless (rassoc level outline-heading-alist)
(push (cons head level) outline-heading-alist))
@ -532,18 +536,8 @@ in the region."
(unless (eobp)
(looking-at outline-regexp)
(match-string-no-properties 0))))
(save-match-data
;; Bummer!! There is no higher-level heading in the buffer.
;; Let's try to invent one by repeating the last char.
(let ((new-head (concat head (substring head -1))))
(if (string-match (concat "\\`\\(?:" outline-regexp "\\)")
new-head)
;; Why bother checking that it is indeed higher level ?
new-head
;; Didn't work, so ask what to do.
(read-string (format "Demoted heading for `%s': "
head)
head nil nil t)))))))
;; Bummer!! There is no higher-level heading in the buffer.
(outline-invent-heading head nil))))
(unless (rassoc level outline-heading-alist)
(push (cons head level) outline-heading-alist))
@ -610,12 +604,11 @@ the match data is set appropriately."
(defun outline-move-subtree-down (&optional arg)
"Move the currrent subtree down past ARG headlines of the same level."
(interactive "p")
(let ((re (concat "^\\(?:" outline-regexp "\\)"))
(movfunc (if (> arg 0) 'outline-get-next-sibling
(let ((movfunc (if (> arg 0) 'outline-get-next-sibling
'outline-get-last-sibling))
(ins-point (make-marker))
(cnt (abs arg))
beg end txt folded)
beg end folded)
;; Select the tree
(outline-back-to-heading)
(setq beg (point))
@ -883,8 +876,7 @@ Show the heading too, if it is currently invisible."
(defun outline-end-of-subtree ()
(outline-back-to-heading)
(let ((opoint (point))
(first t)
(let ((first t)
(level (funcall outline-level)))
(while (and (not (eobp))
(or first (> (funcall outline-level) level)))
@ -1044,5 +1036,5 @@ convenient way to make a table of contents of the buffer."
(provide 'outline)
(provide 'noutline)
;;; arch-tag: 1724410e-7d4d-4f46-b801-49e18171e874
;; arch-tag: 1724410e-7d4d-4f46-b801-49e18171e874
;;; outline.el ends here