[Emacs-diffs] /srv/bzr/emacs/trunk r103659: * lisp/allout.el (allout-abbreviate-flattened-numbering)

[Stefan Monnier]

------------------------------------------------------------
revno: 103659
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-03-14 22:46:18 -0400
message:
  * lisp/allout.el (allout-abbreviate-flattened-numbering)
  (allout-mode-deactivate-hook): Fix up obsolescence "date".
modified:
  lisp/ChangeLog
  lisp/allout.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-15 02:42:31 +0000
+++ b/lisp/ChangeLog    2011-03-15 02:46:18 +0000
@@ -1,5 +1,8 @@
 2011-03-15  Stefan Monnier  <address@hidden>
 
+       * allout.el (allout-abbreviate-flattened-numbering)
+       (allout-mode-deactivate-hook): Fix up obsolescence "date".
+
        * subr.el (read-char-choice): Only show the cursor after the prompt,
        not after the answer.
 

=== modified file 'lisp/allout.el'
--- a/lisp/allout.el    2011-03-09 20:48:56 +0000
+++ b/lisp/allout.el    2011-03-15 02:46:18 +0000
@@ -310,6 +310,7 @@
 
 With value nil, inhibit any automatic allout-mode activation."
   :set 'allout-auto-activation-helper
+  ;; FIXME: Using strings here is unusual and less efficient than symbols.
   :type '(choice (const :tag "On" t)
                 (const :tag "Ask about layout" "ask")
                 (const :tag "Mode only" "activate")
@@ -752,7 +753,7 @@
 
 ;;;_  = allout-flattened-numbering-abbreviation
 (define-obsolete-variable-alias 'allout-abbreviate-flattened-numbering
-  'allout-flattened-numbering-abbreviation "24.0")
+  'allout-flattened-numbering-abbreviation "24.1")
 (defcustom allout-flattened-numbering-abbreviation nil
   "If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic
 numbers to minimal amount with some context.  Otherwise, entire
@@ -1402,7 +1403,7 @@
 (defvar allout-mode-deactivate-hook nil
   "*Hook that's run when allout mode ends.")
 (define-obsolete-variable-alias 'allout-mode-deactivate-hook
-  'allout-mode-off-hook "future")
+  'allout-mode-off-hook "24.1")
 ;;;_   = allout-exposure-category
 (defvar allout-exposure-category nil
   "Symbol for use as allout invisible-text overlay category.")