# HG changeset patch # User Markus Rost # Date 1040000451 0 # Node ID 1c806f4edc194e646d99fe9c1d0b30305c4d919b # Parent f4d079377a9a88a904c54de0753e98732a28a60d (allout-init): Give report also in case auto-activation was inhibited. (my-mark-marker): Test for feature 'xemacs instead of a string parse. diff -r f4d079377a9a -r 1c806f4edc19 lisp/allout.el --- a/lisp/allout.el Mon Dec 16 00:42:23 2002 +0000 +++ b/lisp/allout.el Mon Dec 16 01:00:51 2002 +0000 @@ -5,7 +5,7 @@ ;; Author: Ken Manheimer ;; Maintainer: Ken Manheimer ;; Created: Dec 1991 - first release to usenet -;; Version: $Id: allout.el,v 1.36 2002/12/16 00:26:22 rost Exp $|| +;; Version: $Id: allout.el,v 1.37 2002/12/16 00:42:23 rost Exp $|| ;; Keywords: outlines mode wp languages ;; This file is part of GNU Emacs. @@ -508,7 +508,7 @@ ;;;_ : Version ;;;_ = allout-version (defvar allout-version - (let ((rcs-rev "$Revision: 1.36 $")) + (let ((rcs-rev "$Revision: 1.37 $")) (condition-case err (save-match-data (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev) @@ -984,10 +984,11 @@ (if (interactive-p) (message "Allout outline mode auto-activation inhibited."))) ((eq mode 'report) - (if (not (memq hook find-file-hooks)) - (allout-init nil) - ;; Just punt and use the reports from each of the modes: - (allout-init (symbol-value curr-mode)))) + (if (memq hook find-file-hooks) + ;; Just punt and use the reports from each of the modes: + (allout-init (symbol-value curr-mode)) + (allout-init nil) + (message "Allout outline mode auto-activation inhibited."))) (t (add-hook 'find-file-hooks hook) (set curr-mode ; `set', not `setq'! (cond ((eq mode 'activate) @@ -4735,7 +4736,7 @@ GNU XEmacs takes two optional args, while mainline GNU Emacs does not, so pass them along when appropriate." - (if (string-match " XEmacs " emacs-version) + (if (featurep 'xemacs) (mark-marker force buffer) (mark-marker)))