[Emacs-diffs] /srv/bzr/emacs/trunk r102936: * allout.el (allout-prefixed-keybindings): Bind (prefixed) '#' to

[Ken Manheimer]

------------------------------------------------------------
revno: 102936
committer: Ken Manheimer <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-21 23:41:57 -0500
message:
  * allout.el (allout-prefixed-keybindings): Bind (prefixed) '#' to
  allout-number-siblings, in keeping with what obtained due to (now-defunct)
  allout-keybindings-list.  Ditch repeat binding to (prefixed) ?i.
  (allout-before-change-handler): Better expose spots affected by undo.
modified:
  lisp/ChangeLog
  lisp/allout.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-22 03:53:06 +0000
+++ b/lisp/ChangeLog    2011-01-22 04:41:57 +0000
@@ -1,3 +1,12 @@
+2011-01-22  Ken Manheimer  <address@hidden>
+
+       * allout.el (allout-prefixed-keybindings): Bind (prefixed) '#' to
+       allout-number-siblings, in keeping with what obtained due to
+       (now-defunct) allout-keybindings-list.  Ditch repeat binding to
+       (prefixed) ?i.
+       (allout-before-change-handler): Better expose spots affected by
+       undo.
+
 2011-01-22  Chong Yidong  <address@hidden>
 
        * man.el (Man-highlight-references0): Use make-button (Bug#7881).

=== modified file 'lisp/allout.el'
--- a/lisp/allout.el    2011-01-20 21:57:15 +0000
+++ b/lisp/allout.el    2011-01-22 04:41:57 +0000
@@ -204,7 +204,6 @@
     ("[(control ?a)]" allout-beginning-of-current-entry)
     ("[(control ?e)]" allout-end-of-entry)
     ("[(control ?i)]" allout-show-children)
-    ("[(control ?i)]" allout-show-children)
     ("[(control ?s)]" allout-show-current-subtree)
     ("[(control ?t)]" allout-toggle-current-subtree-exposure)
 ;; Let user customize if they want to preempt describe-prefix-bindings ^h use.
@@ -221,7 +220,7 @@
     ("[?<]" allout-shift-out)
     ("[(control ?m)]" allout-rebullet-topic)
     ("[?*]" allout-rebullet-current-heading)
-    ("[?']" allout-number-siblings)
+    ("[?#]" allout-number-siblings)
     ("[(control ?k)]" allout-kill-topic)
     ("[(meta ?k)]" allout-copy-topic-as-kill)
     ("address@hidden" allout-resolve-xref)
@@ -1412,9 +1411,6 @@
  - NEW-START -- integer indicating position of start of the first new item.
  - NEW-END -- integer indicating position of end of the last new item.
 
-Some edits that introduce new items may missed by this hook:
-specifically edits that native allout routines do not control.
-
 This hook might be invoked multiple times by a single command.")
 ;;;_   = allout-structure-deleted-hook
 (defvar allout-structure-deleted-hook nil
@@ -2192,8 +2188,8 @@
 
 See `allout-overlay-interior-modification-handler' for details."
 
-  (if (and (allout-mode-p) undo-in-progress (allout-hidden-p))
-      (allout-show-to-offshoot))
+  (when (and (allout-mode-p) undo-in-progress (allout-hidden-p))
+    (allout-show-children))
 
   ;; allout-overlay-interior-modification-handler on an overlay handles
   ;; this in other emacs, via `allout-exposure-category's 'modification-hooks.