emacs: lisp/allout.el comparison

comparison lisp/allout.el @ 90203:187d6a1f84f7

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 485-492) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 92-94) - Merge from emacs--cvs-trunk--0 - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Fri, 22 Jul 2005 08:27:27 +0000
parents	fbb2bea03df9 f73da52719b6
children	2d92f5c9d6ae

comparison

equal deleted inserted replaced

-:7597b4a23c3b
+:187d6a1f84f7
 (make-variable-buffer-local 'allout-pre-was-isearching)
 ;;;_   = allout-isearch-prior-pos nil
 (defvar allout-isearch-prior-pos nil
 "Cue for isearch-dynamic-exposure tracking, used by `allout-isearch-expose'.")
 (make-variable-buffer-local 'allout-isearch-prior-pos)
-;;;_   = allout-isearch-did-quit
-(defvar allout-isearch-did-quit nil
-"Distinguishes isearch conclusion and cancellation.
-Maintained by `allout-isearch-abort' \(which is wrapped around the real
-isearch-abort), and monitored by `allout-isearch-expose' for action.")
-(make-variable-buffer-local 'allout-isearch-did-quit)
 ;;;_   = allout-override-protect nil
 (defvar allout-override-protect nil
 "Used in `allout-mode' for regulate of concealed-text protection mechanism.
 Allout outline mode regulates alteration of concealed text to protect
 Topic text constituents:
 HEADER:	The first line of a topic, include the topic PREFIX and header
 	text.
-PREFIX: The leading text of a topic which which distinguishes it from
+PREFIX: The leading text of a topic which distinguishes it from
 	normal text.  It has a strict form, which consists of a
 	prefix-lead string, padding, and a bullet.  The bullet may be
 	followed by a number, indicating the ordinal number of the
 	topic among its siblings, a space, and then the header text.
 (allout-setup-menubar)
 (if allout-layout
 	  (setq do-layout t))
-(if (and allout-isearch-dynamic-expose
+(if allout-isearch-dynamic-expose
-	       (not (fboundp 'allout-real-isearch-abort)))
 	  (allout-enwrap-isearch))
 (run-hooks 'allout-mode-hook)
 (setq allout-mode t))
 		(if rehide-completely
 		    (save-excursion
 		      (if rehide-place (goto-char rehide-place))
 		      (allout-hide-current-entry-completely))
 		  (allout-hide-current-entry))
-		(error (concat
+		(error "Change within concealed region prevented"))))))
-			"Change within concealed region prevented.")))))))
 )	; if
 )	; defun
 ;;;_   = allout-post-goto-bullet
 (defvar allout-post-goto-bullet nil
 "Outline internal var, for `allout-pre-command-business' hot-spot operation.
 (if (and (eq this-command 'self-insert-command)
 	     (eq (point)(allout-current-bullet-pos)))
 	(let* ((this-key-num (cond
 			      ((numberp last-command-char)
 			       last-command-char)
-			      ;; XXX Only XEmacs has characterp.
+			      ((fboundp 'char-to-int)
-			      ((and (fboundp 'characterp)
-				    (characterp last-command-char))
 			       (char-to-int last-command-char))
 			      (t 0)))
 	       mapped-binding)
 	  (if (zerop this-key-num)
 	      nil
 (defun allout-isearch-rectification ()
 "Rectify outline exposure before, during, or after isearch.
 Called as part of `allout-post-command-business'."
-(let ((isearching (and (boundp 'isearch-mode) isearch-mode)))
+(let ((isearching isearch-mode))
 (cond ((and isearching (not allout-pre-was-isearching))
 	   (allout-isearch-expose 'start))
 	  ((and isearching allout-pre-was-isearching)
 	   (allout-isearch-expose 'continue))
 	  ((and (not isearching) allout-pre-was-isearching)
 	   (allout-isearch-expose 'final))
 	  ;; Not and wasn't isearching:
-	  (t (setq allout-isearch-prior-pos nil)
+	  (t (setq allout-isearch-prior-pos nil)))))
-	     (setq allout-isearch-did-quit nil)))))
 ;;;_   = allout-isearch-was-font-lock
 (defvar allout-isearch-was-font-lock
 (and (boundp 'font-lock-mode) font-lock-mode))
 ;;;_   > allout-flag-region (from to flag)
 			     ?\r)))
 (if (allout-visible-p)
 (setq allout-isearch-prior-pos nil)
 (if (not (eq mode 'final))
 	(setq allout-isearch-prior-pos (cons (point) (allout-show-entry)))
-(if allout-isearch-did-quit
+(if isearch-mode-end-hook-quit
 	  nil
 	(setq allout-isearch-prior-pos nil)
-	(allout-show-children))))
+	(allout-show-children)))))
-(setq allout-isearch-did-quit nil))
 ;;;_   > allout-enwrap-isearch ()
 (defun allout-enwrap-isearch ()
 "Impose `isearch-abort' wrapper for dynamic exposure in isearch.
 The function checks to ensure that the rebinding is done only once."
+(add-hook 'isearch-mode-end-hook 'allout-isearch-rectification))
-(add-hook 'isearch-mode-end-hook 'allout-isearch-rectification)
-(if (fboundp 'allout-real-isearch-abort)
-;;
-nil
-; Ensure load of isearch-mode:
-(if (or (and (fboundp 'isearch-mode)
-(fboundp 'isearch-abort))
-(condition-case error
-(load-library "isearch-mode")
-('file-error (message
-			    "Skipping isearch-mode provisions - %s '%s'"
-			    (car (cdr error))
-			    (car (cdr (cdr error))))
-			   (sit-for 1)
-			   ;; Inhibit subsequent tries and return nil:
-			   (setq allout-isearch-dynamic-expose nil))))
-;; Isearch-mode loaded, encapsulate specific entry points for
-;; outline dynamic-exposure business:
-(progn
-	  ;; stash crucial isearch-mode funcs under known, private
-	  ;; names, then register wrapper functions under the old
-	  ;; names, in their stead:
-(fset 'allout-real-isearch-abort (symbol-function 'isearch-abort))
-(fset 'isearch-abort 'allout-isearch-abort)))))
-;;;_   > allout-isearch-abort ()
-(defun allout-isearch-abort ()
-"Wrapper for `allout-real-isearch-abort' \(which see), to register
-actual quits."
-(interactive)
-(setq allout-isearch-did-quit nil)
-(condition-case what
-(allout-real-isearch-abort)
-('quit (setq allout-isearch-did-quit t)
-	  (signal 'quit nil))))
 ;;; Prevent unnecessary font-lock while isearching!
 (defvar isearch-was-font-locking nil)
 (defun isearch-inhibit-font-lock ()
 "Inhibit `font-lock-mode' while isearching - for use on `isearch-mode-hook'."
 \(Works according to setting of `allout-file-xref-bullet')."
 (interactive)
 (if (not allout-file-xref-bullet)
 (error
-"outline cross references disabled - no `allout-file-xref-bullet'")
+"Outline cross references disabled - no `allout-file-xref-bullet'")
 (if (not (string= (allout-current-bullet) allout-file-xref-bullet))
-(error "current heading lacks cross-reference bullet `%s'"
+(error "Current heading lacks cross-reference bullet `%s'"
 allout-file-xref-bullet)
 (let (file-name)
 (save-excursion
 (let* ((text-start allout-recent-prefix-end)
 (heading-end (progn (end-of-line) (point))))

Mercurial > emacs

comparison lisp/allout.el @ 90203:187d6a1f84f7