Mercurial > emacs
diff lisp/allout.el @ 91302:56a72e2bd635
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 29 Dec 2007 02:39:17 +0000 |
parents | 880960b70474 25c8924964c6 |
children | 606f2d163a64 |
line wrap: on
line diff
--- a/lisp/allout.el Fri Dec 28 02:13:20 2007 +0000 +++ b/lisp/allout.el Sat Dec 29 02:39:17 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