aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1994-03-14 21:27:13 +0000
committerKarl Heuer1994-03-14 21:27:13 +0000
commit3a6ade8ab3991522e92aa7457c43fd74efade861 (patch)
treea163ff6f655d96bfdd9543f2e456fb89615fec77
parente357be4cbeebbf7c03967c015ffe9a626ae4f5f1 (diff)
downloademacs-3a6ade8ab3991522e92aa7457c43fd74efade861.tar.gz
emacs-3a6ade8ab3991522e92aa7457c43fd74efade861.zip
(Info-insert-dir): Use printable escapes instead of embedding literal control
chars in the source.
-rw-r--r--lisp/info.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 06496692f75..be9850f0fff 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -391,10 +391,10 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
391 (let (beg nodename end) 391 (let (beg nodename end)
392 (forward-line 1) 392 (forward-line 1)
393 (setq beg (point)) 393 (setq beg (point))
394 (search-backward "\n") 394 (search-backward "\n\^_")
395 (search-forward "Node: ") 395 (search-forward "Node: ")
396 (setq nodename (Info-following-node-name)) 396 (setq nodename (Info-following-node-name))
397 (search-forward "\n" nil 'move) 397 (search-forward "\n\^_" nil 'move)
398 (beginning-of-line) 398 (beginning-of-line)
399 (setq end (point)) 399 (setq end (point))
400 (setq nodes (cons (list nodename other beg end) nodes)))))) 400 (setq nodes (cons (list nodename other beg end) nodes))))))
@@ -405,7 +405,7 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
405 (let ((menu-items '("top")) 405 (let ((menu-items '("top"))
406 (nodes nodes) 406 (nodes nodes)
407 (case-fold-search t) 407 (case-fold-search t)
408 (end (save-excursion (search-forward "" nil t) (point)))) 408 (end (save-excursion (search-forward "\^_" nil t) (point))))
409 (while nodes 409 (while nodes
410 (let ((nodename (car (car nodes)))) 410 (let ((nodename (car (car nodes))))
411 (or (member (downcase nodename) menu-items) 411 (or (member (downcase nodename) menu-items)
@@ -421,16 +421,16 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
421 (let ((nodename (car (car nodes)))) 421 (let ((nodename (car (car nodes))))
422 (goto-char (point-min)) 422 (goto-char (point-min))
423 ;; Find the like-named node in the main buffer. 423 ;; Find the like-named node in the main buffer.
424 (if (re-search-forward (concat "\n.*\n.*Node: " 424 (if (re-search-forward (concat "\n\^_.*\n.*Node: "
425 (regexp-quote nodename) 425 (regexp-quote nodename)
426 "[,\n\t]") 426 "[,\n\t]")
427 nil t) 427 nil t)
428 (progn 428 (progn
429 (search-forward "\n" nil 'move) 429 (search-forward "\n\^_" nil 'move)
430 (beginning-of-line)) 430 (beginning-of-line))
431 ;; If none exists, add one. 431 ;; If none exists, add one.
432 (goto-char (point-max)) 432 (goto-char (point-max))
433 (insert "\nFile: dir\tnode: " nodename "\n\n* Menu:\n\n")) 433 (insert "\^_\nFile: dir\tnode: " nodename "\n\n* Menu:\n\n"))
434 ;; Merge the text from the other buffer's menu 434 ;; Merge the text from the other buffer's menu
435 ;; into the menu in the like-named node in the main buffer. 435 ;; into the menu in the like-named node in the main buffer.
436 (apply 'insert-buffer-substring (cdr (car nodes))) 436 (apply 'insert-buffer-substring (cdr (car nodes)))