[Emacs-diffs] Changes to emacs/lisp/allout.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/12/25 22:58:02

Index: allout.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/allout.el,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- allout.el   7 Dec 2007 05:17:08 -0000       1.101
+++ allout.el   25 Dec 2007 22:58:01 -0000      1.102
@@ -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"
+             (message "allout-write-file-hook-handler suppressing error %s"
                         failure)
-                       (sit-for 2))))))
+             (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