Show
Ignore:
Timestamp:
2006年09月30日 09時12分06秒 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp

    • Property svn:ignore changed from
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
       to
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
      pre-mh-loaddefs.el-CMD

  • trunk/lisp/allout.el

    r4166 r4169  
    699699        ("#" allout-number-siblings) 
    700700        ("\C-k" allout-kill-line t) 
     701        ("\M-k" allout-copy-line-as-kill t) 
    701702        ("\C-y" allout-yank t) 
    702703        ("\M-y" allout-yank-pop t) 
    703704        ("\C-k" allout-kill-topic) 
     705        ("\M-k" allout-copy-topic-as-kill) 
    704706                                        ; Miscellaneous commands: 
    705707        ;([?\C-\ ] allout-mark-topic) 
    …… 
    12801282(defmacro allout-unprotected (expr) 
    12811283  "Enable internal outline operations to alter invisible text." 
    1282   `(let ((inhibit-read-only t) 
     1284  `(let ((inhibit-read-only (if (not buffer-read-only) t)) 
    12831285         (inhibit-field-text-motion t)) 
    12841286     ,expr)) 
    …… 
    16941696        ---------------------------------- 
    16951697\\[allout-kill-topic]   allout-kill-topic       Kill current topic, including offspring. 
    1696 \\[allout-kill-line]    allout-kill-line        Like kill-line, but reconciles numbering, etc. 
     1698\\[allout-copy-topic-as-kill]   allout-copy-topic-as-kill Copy current topic, including offspring. 
     1699\\[allout-kill-line]    allout-kill-line        kill-line, attending to outline structure. 
     1700\\[allout-copy-line-as-kill]    allout-copy-line-as-kill Copy line but don't delete it. 
    16971701\\[allout-yank] allout-yank             Yank, adjusting depth of yanked topic to 
    16981702                                depth of heading if yanking into bare topic 
    …… 
    20882092  "Protect against changes to invisible text. 
    20892093 
    2090 See allout-overlay-interior-modification-handler for details. 
    2091  
    2092 This before-change handler is used only where modification-hooks 
    2093 overlay property is not supported." 
     2094See allout-overlay-interior-modification-handler for details." 
    20942095 
    20952096  (if (and (allout-mode-p) undo-in-progress (allout-hidden-p)) 
    …… 
    41884189            (allout-renumber-to-depth depth))) 
    41894190      (run-hook-with-args 'allout-structure-deleted-hook depth (point))))) 
     4191;;;_    > allout-copy-line-as-kill () 
     4192(defun allout-copy-line-as-kill () 
     4193  "Like allout-kill-topic, but save to kill ring instead of deleting." 
     4194  (interactive) 
     4195  (let ((buffer-read-only t)) 
     4196    (condition-case nil 
     4197        (allout-kill-line) 
     4198      (buffer-read-only nil)))) 
    41904199;;;_    > allout-kill-topic () 
    41914200(defun allout-kill-topic () 
    …… 
    42244233      (allout-renumber-to-depth depth)) 
    42254234    (run-hook-with-args 'allout-structure-deleted-hook depth (point)))) 
     4235;;;_    > allout-copy-topic-as-kill () 
     4236(defun allout-copy-topic-as-kill () 
     4237  "Like allout-kill-topic, but save to kill ring instead of deleting." 
     4238  (interactive) 
     4239  (let ((buffer-read-only t)) 
     4240    (condition-case nil 
     4241        (allout-kill-topic) 
     4242      (buffer-read-only (message "Topic copied..."))))) 
    42264243;;;_    > allout-annotate-hidden (begin end) 
    42274244(defun allout-annotate-hidden (begin end) 
    42284245  "Qualify text with properties to indicate exposure status." 
    42294246 
    4230   (let ((was-modified (buffer-modified-p))) 
     4247  (let ((was-modified (buffer-modified-p)) 
     4248        (buffer-read-only nil)) 
    42314249    (allout-unprotected 
    42324250     (remove-text-properties begin end '(allout-was-hidden t))) 
    …… 
    42384256          (if (not (allout-hidden-p)) 
    42394257              (setq next 
    4240                     (next-single-char-property-change (point) 
    4241                                                       'invisible nil end))) 
     4258                    (max (1+ (point)) 
     4259                         (next-single-char-property-change (point) 
     4260                                                           'invisible 
     4261                                                           nil end)))) 
    42424262          (if (or (not next) (eq prev next)) 
    42434263              ;; still not at start of hidden area - must not be any left. 
    …… 
    51705190                      strings)) 
    51715191          (when (< (point) next)      ; Resume from after hid text, if any. 
    5172             (line-move 1)) 
     5192            (line-move 1) 
     5193            (beginning-of-line)) 
    51735194          (setq beg (point))) 
    51745195        ;; Accumulate list for this topic: 
    …… 
    57465767           (goto-char after-bullet-pos) 
    57475768           (insert "*")))) 
    5748       (run-hook-with-args 'allout-exposure-changed-hook 
    5749                           bullet-pos subtree-end nil)))) 
     5769      (run-hook-with-args 'allout-structure-added-hook 
     5770                          bullet-pos subtree-end)))) 
    57505771;;;_  > allout-encrypt-string (text decrypt allout-buffer key-type for-key 
    57515772;;;                                  fetch-pass &optional retried verifying