aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorPavel Janík2001-07-16 12:23:00 +0000
committerPavel Janík2001-07-16 12:23:00 +0000
commite8af40eed41d6c61ea6a0649512c4b09afcb1bfa (patch)
tree588654cb6c38a93c432bfae53ccbf36569e3cf23 /lisp/textmodes
parent4cba8c0bdcce038e6966aab82d08859d796e69d0 (diff)
downloademacs-e8af40eed41d6c61ea6a0649512c4b09afcb1bfa.tar.gz
emacs-e8af40eed41d6c61ea6a0649512c4b09afcb1bfa.zip
Some fixes to follow coding conventions.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/artist.el2
-rw-r--r--lisp/textmodes/flyspell.el5
-rw-r--r--lisp/textmodes/ispell.el8
-rw-r--r--lisp/textmodes/page-ext.el5
-rw-r--r--lisp/textmodes/refer.el5
-rw-r--r--lisp/textmodes/texinfmt.el20
-rw-r--r--lisp/textmodes/texinfo.el2
-rw-r--r--lisp/textmodes/texnfo-upd.el16
-rw-r--r--lisp/textmodes/two-column.el7
9 files changed, 38 insertions, 32 deletions
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index d5670acb2da..a918e720b7f 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -5493,4 +5493,4 @@ The event, EV, is the mouse event."
5493;; Don't hesitate to ask me any questions. 5493;; Don't hesitate to ask me any questions.
5494 5494
5495 5495
5496;; artist.el ends here 5496;;; artist.el ends here
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 0498820b4fb..19d2b99bcf7 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1,11 +1,11 @@
1;;; flyspell.el --- On-the-fly spell checker 1;;; flyspell.el --- on-the-fly spell checker
2 2
3;; Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
4 4
5;; Author: Manuel Serrano <Manuel.Serrano@unice.fr> 5;; Author: Manuel Serrano <Manuel.Serrano@unice.fr>
6;; Keywords: convenience 6;; Keywords: convenience
7 7
8;;; This file is part of GNU Emacs. 8;; This file is part of GNU Emacs.
9 9
10;; GNU Emacs is free software; you can redistribute it and/or modify 10;; GNU Emacs is free software; you can redistribute it and/or modify
11;; it under the terms of the GNU General Public License as published by 11;; it under the terms of the GNU General Public License as published by
@@ -2096,4 +2096,5 @@ This function is meant to be added to 'flyspell-incorrect-hook'."
2096 (set (abbrev-symbol old table) new)) 2096 (set (abbrev-symbol old table) new))
2097 2097
2098(provide 'flyspell) 2098(provide 'flyspell)
2099
2099;;; flyspell.el ends here 2100;;; flyspell.el ends here
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 9b9a5a632bd..eebd32f2ec0 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1,9 +1,9 @@
1;;; ispell.el --- Interface to International Ispell Versions 3.1 and 3.2 1;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
2 2
3;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
4 4
5;; Author: Ken Stevens <k.stevens@ieee.org> 5;; Author: Ken Stevens <k.stevens@ieee.org>
6;; Maintainer: Ken Stevens <k.stevens@ieee.org> 6;; Maintainer: Ken Stevens <k.stevens@ieee.org>
7;; Stevens Mod Date: Fri Aug 4 09:41:50 PDT 2000 7;; Stevens Mod Date: Fri Aug 4 09:41:50 PDT 2000
8;; Stevens Revision: 3.4 8;; Stevens Revision: 3.4
9;; Status : Release with 3.1.12+ and 3.2.0+ ispell. 9;; Status : Release with 3.1.12+ and 3.2.0+ ispell.
@@ -1357,7 +1357,7 @@ quit spell session exited."
1357 (setq ispell-filter (cdr ispell-filter)) ; remove extra \n 1357 (setq ispell-filter (cdr ispell-filter)) ; remove extra \n
1358 (if (and ispell-filter (listp ispell-filter)) 1358 (if (and ispell-filter (listp ispell-filter))
1359 (if (> (length ispell-filter) 1) 1359 (if (> (length ispell-filter) 1)
1360 (error "Ispell and its process have different character maps.") 1360 (error "Ispell and its process have different character maps")
1361 (setq poss (ispell-parse-output (car ispell-filter))))) 1361 (setq poss (ispell-parse-output (car ispell-filter)))))
1362 (cond ((eq poss t) 1362 (cond ((eq poss t)
1363 (or quietly 1363 (or quietly
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index c5f50fe2840..3b04d3787be 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -718,7 +718,7 @@ to the same line in the pages buffer."
718 (progn 718 (progn
719 (setq pages-buffer nil 719 (setq pages-buffer nil
720 pages-pos-list nil) 720 pages-pos-list nil)
721 (error "Buffer in which pages were found is deleted."))) 721 (error "Buffer in which pages were found is deleted")))
722 (beginning-of-line) 722 (beginning-of-line)
723 (let* ((pages-number (1- (count-lines (point-min) (point)))) 723 (let* ((pages-number (1- (count-lines (point-min) (point))))
724 (pos (nth pages-number pages-pos-list)) 724 (pos (nth pages-number pages-pos-list))
@@ -806,5 +806,4 @@ to the same line in the pages buffer."
806;;; Place `provide' at end of file. 806;;; Place `provide' at end of file.
807(provide 'page-ext) 807(provide 'page-ext)
808 808
809;;;;;;;;;;;;;;;; end of page-ext.el ;;;;;;;;;;;;;;;; 809;;; page-ext.el ends here
810
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 3a80efd981f..9cb10914984 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -1,4 +1,4 @@
1;;; refer.el --- look up references in bibliography files. 1;;; refer.el --- look up references in bibliography files
2 2
3;; Copyright (C) 1992, 1996 Free Software Foundation, Inc. 3;; Copyright (C) 1992, 1996 Free Software Foundation, Inc.
4 4
@@ -175,7 +175,7 @@ found on the last refer-find-entry or refer-find-next-entry."
175 (if (looking-at 175 (if (looking-at
176 "[ \t\n]*@\\s-*[a-zA-Z][a-zA-Z0-9]*\\s-*{\\s-*\\([^ \t\n,]+\\)\\s-*,") 176 "[ \t\n]*@\\s-*[a-zA-Z][a-zA-Z0-9]*\\s-*{\\s-*\\([^ \t\n,]+\\)\\s-*,")
177 (buffer-substring (match-beginning 1) (match-end 1)) 177 (buffer-substring (match-beginning 1) (match-end 1))
178 (error "Cannot find key for entry in file %s." 178 (error "Cannot find key for entry in file %s"
179 (car refer-saved-state)))))) 179 (car refer-saved-state))))))
180 (if (not (= (point) old-point)) 180 (if (not (= (point) old-point))
181 (set-mark old-point)))) 181 (set-mark old-point))))
@@ -395,4 +395,3 @@ found on the last refer-find-entry or refer-find-next-entry."
395 files)) 395 files))
396 396
397;;; refer.el ends here 397;;; refer.el ends here
398
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 91caa8a9859..01f49921b4c 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -1,4 +1,4 @@
1;;; texinfmt.el --- format Texinfo files into Info files. 1;;; texinfmt.el --- format Texinfo files into Info files
2 2
3;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 3;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
4;; 1994, 1995, 1996, 1997, 1998, 2000, 2001 4;; 1994, 1995, 1996, 1997, 1998, 2000, 2001
@@ -24,6 +24,8 @@
24;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 24;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25;; Boston, MA 02111-1307, USA. 25;; Boston, MA 02111-1307, USA.
26 26
27;;; Commentary:
28
27;;; Code: 29;;; Code:
28 30
29;;; Emacs lisp functions to convert Texinfo files to Info files. 31;;; Emacs lisp functions to convert Texinfo files to Info files.
@@ -362,7 +364,7 @@ if large. You can use Info-split to do this manually."
362 (save-excursion 364 (save-excursion
363 (goto-char (point-min)) 365 (goto-char (point-min))
364 (or (search-forward "@setfilename" nil t) 366 (or (search-forward "@setfilename" nil t)
365 (error "Texinfo file needs an `@setfilename FILENAME' line.")) 367 (error "Texinfo file needs an `@setfilename FILENAME' line"))
366 (setq texinfo-command-end (point)) 368 (setq texinfo-command-end (point))
367 (setq outfile (texinfo-parse-line-arg))) 369 (setq outfile (texinfo-parse-line-arg)))
368 370
@@ -1105,10 +1107,10 @@ Leave point after argument."
1105 (goto-char texinfo-command-end) 1107 (goto-char texinfo-command-end)
1106 (skip-chars-forward " \t") 1108 (skip-chars-forward " \t")
1107 (or (eolp) 1109 (or (eolp)
1108 (error "Extraneous text at end of command line.")) 1110 (error "Extraneous text at end of command line"))
1109 (goto-char texinfo-command-start) 1111 (goto-char texinfo-command-start)
1110 (or (bolp) 1112 (or (bolp)
1111 (error "Extraneous text at beginning of command line.")) 1113 (error "Extraneous text at beginning of command line"))
1112 (delete-region (point) (progn (forward-line 1) (point)))) 1114 (delete-region (point) (progn (forward-line 1) (point))))
1113 1115
1114(defun texinfo-discard-line-with-args () 1116(defun texinfo-discard-line-with-args ()
@@ -1670,7 +1672,7 @@ Used by @refill indenting command to avoid indenting within lists, etc.")
1670 (texinfo-discard-line) 1672 (texinfo-discard-line)
1671 (let ((next (1+ (car (cdr (car texinfo-stack)))))) 1673 (let ((next (1+ (car (cdr (car texinfo-stack))))))
1672 (if (> next ?z) 1674 (if (> next ?z)
1673 (error "More than 26 items in @alphaenumerate; get a bigger alphabet.")) 1675 (error "More than 26 items in @alphaenumerate; get a bigger alphabet"))
1674 (setcar (cdr (car texinfo-stack)) next) 1676 (setcar (cdr (car texinfo-stack)) next)
1675 (insert "\b " next ". \n")) 1677 (insert "\b " next ". \n"))
1676 (forward-line -1)) 1678 (forward-line -1))
@@ -1680,7 +1682,7 @@ Used by @refill indenting command to avoid indenting within lists, etc.")
1680 (texinfo-discard-line) 1682 (texinfo-discard-line)
1681 (let ((next (1+ (car (cdr (car texinfo-stack)))))) 1683 (let ((next (1+ (car (cdr (car texinfo-stack))))))
1682 (if (> next ?Z) 1684 (if (> next ?Z)
1683 (error "More than 26 items in @capsenumerate; get a bigger alphabet.")) 1685 (error "More than 26 items in @capsenumerate; get a bigger alphabet"))
1684 (setcar (cdr (car texinfo-stack)) next) 1686 (setcar (cdr (car texinfo-stack)) next)
1685 (insert "\b " next ". \n")) 1687 (insert "\b " next ". \n"))
1686 (forward-line -1)) 1688 (forward-line -1))
@@ -2045,7 +2047,7 @@ This command is executed when texinfmt sees @item inside @multitable."
2045 (while (search-forward "@tab" nil t) 2047 (while (search-forward "@tab" nil t)
2046 (setq tab-number (1+ tab-number))) 2048 (setq tab-number (1+ tab-number)))
2047 (if (/= tab-number (length table-widths)) 2049 (if (/= tab-number (length table-widths))
2048 (error "Wrong number of @tab's in a @multitable row."))) 2050 (error "Wrong number of @tab's in a @multitable row")))
2049 (goto-char (point-min)) 2051 (goto-char (point-min))
2050;; 2. Format each cell, and copy to a rectangle 2052;; 2. Format each cell, and copy to a rectangle
2051 ;; buffer looks like this: A1 @tab A2 @tab A3 2053 ;; buffer looks like this: A1 @tab A2 @tab A3
@@ -4131,7 +4133,7 @@ Each file will be processed even if an error occurred previously.
4131For example, invoke 4133For example, invoke
4132 \"emacs -batch -funcall batch-texinfo-format $docs/ ~/*.texinfo\"." 4134 \"emacs -batch -funcall batch-texinfo-format $docs/ ~/*.texinfo\"."
4133 (if (not noninteractive) 4135 (if (not noninteractive)
4134 (error "batch-texinfo-format may only be used -batch.")) 4136 (error "batch-texinfo-format may only be used -batch"))
4135 (let ((version-control t) 4137 (let ((version-control t)
4136 (auto-save-default nil) 4138 (auto-save-default nil)
4137 (find-file-run-dired nil) 4139 (find-file-run-dired nil)
@@ -4188,4 +4190,4 @@ For example, invoke
4188;;; Place `provide' at end of file. 4190;;; Place `provide' at end of file.
4189(provide 'texinfmt) 4191(provide 'texinfmt)
4190 4192
4191;;; texinfmt.el ends here. 4193;;; texinfmt.el ends here
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 3d470ffb78b..04ae6fb5a8b 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -25,6 +25,8 @@
25;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 25;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
26;; Boston, MA 02111-1307, USA. 26;; Boston, MA 02111-1307, USA.
27 27
28;;; Commentary:
29
28;;; Code: 30;;; Code:
29 31
30(or (fboundp 'defgroup) 32(or (fboundp 'defgroup)
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index c1df0a6fca3..a474e4c716c 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -538,7 +538,7 @@ Signal an error if not end of menu."
538 (save-excursion 538 (save-excursion
539 (if (re-search-forward "^@end menu" nil t) 539 (if (re-search-forward "^@end menu" nil t)
540 (point) 540 (point)
541 (error "Menu does not have an end.")))) 541 (error "Menu does not have an end"))))
542 542
543(defun texinfo-delete-old-menu (beginning first) 543(defun texinfo-delete-old-menu (beginning first)
544 "Delete the old menu. Point must be in or after menu. 544 "Delete the old menu. Point must be in or after menu.
@@ -626,7 +626,7 @@ complements the node name rather than repeats it as a title does."
626 ;; "Double colon" entry line; menu entry and node name are the same, 626 ;; "Double colon" entry line; menu entry and node name are the same,
627 ((search-forward "::" (save-excursion (end-of-line) (point)) t) 627 ((search-forward "::" (save-excursion (end-of-line) (point)) t)
628 (if (looking-at "[ \t]*[^ \t\n]+") 628 (if (looking-at "[ \t]*[^ \t\n]+")
629 (error "Descriptive text already exists.")) 629 (error "Descriptive text already exists"))
630 (skip-chars-backward ": \t") 630 (skip-chars-backward ": \t")
631 (setq node-name (buffer-substring beginning (point)))) 631 (setq node-name (buffer-substring beginning (point))))
632 632
@@ -639,7 +639,7 @@ complements the node name rather than repeats it as a title does."
639 (save-excursion (forward-line 1) (point)) t) 639 (save-excursion (forward-line 1) (point)) t)
640 (progn 640 (progn
641 (if (looking-at "[ \t]*[^ \t\n]+") 641 (if (looking-at "[ \t]*[^ \t\n]+")
642 (error "Descriptive text already exists.")) 642 (error "Descriptive text already exists"))
643 (skip-chars-backward "., \t") 643 (skip-chars-backward "., \t")
644 (setq node-name (buffer-substring beginning (point)))) 644 (setq node-name (buffer-substring beginning (point))))
645 ;; Menu entry line ends in a return. 645 ;; Menu entry line ends in a return.
@@ -648,9 +648,9 @@ complements the node name rather than repeats it as a title does."
648 (skip-chars-backward " \t\n") 648 (skip-chars-backward " \t\n")
649 (setq node-name (buffer-substring beginning (point))) 649 (setq node-name (buffer-substring beginning (point)))
650 (if (= 0 (length node-name)) 650 (if (= 0 (length node-name))
651 (error "No node name on this line.") 651 (error "No node name on this line")
652 (insert ".")))) 652 (insert "."))))
653 (t (error "No node name on this line."))) 653 (t (error "No node name on this line")))
654 ;; Search for node that matches node name, and copy the section title. 654 ;; Search for node that matches node name, and copy the section title.
655 (if (re-search-forward 655 (if (re-search-forward
656 (concat 656 (concat
@@ -674,7 +674,7 @@ complements the node name rather than repeats it as a title does."
674 (progn (end-of-line) 674 (progn (end-of-line)
675 (skip-chars-backward " \t") 675 (skip-chars-backward " \t")
676 (point))))) 676 (point)))))
677 (error "Cannot find node to match node name in menu entry."))) 677 (error "Cannot find node to match node name in menu entry")))
678 ;; Return point to the menu and insert the title. 678 ;; Return point to the menu and insert the title.
679 (end-of-line) 679 (end-of-line)
680 (delete-region 680 (delete-region
@@ -990,7 +990,7 @@ and leave point on the line before the `@end menu' line."
990 (goto-char end-of-menu) 990 (goto-char end-of-menu)
991 ;; handle multi-line description 991 ;; handle multi-line description
992 (if (not (re-search-backward "^\\* " nil t)) 992 (if (not (re-search-backward "^\\* " nil t))
993 (error "No entries in menu.")) 993 (error "No entries in menu"))
994 (point)))) 994 (point))))
995 (while (< (point) last-entry) 995 (while (< (point) last-entry)
996 (if (re-search-forward "^\\* " end-of-menu t) 996 (if (re-search-forward "^\\* " end-of-menu t)
@@ -1487,7 +1487,7 @@ Info `g*' command is inadequate."
1487 ;; update a single node 1487 ;; update a single node
1488 (let ((auto-fill-function nil) (auto-fill-hook nil)) 1488 (let ((auto-fill-function nil) (auto-fill-hook nil))
1489 (if (not (re-search-backward "^@node" (point-min) t)) 1489 (if (not (re-search-backward "^@node" (point-min) t))
1490 (error "Node line not found before this position.")) 1490 (error "Node line not found before this position"))
1491 (texinfo-sequentially-update-the-node) 1491 (texinfo-sequentially-update-the-node)
1492 (message 1492 (message
1493 "Done...sequentially updated the node . You may save the buffer.")) 1493 "Done...sequentially updated the node . You may save the buffer."))
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index a4c965a6966..b231a285675 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -5,6 +5,8 @@
5;; Author: Daniel Pfeiffer <occitan@esperanto.org> 5;; Author: Daniel Pfeiffer <occitan@esperanto.org>
6;; Adapted-By: ESR, Daniel Pfeiffer 6;; Adapted-By: ESR, Daniel Pfeiffer
7 7
8;; This file is part of GNU Emacs.
9
8;; Esperanto: English: 10;; Esperanto: English:
9 11
10;; ^Ci dosiero estas ero de GNU Emacs. This file is part of GNU Emacs. 12;; ^Ci dosiero estas ero de GNU Emacs. This file is part of GNU Emacs.
@@ -33,6 +35,7 @@
33;; Free Software Foundation, 59 Temple Place - Suite 330 35;; Free Software Foundation, 59 Temple Place - Suite 330
34;; Boston, MA 02111-1307, USA. 36;; Boston, MA 02111-1307, USA.
35 37
38;;; Commentary:
36 39
37;;; Komentario: Commentary: 40;;; Komentario: Commentary:
38 41
@@ -284,7 +287,7 @@ minus this value."
284 (kill-local-variable '2C-mode) 287 (kill-local-variable '2C-mode)
285 (kill-local-variable 'mode-line-format) 288 (kill-local-variable 'mode-line-format)
286 nil))) 289 nil)))
287 (if req (error "You must first set two-column minor mode.")))) 290 (if req (error "You must first set two-column minor mode"))))
288 291
289 292
290 293
@@ -385,7 +388,7 @@ accepting the proposed default buffer.
385 (set-buffer b2) 388 (set-buffer b2)
386 (and (2C-other) 389 (and (2C-other)
387 (not (eq b1 (2C-other))) 390 (not (eq b1 (2C-other)))
388 (error "Buffer already associated with buffer `%s'." 391 (error "Buffer already associated with buffer `%s'"
389 (buffer-name (2C-other)))) 392 (buffer-name (2C-other))))
390 (setq b1 (and (assq '2C-window-width (buffer-local-variables)) 393 (setq b1 (and (assq '2C-window-width (buffer-local-variables))
391 2C-window-width))) 394 2C-window-width)))