Mercurial > emacs
changeset 87407:25c8924964c6
(allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
(allout-write-file-hook-handler): Simplify code.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 25 Dec 2007 22:58:01 +0000 |
| parents | 5ae8af9a4b8e |
| children | de993b77d770 |
| files | lisp/allout.el |
| diffstat | 1 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/allout.el Tue Dec 25 22:50:30 2007 +0000 +++ b/lisp/allout.el Tue Dec 25 22:58:01 2007 +0000 @@ -1501,11 +1501,11 @@ (condition-case failure (setq allout-after-save-decrypt (allout-encrypt-decrypted except-mark)) - (error (progn - (message - "allout-write-file-hook-handler suppressing error %s" - failure) - (sit-for 2)))))) + (message "allout-write-file-hook-handler suppressing error %s" + failure) + (sit-for 2) + (error "allout-write-file-hook-handler suppressing error %s" + failure)))) )) nil) ;;;_ > allout-auto-save-hook-handler () @@ -5457,11 +5457,11 @@ (cdr format))))))) ;; Put the list with first at front, to last at back: (nreverse result)))) -;;;_ > my-region-active-p () -(defmacro my-region-active-p () - (if (fboundp 'region-active-p) - '(region-active-p) - 'mark-active)) +;;;_ > allout-region-active-p () +(defmacro allout-region-active-p () + (if (fboundp 'use-region-p) + '(use-region-p) + '(region-active-p))) ;;;_ > allout-process-exposed (&optional func from to frombuf ;;; tobuf format) (defun allout-process-exposed (&optional func from to frombuf tobuf @@ -5494,7 +5494,7 @@ ; defaulting if necessary: (if (not func) (setq func 'allout-insert-listified)) (if (not (and from to)) - (if (my-region-active-p) + (if (allout-region-active-p) (setq from (region-beginning) to (region-end)) (setq from (point-min) to (point-max)))) (if frombuf