emacs: lisp/allout.el comparison

comparison lisp/allout.el @ 73003:ec72ab6f5541

* allout.el (allout-unprotected): Let inhibit-read-only only when buffer-read-only isn't set. (allout-annotate-hidden): Enable topic annotation during copies even when the buffer is read-only, eg for topic copies. Ensure that the loop advances, even when the span extends beyond the deletion region. (allout-toggle-subtree-encryption): Use allout-structure-added-hook rather than allout-exposure-changed-hook, as a stronger assertion. (allout-keybindings-list): Add bindings for allout-copy-line-as-kill and allout-copy-topic-as-kill. (allout-copy-line-as-kill, allout-copy-topic-as-kill): copy wrappers for allout-kill-line and allout-kill-topic. (allout-listify-exposed): Position correctly to accumulate lines.

author	Chong Yidong <cyd@stupidchicken.com>
date	Tue, 19 Sep 2006 21:55:44 +0000
parents	17942cb3949e
children	16a7031b0447 b5c13d1564a9

comparison

equal deleted inserted replaced

-:b3a72607819d
+:ec72ab6f5541
 ("<" allout-shift-out)
 ("\C-m" allout-rebullet-topic)
 ("*" allout-rebullet-current-heading)
 ("#" allout-number-siblings)
 ("\C-k" allout-kill-line t)
+("\M-k" allout-copy-line-as-kill t)
 ("\C-y" allout-yank t)
 ("\M-y" allout-yank-pop t)
 ("\C-k" allout-kill-topic)
+("\M-k" allout-copy-topic-as-kill)
 ; Miscellaneous commands:
 	;([?\C-\ ] allout-mark-topic)
 ("@" allout-resolve-xref)
 ("=c" allout-copy-exposed-to-buffer)
 ("=i" allout-indented-exposed-to-buffer)
 (set name (car value-cell))))))
 ;;;_  : Mode-specific incidentals
 ;;;_   > allout-unprotected (expr)
 (defmacro allout-unprotected (expr)
 "Enable internal outline operations to alter invisible text."
-`(let ((inhibit-read-only t)
+`(let ((inhibit-read-only (if (not buffer-read-only) t))
 (inhibit-field-text-motion t))
 ,expr))
 ;;;_   = allout-mode-hook
 (defvar allout-mode-hook nil
 "*Hook that's run when allout mode starts.")
 				count, revoke numbering.
 	Topic-oriented Killing and Yanking:
 	----------------------------------
 \\[allout-kill-topic]	allout-kill-topic	Kill current topic, including offspring.
-\\[allout-kill-line]	allout-kill-line	Like kill-line, but reconciles numbering, etc.
+\\[allout-copy-topic-as-kill]	allout-copy-topic-as-kill Copy current topic, including offspring.
+\\[allout-kill-line]	allout-kill-line	kill-line, attending to outline structure.
+\\[allout-copy-line-as-kill]	allout-copy-line-as-kill Copy line but don't delete it.
 \\[allout-yank]	allout-yank		Yank, adjusting depth of yanked topic to
 				depth of heading if yanking into bare topic
 				heading (ie, prefix sans text).
 \\[allout-yank-pop]	allout-yank-pop	Is to allout-yank as yank-pop is to yank
 (goto-char start))))
 ;;;_  > allout-before-change-handler (beg end)
 (defun allout-before-change-handler (beg end)
 "Protect against changes to invisible text.
-See allout-overlay-interior-modification-handler for details.
+See allout-overlay-interior-modification-handler for details."
-This before-change handler is used only where modification-hooks
-overlay property is not supported."
 (if (and (allout-mode-p) undo-in-progress (allout-hidden-p))
 (allout-show-to-offshoot))
 ;; allout-overlay-interior-modification-handler on an overlay handles
 (save-excursion               ; Renumber subsequent topics if needed:
 (if (not (looking-at allout-regexp))
 (allout-next-heading))
 (allout-renumber-to-depth depth)))
 (run-hook-with-args 'allout-structure-deleted-hook depth (point)))))
+;;;_    > allout-copy-line-as-kill ()
+(defun allout-copy-line-as-kill ()
+"Like allout-kill-topic, but save to kill ring instead of deleting."
+(interactive)
+(let ((buffer-read-only t))
+(condition-case nil
+(allout-kill-line)
+(buffer-read-only nil))))
 ;;;_    > allout-kill-topic ()
 (defun allout-kill-topic ()
 "Kill topic together with subtopics.
 Trailing whitespace is killed with a topic if that whitespace:
 (allout-unprotected (kill-region beg (point)))
 (save-excursion
 (allout-renumber-to-depth depth))
 (run-hook-with-args 'allout-structure-deleted-hook depth (point))))
+;;;_    > allout-copy-topic-as-kill ()
+(defun allout-copy-topic-as-kill ()
+"Like allout-kill-topic, but save to kill ring instead of deleting."
+(interactive)
+(let ((buffer-read-only t))
+(condition-case nil
+(allout-kill-topic)
+(buffer-read-only (message "Topic copied...")))))
 ;;;_    > allout-annotate-hidden (begin end)
 (defun allout-annotate-hidden (begin end)
 "Qualify text with properties to indicate exposure status."
-(let ((was-modified (buffer-modified-p)))
+(let ((was-modified (buffer-modified-p))
+(buffer-read-only nil))
 (allout-unprotected
 (remove-text-properties begin end '(allout-was-hidden t)))
 (save-excursion
 (goto-char begin)
 (let (done next prev overlay)
 (while (not done)
 ;; at or advance to start of next hidden region:
 (if (not (allout-hidden-p))
 (setq next
-(next-single-char-property-change (point)
+(max (1+ (point))
-'invisible nil end)))
+(next-single-char-property-change (point)
+'invisible
+nil end))))
 (if (or (not next) (eq prev next))
 ;; still not at start of hidden area - must not be any left.
 (setq done t)
 (goto-char next)
 (setq prev next)
 		       (progn
 (end-of-line)
 (allout-back-to-visible-text)))
 		      strings))
 	  (when (< (point) next)      ; Resume from after hid text, if any.
-(line-move 1))
+(line-move 1)
+(beginning-of-line))
 	  (setq beg (point)))
 	;; Accumulate list for this topic:
 	(setq strings (nreverse strings))
 	(setq result
 	      (cons
 (progn (goto-char after-bullet-pos)
 (delete-char 1))
 ;; Add the is-encrypted bullet qualifier:
 (goto-char after-bullet-pos)
 (insert "*"))))
-(run-hook-with-args 'allout-exposure-changed-hook
+(run-hook-with-args 'allout-structure-added-hook
-bullet-pos subtree-end nil))))
+bullet-pos subtree-end))))
 ;;;_  > allout-encrypt-string (text decrypt allout-buffer key-type for-key
 ;;;                                  fetch-pass &optional retried verifying
 ;;;                                  passphrase)
 (defun allout-encrypt-string (text decrypt allout-buffer key-type for-key
 fetch-pass &optional retried rejected

Mercurial > emacs

comparison lisp/allout.el @ 73003:ec72ab6f5541