[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Stefan Monnier]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.8402 emacs/lisp/ChangeLog:1.8403
*** emacs/lisp/ChangeLog:1.8402 Fri Oct 21 06:30:58 2005
--- emacs/lisp/ChangeLog        Fri Oct 21 06:32:05 2005
***************
*** 72,82 ****
        (allout-situate-encryption-key-verifier)
        (allout-get-encryption-key-verifier, allout-verify-key)
        (allout-next-topic-pending-encryption)
- <<<<<<< ChangeLog
-       (allout-encrypt-decrypted, allout-encrypted-type-prefix): New funs.
- =======
        (allout-encrypt-decrypted, allout-encrypted-type-prefix): New funcs.
- >>>>>>> 1.8400
        (outline-topic-encryption-bullet, outline-default-encryption-scheme)
        (outline-key-verifier-handling, outline-key-hint-handling)
        (outline-encrypt-unencrypted-on-saves): New defcustoms.
--- 72,78 ----
***************
*** 92,115 ****
        New functions, implement the mechanism.
        (outlineify-sticky): Use the file vars mechanism.
        (allout-inhibit-protection, allout-during-write-cue)
- <<<<<<< ChangeLog
-       (allout-override-protect, allout-before-change-protect): Remove.
-       (allout-flag-region, allout-open-topic): Revise to adjust
-       read-only text.
-       (allout-open-line-not-read-only): Add to facilitate read-only
- =======
        (allout-override-protect, allout-before-change-protect): Remove.
        (allout-flag-region, allout-open-topic): Adjust read-only text.
        (allout-open-line-not-read-only): Add to facilitate read-only
- >>>>>>> 1.8400
        text based protection.
        (allout-kill-line): Revise to adjust read-only text, clue the
        user about the inhibition.
- <<<<<<< ChangeLog
-       (allout-unprotected): Robustify with an unwind-protect.
- =======
        (allout-unprotected): Use unwind-protect.
- >>>>>>> 1.8400
        (allout-shift-in, allout-shift-out): Disallow manually shifting a
        topic deeper than the offspring depth of the previous topic -
        avoiding confusing "containment discontinuities".
--- 88,100 ----
***************
*** 128,138 ****
        (allout-hide-current-entry, allout-show-current-entry): Use the
        revised version.
        (allout-old-expose-topic): Solidify deprecation.
- <<<<<<< ChangeLog
-       (allout-end-of-subtree): Add, so we can span concealed as well
- =======
        (allout-end-of-subtree): Add so we can span concealed as well
- >>>>>>> 1.8400
        as visible topics.
        (allout-end-of-current-subtree): Use `allout-end-of-subtree'.
        (allout-end-of-current-heading): Tweak to just respect the first line.
--- 113,119 ----
***************
*** 143,160 ****
        (allout-mode, allout-init): Miscellaneous docstring and
        operational refinements, as well as hookups of new encryption stuff.
        (allout-beginning-of-current-entry): Now works as advertised.
- <<<<<<< ChangeLog
-       (allout-end-of-current-entry): Relief of superfluous
-       allout-show-entry.
-       (allout-isearch-rectification): Refine condition for isearching
-       (allout-isearch-abort, allout-enwrap-isearch).
-       (allout-flag-region, my-region-active-p): Relocate some macros.
- =======
        (allout-end-of-current-entry): Remove of superfluous allout-show-entry.
        (allout-isearch-rectification): Refine condition for isearching.
        (allout-isearch-abort, allout-enwrap-isearch)
        (allout-flag-region, my-region-active-p): Relocate some macros.
- >>>>>>> 1.8400
        (allout-title): Fallback title is '(buffer-name)', not
        non-existing '(current-buffer-name)'.
        (subst-char-in-string): Define if absent (for some XEmacs versions).
--- 124,133 ----