mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 03:10:58 -08:00
Code Issues Projects Releases Wiki Activity

(outline-version, outline-open-topic)

Browse source 
(outline-rebullet-heading, outline-insert-listified)
(outline-latex-verbatim-quote-curr-line)
(outline-latexify-one-item, outlineify-sticky): Use insert instead of
insert-string.
This commit is contained in:
Pavel Janík 2001-11-26 16:24:26 +00:00
parent 051f98305e
commit eac9cf5f89
2 changed files with 70 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lisp/ChangeLog
View file

@ -1,3 +1,35 @@
2001-11-26 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* play/yow.el (psychoanalyze-pinhead): Use insert instead of
insert-string.
* play/gamegrid.el (gamegrid-init-buffer): Likewise.
* vc.el (vc-next-action-on-file): Likewise.
* term/bg-mouse.el (bg-insert-moused-sexp): Likewise.
* term/sun-mouse.el (sun-yank-selection): Likewise.
* textmodes/bib-mode.el (return-key-bib): Likewise.
* calendar/appt.el (appt-disp-window): Likewise.
* calendar/diary-lib.el (list-diary-entries): Likewise.
* array.el (array-reconfigure-rows): Likewise.
* filecache.el (file-cache-minibuffer-complete): Likewise.
* obsolete/cplus-md.el (fill-c++-comment): Likewise.
* strokes.el (strokes-prompt-user-save-strokes): Likewise.
* allout.el (outline-version, outline-open-topic)
(outline-rebullet-heading, outline-insert-listified)
(outline-latex-verbatim-quote-curr-line)
(outline-latexify-one-item, outlineify-sticky): Likewise.
2001-11-26 Andre Spiegel <spiegel@gnu.org> 2001-11-26 Andre Spiegel <spiegel@gnu.org>
* vc.el (vc-find-version): New function. * vc.el (vc-find-version): New function.

52
lisp/allout.el
View file

