diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 16 | ||||
| -rw-r--r-- | lisp/allout.el | 15 |
2 files changed, 24 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a0b63584d5..8d4cdddcd39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2002-12-16 Markus Rost <rost@math.ohio-state.edu> + + * allout.el: Avoid name conflicts with outline.el. Replace + globally string "outline-" with string "allout-". Replaced 1446 + occurrences; there was no string "allout-" before the change and + there seems to be no dependency on outline.el. + Put `quotes' around many function and variable names. + Doc changes to adjust to the change to prefix "allout-". Don't + provide 'outline. Use " Allout" as mode line string, not " Outl". + Put group 'allout in group 'editing. Update Copyright notice. + Autoload `allout-init'. + (allout-init): Give report also in case auto-activation was + inhibited. + (my-mark-marker): Test for feature 'xemacs instead of a string + parse. + 2002-12-15 David Kastrup <David.Kastrup@t-online.de> * emacs-lisp/autoload.el (autoload-ensure-default-file): insert diff --git a/lisp/allout.el b/lisp/allout.el index 6c9aaefa8ff..3fc20d95208 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -5,7 +5,7 @@ ;; Author: Ken Manheimer <klm@python.org> ;; Maintainer: Ken Manheimer <klm@python.org> ;; 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 @@ behavior." ;;;_ : 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 @@ the following two lines in your emacs init file: (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 @@ function. If HOOK is void, it is first set to nil." 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))) |