aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Janík2001-11-26 16:24:26 +0000
committerPavel Janík2001-11-26 16:24:26 +0000
commiteac9cf5f89e4ea470e06332f7266fa1e60a5154c (patch)
tree26a5e1152fc1b93ffdc25e07f88e0c089b379ad1
parent051f98305e9d58373af32ed21137ae5a2a2ac48f (diff)
downloademacs-eac9cf5f89e4ea470e06332f7266fa1e60a5154c.tar.gz
emacs-eac9cf5f89e4ea470e06332f7266fa1e60a5154c.zip
(outline-version, outline-open-topic)
(outline-rebullet-heading, outline-insert-listified) (outline-latex-verbatim-quote-curr-line) (outline-latexify-one-item, outlineify-sticky): Use insert instead of insert-string.
-rw-r--r--lisp/ChangeLog32
-rw-r--r--lisp/allout.el76
2 files changed, 70 insertions, 38 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff7341db4d4..97bdefc506b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,35 @@
12001-11-26 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2
3 * play/yow.el (psychoanalyze-pinhead): Use insert instead of
4 insert-string.
5
6 * play/gamegrid.el (gamegrid-init-buffer): Likewise.
7
8 * vc.el (vc-next-action-on-file): Likewise.
9
10 * term/bg-mouse.el (bg-insert-moused-sexp): Likewise.
11
12 * term/sun-mouse.el (sun-yank-selection): Likewise.
13
14 * textmodes/bib-mode.el (return-key-bib): Likewise.
15
16 * calendar/appt.el (appt-disp-window): Likewise.
17
18 * calendar/diary-lib.el (list-diary-entries): Likewise.
19
20 * array.el (array-reconfigure-rows): Likewise.
21
22 * filecache.el (file-cache-minibuffer-complete): Likewise.
23
24 * obsolete/cplus-md.el (fill-c++-comment): Likewise.
25
26 * strokes.el (strokes-prompt-user-save-strokes): Likewise.
27
28 * allout.el (outline-version, outline-open-topic)
29 (outline-rebullet-heading, outline-insert-listified)
30 (outline-latex-verbatim-quote-curr-line)
31 (outline-latexify-one-item, outlineify-sticky): Likewise.
32
12001-11-26 Andre Spiegel <spiegel@gnu.org> 332001-11-26 Andre Spiegel <spiegel@gnu.org>
2 34
3 * vc.el (vc-find-version): New function. 35 * vc.el (vc-find-version): New function.
diff --git a/lisp/allout.el b/lisp/allout.el
index d12ac29ba54..58ab3640158 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -5,7 +5,7 @@
5;; Author: Ken Manheimer <klm@python.org> 5;; Author: Ken Manheimer <klm@python.org>
6;; Maintainer: Ken Manheimer <klm@python.org> 6;; Maintainer: Ken Manheimer <klm@python.org>
7;; Created: Dec 1991 - first release to usenet 7;; Created: Dec 1991 - first release to usenet
8;; Version: $Id: allout.el,v 1.28 2001/07/02 10:45:54 eliz Exp $|| 8;; Version: $Id: allout.el,v 1.29 2001/07/16 11:39:41 pj Exp $||
9;; Keywords: outline mode wp languages 9;; Keywords: outline mode wp languages
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
@@ -509,7 +509,7 @@ behavior."
509;;;_ : Version 509;;;_ : Version
510;;;_ = outline-version 510;;;_ = outline-version
511(defvar outline-version 511(defvar outline-version
512 (let ((rcs-rev "$Revision: 1.28 $")) 512 (let ((rcs-rev "$Revision: 1.29 $"))
513 (condition-case err 513 (condition-case err
514 (save-match-data 514 (save-match-data
515 (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev) 515 (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev)
@@ -521,7 +521,7 @@ behavior."
521 "Return string describing the loaded outline version." 521 "Return string describing the loaded outline version."
522 (interactive "P") 522 (interactive "P")
523 (let ((msg (concat "Allout Outline Mode v " outline-version))) 523 (let ((msg (concat "Allout Outline Mode v " outline-version)))
524 (if here (insert-string msg)) 524 (if here (insert msg))
525 (message "%s" msg) 525 (message "%s" msg)
526 msg)) 526 msg))
527;;;_ : Topic header format 527;;;_ : Topic header format
@@ -2844,10 +2844,10 @@ Nuances:
2844 (not (bolp))) 2844 (not (bolp)))
2845 (forward-char 1)))) 2845 (forward-char 1))))
2846 )) 2846 ))
2847 (insert-string (concat (outline-make-topic-prefix opening-numbered 2847 (insert (concat (outline-make-topic-prefix opening-numbered
2848 t 2848 t
2849 depth) 2849 depth)
2850 " ")) 2850 " "))
2851 2851
2852 ;;(if doing-beginning (save-excursion (newline (if dbl-space 2 1)))) 2852 ;;(if doing-beginning (save-excursion (newline (if dbl-space 2 1))))
2853 2853
@@ -3063,7 +3063,7 @@ this function."
3063 (delete-region (match-beginning 0)(match-end 0)))) 3063 (delete-region (match-beginning 0)(match-end 0))))
3064 3064
3065 ; Put in new prefix: 3065 ; Put in new prefix:
3066 (outline-unprotected (insert-string new-prefix)) 3066 (outline-unprotected (insert new-prefix))
3067 3067
3068 ;; Reindent the body if elected and margin changed: 3068 ;; Reindent the body if elected and margin changed:
3069 (if (and outline-reindent-bodies 3069 (if (and outline-reindent-bodies
@@ -4326,13 +4326,13 @@ If `bullet-plus' is specified, it is inserted just after the entire prefix."
4326 (car listified) 4326 (car listified)
4327 (setq listified (cdr listified)))) 4327 (setq listified (cdr listified))))
4328 (bullet-plus (car listified))) 4328 (bullet-plus (car listified)))
4329 (insert-string prefix) 4329 (insert prefix)
4330 (if bullet-plus (insert-string (concat " " bullet-plus))) 4330 (if bullet-plus (insert (concat " " bullet-plus)))
4331 (while text 4331 (while text
4332 (insert-string (car text)) 4332 (insert (car text))
4333 (if (setq text (cdr text)) 4333 (if (setq text (cdr text))
4334 (insert-string "\n"))) 4334 (insert "\n")))
4335 (insert-string "\n"))) 4335 (insert "\n")))
4336;;;_ > outline-copy-exposed-to-buffer (&optional arg tobuf format) 4336;;;_ > outline-copy-exposed-to-buffer (&optional arg tobuf format)
4337(defun outline-copy-exposed-to-buffer (&optional arg tobuf format) 4337(defun outline-copy-exposed-to-buffer (&optional arg tobuf format)
4338 "Duplicate exposed portions of current outline to another buffer. 4338 "Duplicate exposed portions of current outline to another buffer.
@@ -4440,7 +4440,7 @@ environment. Leaves point at the end of the line."
4440 end ; bounded by end-of-line 4440 end ; bounded by end-of-line
4441 1) ; no matches, move to end & return nil 4441 1) ; no matches, move to end & return nil
4442 (goto-char (match-beginning 0)) 4442 (goto-char (match-beginning 0))
4443 (insert-string "\\") 4443 (insert "\\")
4444 (setq end (1+ end)) 4444 (setq end (1+ end))
4445 (goto-char (1+ (match-end 0)))))) 4445 (goto-char (1+ (match-end 0))))))
4446;;;_ > outline-insert-latex-header (buf) 4446;;;_ > outline-insert-latex-header (buf)
@@ -4533,19 +4533,19 @@ BULLET string, and a list of TEXT strings for the body."
4533 (curr-line) 4533 (curr-line)
4534 body-content bop) 4534 body-content bop)
4535 ; Do the head line: 4535 ; Do the head line:
4536 (insert-string (concat "\\OneHeadLine{\\verb\1 " 4536 (insert (concat "\\OneHeadLine{\\verb\1 "
4537 (outline-latex-verb-quote bullet) 4537 (outline-latex-verb-quote bullet)
4538 "\1}{" 4538 "\1}{"
4539 depth 4539 depth
4540 "}{\\verb\1 " 4540 "}{\\verb\1 "
4541 (if head-line 4541 (if head-line
4542 (outline-latex-verb-quote head-line) 4542 (outline-latex-verb-quote head-line)
4543 "") 4543 "")
4544 "\1}\n")) 4544 "\1}\n"))
4545 (if (not body-lines) 4545 (if (not body-lines)
4546 nil 4546 nil
4547 ;;(insert-string "\\beginlines\n") 4547 ;;(insert "\\beginlines\n")
4548 (insert-string "\\begin{verbatim}\n") 4548 (insert "\\begin{verbatim}\n")
4549 (while body-lines 4549 (while body-lines
4550 (setq curr-line (car body-lines)) 4550 (setq curr-line (car body-lines))
4551 (if (and (not body-content) 4551 (if (and (not body-content)
@@ -4559,18 +4559,18 @@ BULLET string, and a list of TEXT strings for the body."
4559 (setq curr-line (concat (substring curr-line 0 bop) 4559 (setq curr-line (concat (substring curr-line 0 bop)
4560 ">" 4560 ">"
4561 (substring curr-line bop)))) 4561 (substring curr-line bop))))
4562 ;;(insert-string "|" (car body-lines) "|") 4562 ;;(insert "|" (car body-lines) "|")
4563 (insert-string curr-line) 4563 (insert curr-line)
4564 (outline-latex-verbatim-quote-curr-line) 4564 (outline-latex-verbatim-quote-curr-line)
4565 (insert-string "\n") 4565 (insert "\n")
4566 (setq body-lines (cdr body-lines))) 4566 (setq body-lines (cdr body-lines)))
4567 (if body-content 4567 (if body-content
4568 (setq body-content nil) 4568 (setq body-content nil)
4569 (forward-char -1) 4569 (forward-char -1)
4570 (insert-string "\\ ") 4570 (insert "\\ ")
4571 (forward-char 1)) 4571 (forward-char 1))
4572 ;;(insert-string "\\endlines\n") 4572 ;;(insert "\\endlines\n")
4573 (insert-string "\\end{verbatim}\n") 4573 (insert "\\end{verbatim}\n")
4574 ))) 4574 )))
4575;;;_ > outline-latexify-exposed (arg &optional tobuf) 4575;;;_ > outline-latexify-exposed (arg &optional tobuf)
4576(defun outline-latexify-exposed (arg &optional tobuf) 4576(defun outline-latexify-exposed (arg &optional tobuf)
@@ -4631,23 +4631,23 @@ setup for auto-startup."
4631 (if (looking-at outline-regexp) 4631 (if (looking-at outline-regexp)
4632 t 4632 t
4633 (outline-open-topic 2) 4633 (outline-open-topic 2)
4634 (insert-string (concat "Dummy outline topic header - see" 4634 (insert (concat "Dummy outline topic header - see"
4635 "`outline-mode' docstring: `^Hm'.")) 4635 "`outline-mode' docstring: `^Hm'."))
4636 (forward-line 1) 4636 (forward-line 1)
4637 (goto-char (point-max)) 4637 (goto-char (point-max))
4638 (open-line 1) 4638 (open-line 1)
4639 (outline-open-topic 0) 4639 (outline-open-topic 0)
4640 (insert-string "Local emacs vars.\n") 4640 (insert "Local emacs vars.\n")
4641 (outline-open-topic 1) 4641 (outline-open-topic 1)
4642 (insert-string "(`outline-layout' is for allout.el outline-mode)\n") 4642 (insert "(`outline-layout' is for allout.el outline-mode)\n")
4643 (outline-open-topic 0) 4643 (outline-open-topic 0)
4644 (insert-string "Local variables:\n") 4644 (insert "Local variables:\n")
4645 (outline-open-topic 0) 4645 (outline-open-topic 0)
4646 (insert-string (format "outline-layout: %s\n" 4646 (insert (format "outline-layout: %s\n"
4647 (or outline-layout 4647 (or outline-layout
4648 '(-1 : 0)))) 4648 '(-1 : 0))))
4649 (outline-open-topic 0) 4649 (outline-open-topic 0)
4650 (insert-string "End:\n")))) 4650 (insert "End:\n"))))
4651;;;_ > solicit-char-in-string (prompt string &optional do-defaulting) 4651;;;_ > solicit-char-in-string (prompt string &optional do-defaulting)
4652(defun solicit-char-in-string (prompt string &optional do-defaulting) 4652(defun solicit-char-in-string (prompt string &optional do-defaulting)
4653 "Solicit (with first arg PROMPT) choice of a character from string STRING. 4653 "Solicit (with first arg PROMPT) choice of a character from string STRING.