emacs: lisp/allout.el comparison

comparison lisp/allout.el @ 87943:4fb8430d030b

(allout-keybindings-list): In initial setting, express meta-prefixed allout keys as vectors instead of strings, since the string form is interpreted in some cases as composed key modifiers, eg, accented keys. (allout-line-boundary-regexp): Clarify description. (set-allout-regexp): Repair the expressions so that the formfeed part is identified as one of the top-level groups, and is included in all the forms, not just the -line-boundary-regexp one. (allout-prefix-data): Incorporate information from the various allout regexp's formfeed alternative group, when present. (allout-write-file-hook-handler): Rectify mangling of the error handling. It was broken in version 1.100, where an `error' condition-case handler was apparently reformatted as if it was a call to the error function. An apparent repair attempt in version 1.101 situated the original body of the error handling code as bogus condition-case handlers. I've returned to just about the working code that was originally there, removing an unnecessary - but benign - enclosing 'progn'. \(Automated or cursory code fixes often aren't.) (allout-region-active-p): Fallback to value of mark-active if neither use-region-p nor region-active-p are present, for compatability with current and recent emacs major releases.

author	Ken Manheimer <ken.manheimer@gmail.com>
date	Thu, 24 Jan 2008 17:45:28 +0000
parents	107ccd98fa12
children	7dc2524306eb

comparison

equal deleted inserted replaced

-:d497b71f87dc
+:4fb8430d030b
 ("<" allout-shift-out)
 ("\C-m" allout-rebullet-topic)
 ("*" allout-rebullet-current-heading)
 ("#" allout-number-siblings)
 ("\C-k" allout-kill-line t)
-("\M-k" allout-copy-line-as-kill t)
+([?\M-k] allout-copy-line-as-kill t)
 ("\C-y" allout-yank t)
-("\M-y" allout-yank-pop t)
+([?\M-y] allout-yank-pop t)
 ("\C-k" allout-kill-topic)