@ -5,7 +5,7 @@
;; Author: Ken Manheimer <klm@python.org> ;; Author: Ken Manheimer <klm@python.org>
;; Maintainer: Ken Manheimer <klm@python.org> ;; Maintainer: Ken Manheimer <klm@python.org>
;; Created: Dec 1991 - first release to usenet ;; Created: Dec 1991 - first release to usenet
;; Version: $Id: allout.el,v 1.28 2001/07/02 10:45:54 eliz Exp $|| ;; Version: $Id: allout.el,v 1.29 2001/07/16 11:39:41 pj Exp $||
;; Keywords: outline mode wp languages ;; Keywords: outline mode wp languages
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
@ -509,7 +509,7 @@ behavior."
;;;_ : Version ;;;_ : Version
;;;_ = outline-version ;;;_ = outline-version
(defvar outline-version (defvar outline-version
(let ((rcs-rev "$Revision: 1.28 $")) (let ((rcs-rev "$Revision: 1.29 $"))
(condition-case err (condition-case err
(save-match-data (save-match-data
(string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev) (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev)
@ -521,7 +521,7 @@ behavior."
"Return string describing the loaded outline version." "Return string describing the loaded outline version."
(interactive "P") (interactive "P")
(let ((msg (concat "Allout Outline Mode v " outline-version))) (let ((msg (concat "Allout Outline Mode v " outline-version)))
(if here (insert-string msg)) (if here (insert msg))
(message "%s" msg) (message "%s" msg)
msg)) msg))
;;;_ : Topic header format ;;;_ : Topic header format
@ -2844,7 +2844,7 @@ Nuances:
(not (bolp))) (not (bolp)))
(forward-char 1)))) (forward-char 1))))
)) ))
(insert-string (concat (outline-make-topic-prefix opening-numbered (insert (concat (outline-make-topic-prefix opening-numbered
t t
depth) depth)
" ")) " "))
@ -3063,7 +3063,7 @@ this function."
(delete-region (match-beginning 0)(match-end 0)))) (delete-region (match-beginning 0)(match-end 0))))
; Put in new prefix: ; Put in new prefix:
(outline-unprotected (insert-string new-prefix)) (outline-unprotected (insert new-prefix))
;; Reindent the body if elected and margin changed: ;; Reindent the body if elected and margin changed:
(if (and outline-reindent-bodies (if (and outline-reindent-bodies
@ -4326,13 +4326,13 @@ If `bullet-plus' is specified, it is inserted just after the entire prefix."
(car listified) (car listified)
(setq listified (cdr listified)))) (setq listified (cdr listified))))
(bullet-plus (car listified))) (bullet-plus (car listified)))
(insert-string prefix) (insert prefix)
(if bullet-plus (insert-string (concat " " bullet-plus))) (if bullet-plus (insert (concat " " bullet-plus)))
(while text (while text
(insert-string (car text)) (insert (car text))
(if (setq text (cdr text)) (if (setq text (cdr text))
(insert-string "\n"))) (insert "\n")))
(insert-string "\n"))) (insert "\n")))
;;;_ > outline-copy-exposed-to-buffer (&optional arg tobuf format) ;;;_ > outline-copy-exposed-to-buffer (&optional arg tobuf format)
(defun outline-copy-exposed-to-buffer (&optional arg tobuf format) (defun outline-copy-exposed-to-buffer (&optional arg tobuf format)
"Duplicate exposed portions of current outline to another buffer. "Duplicate exposed portions of current outline to another buffer.
@ -4440,7 +4440,7 @@ environment. Leaves point at the end of the line."
end ; bounded by end-of-line end ; bounded by end-of-line
1) ; no matches, move to end & return nil 1) ; no matches, move to end & return nil
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(insert-string "\\") (insert "\\")
(setq end (1+ end)) (setq end (1+ end))
(goto-char (1+ (match-end 0)))))) (goto-char (1+ (match-end 0))))))
;;;_ > outline-insert-latex-header (buf) ;;;_ > outline-insert-latex-header (buf)
@ -4533,7 +4533,7 @@ BULLET string, and a list of TEXT strings for the body."
(curr-line) (curr-line)
body-content bop) body-content bop)
; Do the head line: ; Do the head line:
(insert-string (concat "\\OneHeadLine{\\verb\1 " (insert (concat "\\OneHeadLine{\\verb\1 "
(outline-latex-verb-quote bullet) (outline-latex-verb-quote bullet)
"\1}{" "\1}{"
depth depth
@ -4544,8 +4544,8 @@ BULLET string, and a list of TEXT strings for the body."
"\1}\n")) "\1}\n"))
(if (not body-lines) (if (not body-lines)
nil nil
;;(insert-string "\\beginlines\n") ;;(insert "\\beginlines\n")
(insert-string "\\begin{verbatim}\n") (insert "\\begin{verbatim}\n")
(while body-lines (while body-lines
(setq curr-line (car body-lines)) (setq curr-line (car body-lines))
(if (and (not body-content) (if (and (not body-content)
@ -4559,18 +4559,18 @@ BULLET string, and a list of TEXT strings for the body."
(setq curr-line (concat (substring curr-line 0 bop) (setq curr-line (concat (substring curr-line 0 bop)
">" ">"
(substring curr-line bop)))) (substring curr-line bop))))
;;(insert-string "|" (car body-lines) "|") ;;(insert "|" (car body-lines) "|")
(insert-string curr-line) (insert curr-line)
(outline-latex-verbatim-quote-curr-line) (outline-latex-verbatim-quote-curr-line)
(insert-string "\n") (insert "\n")
(setq body-lines (cdr body-lines))) (setq body-lines (cdr body-lines)))
(if body-content (if body-content
(setq body-content nil) (setq body-content nil)
(forward-char -1) (forward-char -1)
(insert-string "\\ ") (insert "\\ ")
(forward-char 1)) (forward-char 1))
;;(insert-string "\\endlines\n") ;;(insert "\\endlines\n")
(insert-string "\\end{verbatim}\n") (insert "\\end{verbatim}\n")
))) )))
;;;_ > outline-latexify-exposed (arg &optional tobuf) ;;;_ > outline-latexify-exposed (arg &optional tobuf)
(defun outline-latexify-exposed (arg &optional tobuf) (defun outline-latexify-exposed (arg &optional tobuf)
@ -4631,23 +4631,23 @@ setup for auto-startup."
(if (looking-at outline-regexp) (if (looking-at outline-regexp)
t t
(outline-open-topic 2) (outline-open-topic 2)
(insert-string (concat "Dummy outline topic header - see" (insert (concat "Dummy outline topic header - see"
"`outline-mode' docstring: `^Hm'.")) "`outline-mode' docstring: `^Hm'."))
(forward-line 1) (forward-line 1)
(goto-char (point-max)) (goto-char (point-max))
(open-line 1) (open-line 1)
(outline-open-topic 0) (outline-open-topic 0)
(insert-string "Local emacs vars.\n") (insert "Local emacs vars.\n")
(outline-open-topic 1) (outline-open-topic 1)
(insert-string "(`outline-layout' is for allout.el outline-mode)\n") (insert "(`outline-layout' is for allout.el outline-mode)\n")
(outline-open-topic 0) (outline-open-topic 0)
(insert-string "Local variables:\n") (insert "Local variables:\n")
(outline-open-topic 0) (outline-open-topic 0)
(insert-string (format "outline-layout: %s\n" (insert (format "outline-layout: %s\n"
(or outline-layout (or outline-layout
'(-1 : 0)))) '(-1 : 0))))
(outline-open-topic 0) (outline-open-topic 0)
(insert-string "End:\n")))) (insert "End:\n"))))
;;;_ > solicit-char-in-string (prompt string &optional do-defaulting) ;;;_ > solicit-char-in-string (prompt string &optional do-defaulting)
(defun solicit-char-in-string (prompt string &optional do-defaulting) (defun solicit-char-in-string (prompt string &optional do-defaulting)
"Solicit (with first arg PROMPT) choice of a character from string STRING. "Solicit (with first arg PROMPT) choice of a character from string STRING.