aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-08-26 16:49:59 +0000
committerEli Zaretskii2001-08-26 16:49:59 +0000
commit5b02e7129981a26d8e969ffc229bd321476d59eb (patch)
treefec18b8e2994e9651c9262478a9b03bd486fc9d5
parent89aea802cd7567befe0d63975d37648b80452e7d (diff)
downloademacs-5b02e7129981a26d8e969ffc229bd321476d59eb.tar.gz
emacs-5b02e7129981a26d8e969ffc229bd321476d59eb.zip
Remove dots and exclams from end of error messages. From Pavel Janik.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/textmodes/texnfo-upd.el38
2 files changed, 22 insertions, 19 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3cd01076da..7c92e46ce94 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-08-26 Eli Zaretskii <eliz@is.elta.co.il> 12001-08-26 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * textmodes/texnfo-upd.el: Remove dots and exclams at end of error
4 messages. From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
5
3 * emacs-lisp/levents.el: Specify FSF as Maintainer. From Pavel 6 * emacs-lisp/levents.el: Specify FSF as Maintainer. From Pavel
4 Jan,Bm(Bk <Pavel@Janik.cz>. 7 Jan,Bm(Bk <Pavel@Janik.cz>.
5 8
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 1aed3154d16..ec3cda5aed6 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -547,7 +547,7 @@ Signal an error if not end of menu."
547 (save-excursion 547 (save-excursion
548 (if (re-search-forward "^@end menu" nil t) 548 (if (re-search-forward "^@end menu" nil t)
549 (point) 549 (point)
550 (error "Menu does not have an end.")))) 550 (error "Menu does not have an end"))))
551 551
552(defun texinfo-delete-old-menu (beginning first) 552(defun texinfo-delete-old-menu (beginning first)
553 "Delete the old menu. Point must be in or after menu. 553 "Delete the old menu. Point must be in or after menu.
@@ -629,13 +629,13 @@ complements the node name rather than repeats it as a title does."
629 (if (search-forward "* " (save-excursion (end-of-line) (point)) t) 629 (if (search-forward "* " (save-excursion (end-of-line) (point)) t)
630 (progn (skip-chars-forward " \t") 630 (progn (skip-chars-forward " \t")
631 (setq beginning (point))) 631 (setq beginning (point)))
632 (error "This is not a line in a menu!")) 632 (error "This is not a line in a menu"))
633 633
634 (cond 634 (cond
635 ;; "Double colon" entry line; menu entry and node name are the same, 635 ;; "Double colon" entry line; menu entry and node name are the same,
636 ((search-forward "::" (save-excursion (end-of-line) (point)) t) 636 ((search-forward "::" (save-excursion (end-of-line) (point)) t)
637 (if (looking-at "[ \t]*[^ \t\n]+") 637 (if (looking-at "[ \t]*[^ \t\n]+")
638 (error "Descriptive text already exists.")) 638 (error "Descriptive text already exists"))
639 (skip-chars-backward ": \t") 639 (skip-chars-backward ": \t")
640 (setq node-name (buffer-substring beginning (point)))) 640 (setq node-name (buffer-substring beginning (point))))
641 641
@@ -648,7 +648,7 @@ complements the node name rather than repeats it as a title does."
648 (save-excursion (forward-line 1) (point)) t) 648 (save-excursion (forward-line 1) (point)) t)
649 (progn 649 (progn
650 (if (looking-at "[ \t]*[^ \t\n]+") 650 (if (looking-at "[ \t]*[^ \t\n]+")
651 (error "Descriptive text already exists.")) 651 (error "Descriptive text already exists"))
652 (skip-chars-backward "., \t") 652 (skip-chars-backward "., \t")
653 (setq node-name (buffer-substring beginning (point)))) 653 (setq node-name (buffer-substring beginning (point))))
654 ;; Menu entry line ends in a return. 654 ;; Menu entry line ends in a return.
@@ -657,9 +657,9 @@ complements the node name rather than repeats it as a title does."
657 (skip-chars-backward " \t\n") 657 (skip-chars-backward " \t\n")
658 (setq node-name (buffer-substring beginning (point))) 658 (setq node-name (buffer-substring beginning (point)))
659 (if (= 0 (length node-name)) 659 (if (= 0 (length node-name))
660 (error "No node name on this line.") 660 (error "No node name on this line")
661 (insert ".")))) 661 (insert "."))))
662 (t (error "No node name on this line."))) 662 (t (error "No node name on this line")))
663 ;; Search for node that matches node name, and copy the section title. 663 ;; Search for node that matches node name, and copy the section title.
664 (if (re-search-forward 664 (if (re-search-forward
665 (concat 665 (concat
@@ -686,7 +686,7 @@ complements the node name rather than repeats it as a title does."
686 (progn (end-of-line) 686 (progn (end-of-line)
687 (skip-chars-backward " \t") 687 (skip-chars-backward " \t")
688 (point))))) 688 (point)))))
689 (error "Cannot find node to match node name in menu entry."))) 689 (error "Cannot find node to match node name in menu entry")))
690 ;; Return point to the menu and insert the title. 690 ;; Return point to the menu and insert the title.
691 (end-of-line) 691 (end-of-line)
692 (delete-region 692 (delete-region
@@ -797,12 +797,12 @@ title of the section containing the menu."
797 797
798 ;; Move point to location after `top'. 798 ;; Move point to location after `top'.
799 (if (not (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t)) 799 (if (not (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t))
800 (error "This buffer needs a Top node!")) 800 (error "This buffer needs a Top node"))
801 801
802 (let ((first-chapter 802 (let ((first-chapter
803 (save-excursion 803 (save-excursion
804 (or (re-search-forward "^@node" nil t) 804 (or (re-search-forward "^@node" nil t)
805 (error "Too few nodes for a master menu!")) 805 (error "Too few nodes for a master menu"))
806 (point)))) 806 (point))))
807 (if (search-forward texinfo-master-menu-header first-chapter t) 807 (if (search-forward texinfo-master-menu-header first-chapter t)
808 (progn 808 (progn
@@ -892,12 +892,12 @@ However, there does not need to be a title field."
892 ;; Insert a master menu only after `Top' node and before next node 892 ;; Insert a master menu only after `Top' node and before next node
893 ;; \(or include file if there is no next node\). 893 ;; \(or include file if there is no next node\).
894 (if (not (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t)) 894 (if (not (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t))
895 (error "This buffer needs a Top node!")) 895 (error "This buffer needs a Top node"))
896 (let ((first-chapter 896 (let ((first-chapter
897 (save-excursion (re-search-forward "^@node\\|^@include") (point)))) 897 (save-excursion (re-search-forward "^@node\\|^@include") (point))))
898 (if (not (re-search-forward "^@menu" first-chapter t)) 898 (if (not (re-search-forward "^@menu" first-chapter t))
899 (error 899 (error
900 "Buffer lacks ordinary `Top' menu in which to insert master."))) 900 "Buffer lacks ordinary `Top' menu in which to insert master")))
901 (beginning-of-line) 901 (beginning-of-line)
902 (delete-region ; buffer must have ordinary top menu 902 (delete-region ; buffer must have ordinary top menu
903 (point) 903 (point)
@@ -1002,7 +1002,7 @@ and leave point on the line before the `@end menu' line."
1002 (goto-char end-of-menu) 1002 (goto-char end-of-menu)
1003 ;; handle multi-line description 1003 ;; handle multi-line description
1004 (if (not (re-search-backward "^\\* " nil t)) 1004 (if (not (re-search-backward "^\\* " nil t))
1005 (error "No entries in menu.")) 1005 (error "No entries in menu"))
1006 (point)))) 1006 (point))))
1007 (while (< (point) last-entry) 1007 (while (< (point) last-entry)
1008 (if (re-search-forward "^\\* " end-of-menu t) 1008 (if (re-search-forward "^\\* " end-of-menu t)
@@ -1047,7 +1047,7 @@ error if the node is not the top node and a section is not found."
1047 (point)))) 1047 (point))))
1048 (t 1048 (t
1049 (error 1049 (error
1050 "texinfo-specific-section-type: Chapter or section not found.")))))) 1050 "texinfo-specific-section-type: Chapter or section not found"))))))
1051 1051
1052(defun texinfo-hierarchic-level () 1052(defun texinfo-hierarchic-level ()
1053 "Return the general hierarchal level of the next node in a texinfo file. 1053 "Return the general hierarchal level of the next node in a texinfo file.
@@ -1533,7 +1533,7 @@ Info `g*' command is inadequate."
1533 ;; update a single node 1533 ;; update a single node
1534 (let ((auto-fill-function nil) (auto-fill-hook nil)) 1534 (let ((auto-fill-function nil) (auto-fill-hook nil))
1535 (if (not (re-search-backward "^@node" (point-min) t)) 1535 (if (not (re-search-backward "^@node" (point-min) t))
1536 (error "Node line not found before this position.")) 1536 (error "Node line not found before this position"))
1537 (texinfo-sequentially-update-the-node) 1537 (texinfo-sequentially-update-the-node)
1538 (message 1538 (message
1539 "Done...sequentially updated the node . You may save the buffer.")) 1539 "Done...sequentially updated the node . You may save the buffer."))
@@ -1543,7 +1543,7 @@ Info `g*' command is inadequate."
1543 (beginning (region-beginning)) 1543 (beginning (region-beginning))
1544 (end (region-end))) 1544 (end (region-end)))
1545 (if (= end beginning) 1545 (if (= end beginning)
1546 (error "Please mark a region!")) 1546 (error "Please mark a region"))
1547 (save-restriction 1547 (save-restriction
1548 (narrow-to-region beginning end) 1548 (narrow-to-region beginning end)
1549 (goto-char beginning) 1549 (goto-char beginning)
@@ -1820,7 +1820,7 @@ Thus, normally, each included file contains one, and only one, chapter."
1820 (widen) 1820 (widen)
1821 (goto-char (point-min)) 1821 (goto-char (point-min))
1822 (if (not (re-search-forward "^@node" nil t)) 1822 (if (not (re-search-forward "^@node" nil t))
1823 (error "No `@node' line found in %s !" (buffer-name))) 1823 (error "No `@node' line found in %s" (buffer-name)))
1824 (beginning-of-line) 1824 (beginning-of-line)
1825 (texinfo-check-for-node-name) 1825 (texinfo-check-for-node-name)
1826 (setq next-node-name (texinfo-copy-node-name)) 1826 (setq next-node-name (texinfo-copy-node-name))
@@ -1837,7 +1837,7 @@ Thus, normally, each included file contains one, and only one, chapter."
1837 (switch-to-buffer (find-file-noselect (car files))) 1837 (switch-to-buffer (find-file-noselect (car files)))
1838 (goto-char (point-min)) 1838 (goto-char (point-min))
1839 (if (not (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t)) 1839 (if (not (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t))
1840 (error "This buffer needs a Top node!")) 1840 (error "This buffer needs a Top node"))
1841 (beginning-of-line) 1841 (beginning-of-line)
1842 (texinfo-delete-existing-pointers) 1842 (texinfo-delete-existing-pointers)
1843 (end-of-line) 1843 (end-of-line)
@@ -1857,7 +1857,7 @@ Thus, normally, each included file contains one, and only one, chapter."
1857 (widen) 1857 (widen)
1858 (goto-char (point-min)) 1858 (goto-char (point-min))
1859 (if (not (re-search-forward "^@node" nil t)) 1859 (if (not (re-search-forward "^@node" nil t))
1860 (error "No `@node' line found in %s !" (buffer-name))) 1860 (error "No `@node' line found in %s" (buffer-name)))
1861 (beginning-of-line) 1861 (beginning-of-line)
1862 (texinfo-check-for-node-name) 1862 (texinfo-check-for-node-name)
1863 (setq next-node-name (texinfo-copy-node-name)) 1863 (setq next-node-name (texinfo-copy-node-name))
@@ -1873,7 +1873,7 @@ Thus, normally, each included file contains one, and only one, chapter."
1873 (switch-to-buffer (find-file-noselect (car files))) 1873 (switch-to-buffer (find-file-noselect (car files)))
1874 (goto-char (point-min)) 1874 (goto-char (point-min))
1875 (if (not (re-search-forward "^@node" nil t)) 1875 (if (not (re-search-forward "^@node" nil t))
1876 (error "No `@node' line found in %s !" (buffer-name))) 1876 (error "No `@node' line found in %s" (buffer-name)))
1877 (beginning-of-line) 1877 (beginning-of-line)
1878 1878
1879 ;; Update other menus and nodes if requested. 1879 ;; Update other menus and nodes if requested.