-("\M-k" allout-copy-topic-as-kill)
+([?\M-k] allout-copy-topic-as-kill)
 ; Miscellaneous commands:
 	;([?\C-\ ] allout-mark-topic)
 ("@" allout-resolve-xref)
 ("=c" allout-copy-exposed-to-buffer)
 ("=i" allout-indented-exposed-to-buffer)
 decimal numbers, which should each be one less than the depth of the
 topic prefix to be matched.")
 (make-variable-buffer-local 'allout-depth-one-regexp)
 ;;;_   = allout-line-boundary-regexp
 (defvar allout-line-boundary-regexp ()
-"`allout-regexp' with outline style beginning-of-line anchor.
+"`allout-regexp' prepended with a newline for the search target.
 This is properly set by `set-allout-regexp'.")
 (make-variable-buffer-local 'allout-line-boundary-regexp)
 ;;;_   = allout-bob-regexp
 (defvar allout-bob-regexp ()
 )
 ;; Derive next for repeated use in allout-pending-bullet:
 (setq allout-plain-bullets-string-len (length allout-plain-bullets-string))
 (setq allout-header-subtraction (1- (length allout-header-prefix)))
-(let (new-part old-part)
+(let (new-part old-part formfeed-part)
 (setq new-part (concat "\\("
 (regexp-quote allout-header-prefix)
 "[ \t]*"
 ;; already regexp-quoted in a custom way:
 "[" allout-bullets-string "]"
 "\\|"
 (regexp-quote allout-header-prefix)
 "\\)"
 "+"
 " ?[^" allout-primary-bullet "]")
+formfeed-part "\\(\^L\\)"
 allout-regexp (concat new-part
 "\\|"
 old-part
-"\\|\^l")
+"\\|"
+formfeed-part)
 allout-line-boundary-regexp (concat "\n" new-part
 "\\|"
-"\n" old-part)
+"\n" old-part
+"\\|"
+"\n" formfeed-part)
 allout-bob-regexp (concat "\\`" new-part
 "\\|"
-"\\`" old-part))
+"\\`" old-part
+"\\|"
+"\\`" formfeed-part
+))
 (setq allout-depth-specific-regexp
 (concat "\\(^\\|\\`\\)"
 "\\("
 (message "auto-encrypting pending topics")
 (sit-for 0)
 (condition-case failure
 (setq allout-after-save-decrypt
 (allout-encrypt-decrypted except-mark))
-	      (message "allout-write-file-hook-handler suppressing error %s"
+(error (message
-		       failure)
+"allout-write-file-hook-handler suppressing error %s"
-	      (sit-for 2)
+failure)
-	      (error "allout-write-file-hook-handler suppressing error %s"
+(sit-for 2)))))
-		     failure))))
 ))
 nil)
 ;;;_   > allout-auto-save-hook-handler ()
 (defun allout-auto-save-hook-handler ()
 "Implement `allout-encrypt-unencrypted-on-saves' policy for auto save."
 (if (and (allout-mode-p) allout-encrypt-unencrypted-on-saves)
 ;;;_  > allout-prefix-data ()
 (defsubst allout-prefix-data ()
 "Register allout-prefix state data.
 For reference by `allout-recent' funcs.  Returns BEGINNING."
-(setq allout-recent-prefix-end (or (match-end 1) (match-end 2))
+(setq allout-recent-prefix-end (or (match-end 1) (match-end 2) (match-end 3))
 allout-recent-prefix-beginning (or (match-beginning 1)
-(match-beginning 2))
+(match-beginning 2)
+(match-beginning 3))
 allout-recent-depth (max 1 (- allout-recent-prefix-end
 allout-recent-prefix-beginning
 allout-header-subtraction)))
 allout-recent-prefix-beginning)
 ;;;_  > nullify-allout-prefix-data ()
 (= (point) (save-excursion (allout-end-of-prefix)(point))))))
 ;;;_   : Location attributes
 ;;;_    > allout-depth ()
 (defun allout-depth ()
 "Return depth of topic most immediately containing point.
+Does not do doublecheck for aberrant topic header.
 Return zero if point is not within any topic.
 Like `allout-current-depth', but respects hidden as well as visible topics."
 (save-excursion
 (if (looking-at allout-regexp)
 (forward-char 1))
 (when (re-search-forward allout-line-boundary-regexp nil 0)
 (allout-prefix-data)
+(goto-char allout-recent-prefix-beginning)
+(while (not (bolp))
+(forward-char -1))
 (and (allout-do-doublecheck)
 ;; this will set allout-recent-* on the first non-aberrant topic,
 ;; whether it's the current one or one that disqualifies it:
 (allout-aberrant-container-p))
+;; this may or may not be the same as above depending on doublecheck:
 (goto-char allout-recent-prefix-beginning))))
 ;;;_   > allout-this-or-next-heading
 (defun allout-this-or-next-heading ()
 "Position cursor on current or next heading."
 ;; A throwaway non-macro that is defined after allout-next-heading
 				 (cdr format)))))))
 ;; Put the list with first at front, to last at back:
 (nreverse result))))
 ;;;_   > allout-region-active-p ()
 (defmacro allout-region-active-p ()
-(if (fboundp 'use-region-p)
+(cond ((fboundp 'use-region-p) '(use-region-p))
-'(use-region-p)
+((fboundp 'region-active-p) '(region-active-p))
-'(region-active-p)))
+(t 'mark-active)))
-;;;_   > allout-process-exposed (&optional func from to frombuf
+;;_   > allout-process-exposed (&optional func from to frombuf
 ;;;					    tobuf format)
 (defun allout-process-exposed (&optional func from to frombuf tobuf
 					  format start-num)
 "Map function on exposed parts of current topic; results to another buffer.

Mercurial > emacs

comparison lisp/allout.el @ 87943:4fb8430d030b